Support resolution of this

bwilkerson · commit-bot@chromium.org · commit 8fb6f68f43d9 · 2019-07-25T17:23:38.000Z
Change-Id: I491703d7dd7c6eed6eebf3597ba33d10cfdb2958 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110402 Commit-Queue: Brian Wilkerson <brianwilkerson@google.com> Reviewed-by: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/dart/ast/ast.dart b/pkg/analyzer/lib/dart/ast/ast.dart
@@ -2114,6 +2114,9 @@ abstract class ExtendsClause implements AstNode {
 ///
 /// Clients may not extend, implement or mix-in this class.
 abstract class ExtensionDeclaration implements CompilationUnitMember {
+  @override
+  ExtensionElement get declaredElement;
+
   /// Return the type that is being extended.
   TypeAnnotation get extendedType;
 
diff --git a/pkg/analyzer/lib/src/generated/resolver.dart b/pkg/analyzer/lib/src/generated/resolver.dart
@@ -4452,6 +4452,29 @@ class ResolverVisitor extends ScopedVisitor {
     }
   }
 
+  @override
+  void visitExtensionDeclaration(ExtensionDeclaration node) {
+    //
+    // Resolve the metadata in the library scope
+    // and associate the annotations with the element.
+    //
+    if (node.metadata != null) {
+      node.metadata.accept(this);
+      ElementResolver.resolveMetadata(node);
+    }
+    //
+    // Continue the extension resolution.
+    //
+    try {
+      typeAnalyzer.thisType = node.declaredElement.extendedType;
+      super.visitExtensionDeclaration(node);
+      node.accept(elementResolver);
+      node.accept(typeAnalyzer);
+    } finally {
+      typeAnalyzer.thisType = null;
+    }
+  }
+
   @override
   void visitForElementInScope(ForElement node) {
     ForLoopParts forLoopParts = node.forLoopParts;
diff --git a/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart b/pkg/analyzer/test/src/dart/resolution/extension_method_test.dart
@@ -94,6 +94,31 @@ f() {
     expect(invocation.identifier.staticElement, declaration.declaredElement);
   }
 
+  test_getter_usingThis() async {
+    await assertNoErrorsInCode('''
+class C {}
+
+extension E on C {
+  int get a => 1;
+  int m() => this.a;
+}
+''');
+    var access = findNode.propertyAccess('this.a');
+    assertPropertyAccess(access, findElement.getter('a'), 'int');
+  }
+
+  @failingTest
+  test_metadata() async {
+    await assertNoErrorsInCode('''
+const int ann = 1;
+class C {}
+@ann
+extension E on C {}
+''');
+    var annotation = findNode.annotation('@ann');
+    assertElement(annotation, findElement.topVar('ann'));
+  }
+
   test_method_moreSpecificThanPlatform() async {
     //
     // An extension with on type clause T1 is more specific than another
