Resolve static members of an extension within the members of the extension

bwilkerson · commit-bot@chromium.org · commit 3d5238a0ec37 · 2019-07-24T16:01:13.000Z
Change-Id: I60687da4353ad056ff6312b07e9818b9dcfb9813 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110202 Commit-Queue: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Phil Quitslund <pquitslund@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/dart/resolver/scope.dart b/pkg/analyzer/lib/src/dart/resolver/scope.dart
@@ -146,6 +146,36 @@ class EnclosedScope extends Scope {
   }
 }
 
+/// The scope defined by an extension.
+class ExtensionScope extends EnclosedScope {
+  /// Initialize a newly created scope, enclosed within the [enclosingScope],
+  /// that represents the given [_extensionElement].
+  ExtensionScope(Scope enclosingScope, ExtensionElement extensionElement)
+      : super(enclosingScope) {
+    _defineMembers(extensionElement);
+  }
+
+  /// Define the static members defined by the given [extensionElement]. The
+  /// instance members should only be found if they would be found by normal
+  /// lookup on `this`.
+  void _defineMembers(ExtensionElement extensionElement) {
+    List<PropertyAccessorElement> accessors = extensionElement.accessors;
+    int accessorLength = accessors.length;
+    for (int i = 0; i < accessorLength; i++) {
+      if (accessors[i].isStatic) {
+        define(accessors[i]);
+      }
+    }
+    List<MethodElement> methods = extensionElement.methods;
+    int methodLength = methods.length;
+    for (int i = 0; i < methodLength; i++) {
+      if (methods[i].isStatic) {
+        define(methods[i]);
+      }
+    }
+  }
+}
+
 /**
  * The scope defined by a function.
  */
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -5993,6 +5993,7 @@ abstract class ScopedVisitor extends UnifyingAstVisitor<void> {
           // TODO(brianwilkerson) Figure out what, if anything, to do here.
           throw UnsupportedError('Extension of function type');
         }
+        nameScope = ExtensionScope(nameScope, extensionElement);
         visitExtensionMembersInScope(node);
       }
     } finally {
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
@@ -78,6 +78,18 @@ f() {
     expect(invocation.identifier.staticElement, declaration.declaredElement);
   }
 
+  test_accessStaticWithinInstance() async {
+    await assertNoErrorsInCode('''
+class A {}
+extension E on A {
+  static void a() {}
+  void b() { a(); }
+}
+''');
+    var invocation = findNode.methodInvocation('a();');
+    assertElement(invocation, findElement.method('a'));
+  }
+
   test_method_moreSpecificThanPlatform() async {
     //
     // An extension with on type clause T1 is more specific than another

Original file line number	Diff line number	Diff line change
`@@ -5993,6 +5993,7 @@ abstract class ScopedVisitor extends UnifyingAstVisitor<void> {`
`5993`	`5993`	`// TODO(brianwilkerson) Figure out what, if anything, to do here.`
`5994`	`5994`	`throw UnsupportedError('Extension of function type');`
`5995`	`5995`	`}`
	`5996`	`+ nameScope = ExtensionScope(nameScope, extensionElement);`
`5996`	`5997`	`visitExtensionMembersInScope(node);`
`5997`	`5998`	`}`
`5998`	`5999`	`} finally {`