Issue 38551. Fix for reading references to PropertyAccessorElement(s) defined in extensions.

scheglov · commit-bot@chromium.org · commit 6df2491743c7 · 2019-11-18T15:28:03.000Z
R=brianwilkerson@google.com Bug: #38551 Change-Id: Id93714a2db97ff1ab448fe408f4e86df9988a147 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/125520 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/constant/evaluation.dart b/pkg/analyzer/lib/src/dart/constant/evaluation.dart
@@ -1260,14 +1260,16 @@ class ConstantVisitor extends UnifyingAstVisitor<DartObjectImpl> {
     SimpleIdentifier prefixNode = node.prefix;
     Element prefixElement = prefixNode.staticElement;
     // String.length
-    if (prefixElement is! PrefixElement && prefixElement is! ClassElement) {
+    if (prefixElement is! PrefixElement &&
+        prefixElement is! ClassElement &&
+        prefixElement is! ExtensionElement) {
       DartObjectImpl prefixResult = prefixNode.accept(this);
       if (_isStringLength(prefixResult, node.identifier)) {
         return prefixResult.stringLength(_typeProvider);
       }
     }
     // importPrefix.CONST
-    if (prefixElement is! PrefixElement) {
+    if (prefixElement is! PrefixElement && prefixElement is! ExtensionElement) {
       DartObjectImpl prefixResult = prefixNode.accept(this);
       if (prefixResult == null) {
         // The error has already been reported.
diff --git a/pkg/analyzer/lib/src/summary2/linked_element_factory.dart b/pkg/analyzer/lib/src/summary2/linked_element_factory.dart
@@ -240,24 +240,18 @@ class _ElementRequest {
       ElementImpl enclosing, Reference reference) {
     if (enclosing is ClassElementImpl) {
       enclosing.accessors;
-      // Requesting accessors sets elements for accessors and fields.
-      assert(reference.element != null);
-      return reference.element;
-    }
-    if (enclosing is CompilationUnitElementImpl) {
+    } else if (enclosing is CompilationUnitElementImpl) {
       enclosing.accessors;
-      // Requesting accessors sets elements for accessors and variables.
-      assert(reference.element != null);
-      return reference.element;
-    }
-    if (enclosing is EnumElementImpl) {
+    } else if (enclosing is EnumElementImpl) {
       enclosing.accessors;
-      // Requesting accessors sets elements for accessors and variables.
-      assert(reference.element != null);
-      return reference.element;
+    } else if (enclosing is ExtensionElementImpl) {
+      enclosing.accessors;
+    } else {
+      throw StateError('${enclosing.runtimeType}');
     }
-    // Only classes and units have accessors.
-    throw StateError('${enclosing.runtimeType}');
+    // Requesting accessors sets elements for accessors and variables.
+    assert(reference.element != null);
+    return reference.element;
   }
 
   ClassElementImpl _class(
diff --git a/pkg/analyzer/test/src/dart/resolution/constant_test.dart b/pkg/analyzer/test/src/dart/resolution/constant_test.dart
@@ -116,4 +116,69 @@ const v = a;
     expect(typeArgument.element.enclosingElement, elementF);
     assertElementTypeStrings(typeArgument.typeArguments, ['double']);
   }
+
+  test_imported_prefixedIdentifier_staticField_class() async {
+    newFile('/test/lib/a.dart', content: r'''
+const a = C.f;
+
+class C {
+  static const int f = 42;
+}
+''');
+    await resolveTestCode(r'''
+import 'a.dart';
+''');
+
+    var import_ = findElement.importFind('package:test/a.dart');
+    var a = import_.topVar('a') as ConstVariableElement;
+    expect(a.computeConstantValue().toIntValue(), 42);
+  }
+
+  test_imported_prefixedIdentifier_staticField_extension() async {
+    newFile('/test/lib/a.dart', content: r'''
+const a = E.f;
+
+extension E on int {
+  static const int f = 42;
+}
+''');
+    await resolveTestCode(r'''
+import 'a.dart';
+''');
+
+    var import_ = findElement.importFind('package:test/a.dart');
+    var a = import_.topVar('a') as ConstVariableElement;
+    expect(a.computeConstantValue().toIntValue(), 42);
+  }
+
+  test_imported_prefixedIdentifier_staticField_mixin() async {
+    newFile('/test/lib/a.dart', content: r'''
+const a = M.f;
+
+class C {}
+
+mixin M on C {
+  static const int f = 42;
+}
+''');
+    await resolveTestCode(r'''
+import 'a.dart';
+''');
+
+    var import_ = findElement.importFind('package:test/a.dart');
+    var a = import_.topVar('a') as ConstVariableElement;
+    expect(a.computeConstantValue().toIntValue(), 42);
+  }
+
+  test_local_prefixedIdentifier_staticField_extension() async {
+    await assertNoErrorsInCode(r'''
+const a = E.f;
+
+extension E on int {
+  static const int f = 42;
+}
+''');
+    var a = findElement.topVar('a') as ConstVariableElement;
+    expect(a.computeConstantValue().toIntValue(), 42);
+  }
 }
