Test for default value referencing extension static method.

scheglov · commit-bot@chromium.org · commit a66a42baffb0 · 2019-07-25T02:59:24.000Z
Plus implementation for summary2. And couple other fixes around extensions. R=brianwilkerson@google.com, paulberry@google.com Change-Id: Ibb90a6f2fc32ac4ef71023db1f51cdf8d3265022 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110363 Reviewed-by: Brian Wilkerson <brianwilkerson@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analyzer/lib/src/summary2/default_value_resolver.dart b/pkg/analyzer/lib/src/summary2/default_value_resolver.dart
@@ -28,6 +28,10 @@ class DefaultValueResolver {
 
   void resolve() {
     for (CompilationUnitElementImpl unit in _libraryElement.units) {
+      for (var extensionElement in unit.extensions) {
+        _extension(extensionElement);
+      }
+
       for (var classElement in unit.mixins) {
         _class(classElement);
       }
@@ -67,6 +71,13 @@ class DefaultValueResolver {
     _parameters(element.parameters);
   }
 
+  void _extension(ExtensionElement extensionElement) {
+    for (var element in extensionElement.methods) {
+      _setScopeFromElement(element);
+      _method(element);
+    }
+  }
+
   void _function(FunctionElementImpl element) {
     _astResolver = null;
     _executableElement = element;
diff --git a/pkg/analyzer/lib/src/summary2/informative_data.dart b/pkg/analyzer/lib/src/summary2/informative_data.dart
@@ -153,7 +153,7 @@ class _SetInformativeId extends SimpleAstVisitor<void> {
         codeOffset: node.offset,
         codeLength: node.length,
         documentationComment_tokens: _nodeCommentTokens(node),
-        nameOffset: node.name.offset,
+        nameOffset: node.name?.offset ?? 0,
       ),
     );
 
diff --git a/pkg/analyzer/lib/src/summary2/lazy_ast.dart b/pkg/analyzer/lib/src/summary2/lazy_ast.dart
@@ -707,7 +707,7 @@ class LazyExtensionDeclaration {
     ExtensionDeclaration node,
   ) {
     var lazy = get(node);
-    if (lazy != null) {
+    if (lazy?.data != null) {
       return context.getInformativeData(lazy.data)?.codeLength ?? 0;
     }
     return node.length;
@@ -718,7 +718,7 @@ class LazyExtensionDeclaration {
     ExtensionDeclaration node,
   ) {
     var lazy = get(node);
-    if (lazy != null) {
+    if (lazy?.data != null) {
       return context.getInformativeData(lazy.data)?.codeOffset ?? 0;
     }
     return node.offset;
@@ -729,7 +729,7 @@ class LazyExtensionDeclaration {
     ExtensionDeclaration node,
   ) {
     var lazy = get(node);
-    if (lazy != null && !lazy._hasDocumentationComment) {
+    if (lazy?.data != null && !lazy._hasDocumentationComment) {
       node.documentationComment = context.createComment(lazy.data);
       lazy._hasDocumentationComment = true;
     }
@@ -740,7 +740,7 @@ class LazyExtensionDeclaration {
     ExtensionDeclaration node,
   ) {
     var lazy = get(node);
-    if (lazy != null && !lazy._hasExtendedType) {
+    if (lazy?.data != null && !lazy._hasExtendedType) {
       (node as ExtensionDeclarationImpl).extendedType = reader.readNode(
         lazy.data.extensionDeclaration_extendedType,
       );
@@ -753,7 +753,7 @@ class LazyExtensionDeclaration {
     ExtensionDeclaration node,
   ) {
     var lazy = get(node);
-    if (lazy != null && !lazy._hasMembers) {
+    if (lazy?.data != null && !lazy._hasMembers) {
       var dataList = lazy.data.extensionDeclaration_members;
       for (var i = 0; i < dataList.length; ++i) {
         var data = dataList[i];
@@ -768,7 +768,7 @@ class LazyExtensionDeclaration {
     ExtensionDeclaration node,
   ) {
     var lazy = get(node);
-    if (lazy != null && !lazy._hasMetadata) {
+    if (lazy?.data != null && !lazy._hasMetadata) {
       var dataList = lazy.data.annotatedNode_metadata;
       for (var i = 0; i < dataList.length; ++i) {
         var data = dataList[i];
diff --git a/pkg/analyzer/lib/src/summary2/reference_resolver.dart b/pkg/analyzer/lib/src/summary2/reference_resolver.dart
@@ -181,8 +181,7 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {
     node.typeParameters?.accept(this);
     node.extendedType.accept(this);
 
-    // TODO(scheglov) do we need a scope?
-//    scope = new ClassScope(scope, element);
+    scope = new ExtensionScope(scope, element);
     LinkingNodeContext(node, scope);
 
     node.members.accept(this);
diff --git a/pkg/analyzer/lib/src/test_utilities/find_element.dart b/pkg/analyzer/lib/src/test_utilities/find_element.dart
@@ -344,6 +344,15 @@ class FindElement {
       findIn(function.parameters);
     }
 
+    for (var extension_ in unitElement.extensions) {
+      for (var method in extension_.methods) {
+        findIn(method.parameters);
+      }
+      for (var accessor in extension_.accessors) {
+        findIn(accessor.parameters);
+      }
+    }
+
     for (var class_ in unitElement.types) {
       for (var constructor in class_.constructors) {
         findIn(constructor.parameters);
diff --git a/pkg/analyzer/test/src/summary/resynthesize_ast_test.dart b/pkg/analyzer/test/src/summary/resynthesize_ast_test.dart
@@ -38,6 +38,12 @@ class ResynthesizeAstStrongTest extends ResynthesizeTestStrategyTwoPhase
   @failingTest // See dartbug.com/33441
   test_const_set_inferredType() => super.test_const_set_inferredType();
 
+  @override
+  @failingTest
+  test_defaultValue_refersToExtension_method() async {
+    await super.test_defaultValue_refersToExtension_method();
+  }
+
   @override
   @failingTest
   test_defaultValue_refersToGenericClass() async {
diff --git a/pkg/analyzer/test/src/summary/resynthesize_common.dart b/pkg/analyzer/test/src/summary/resynthesize_common.dart
@@ -5124,6 +5124,29 @@ void defaultF<T>(T v) {}
 ''');
   }
 
+  test_defaultValue_refersToExtension_method() async {
+    featureSet = enableExtensionMethods;
+    var library = await checkLibrary('''
+class A {}
+extension E on A {
+  static void f() {}
+  static void g([Object p = f]) {}
+}
+''');
+    checkElementText(
+        library,
+        r'''
+class A {
+}
+extension E on A {
+  static void f() {}
+  static void g([Object p =
+        f/*location: test.dart;E;f*/]) {}
+}
+''',
+        withTypes: true);
+  }
+
   test_defaultValue_refersToGenericClass() async {
     var library = await checkLibrary('''
 class B<T1, T2> {
