From e17e72495e82aca0f061c2a5526ee8cf74f37e1b Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Thu, 9 Apr 2020 14:09:16 -0700 Subject: [PATCH 1/2] Allow staticElement to be null --- lib/src/model/getter_setter_combo.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/src/model/getter_setter_combo.dart b/lib/src/model/getter_setter_combo.dart index 2364bf8bde..0c74984923 100644 --- a/lib/src/model/getter_setter_combo.dart +++ b/lib/src/model/getter_setter_combo.dart @@ -52,6 +52,8 @@ mixin GetterSetterCombo on ModelElement { .toString(); Element staticElement = (constantInitializer as InstanceCreationExpression).staticElement; + if (staticElement == null) + return original; Constructor target = ModelElement.fromElement(staticElement, packageGraph); Class targetClass = target.enclosingElement; // TODO(jcollins-g): this logic really should be integrated into Constructor, From 7d8734835d52eeb6bbba4e175f0019517ea2a3be Mon Sep 17 00:00:00 2001 From: Janice Collins Date: Thu, 9 Apr 2020 14:42:32 -0700 Subject: [PATCH 2/2] Workaround for missing imports --- lib/src/model/getter_setter_combo.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/src/model/getter_setter_combo.dart b/lib/src/model/getter_setter_combo.dart index 0c74984923..b31174841b 100644 --- a/lib/src/model/getter_setter_combo.dart +++ b/lib/src/model/getter_setter_combo.dart @@ -52,8 +52,9 @@ mixin GetterSetterCombo on ModelElement { .toString(); Element staticElement = (constantInitializer as InstanceCreationExpression).staticElement; - if (staticElement == null) - return original; + assert(staticElement != null, + '${original} should be able to be resolved but an analysis error prevents this'); + if (staticElement == null) return original; Constructor target = ModelElement.fromElement(staticElement, packageGraph); Class targetClass = target.enclosingElement; // TODO(jcollins-g): this logic really should be integrated into Constructor,