Issue 60172. Fix for resolving metadata with extension types.

Bug: #60172
Bug: #60174
Change-Id: I0e4fb54fdc8419cf0eef7fd095a94fc10e5ec9dd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/411081
Reviewed-by: Paul Berry <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analyzer/lib/src/dart/resolver/annotation_resolver.dart

@@ -34,7 +34,7 @@ class AnnotationResolver {
 
   void _classConstructorInvocation(
     AnnotationImpl node,
-    ClassElement classElement,
+    InterfaceElement classElement,
     SimpleIdentifierImpl? constructorName,
     ArgumentListImpl argumentList,
     List<WhyNotPromotedGetter> whyNotPromotedArguments,
@@ -237,7 +237,7 @@ class AnnotationResolver {
 
     // Class(args) or Class.CONST
     if (element1 is InterfaceElement) {
-      if (element1 is ClassElement && argumentList != null) {
+      if (argumentList != null) {
         _classConstructorInvocation(
             node, element1, name2, argumentList, whyNotPromotedArguments);
       } else {

pkg/analyzer/test/src/dart/resolution/metadata_test.dart

@@ -657,6 +657,84 @@ D
 ''');
   }
 
+  test_value_extensionType_namedConstructor() async {
+    await assertNoErrorsInCode(r'''
+extension type const A.named(int it) {}
+
+@A.named(42)
+void f() {}
+''');
+
+    var node = findNode.singleAnnotation;
+    assertResolvedNodeText(node, r'''
+Annotation
+  atSign: @
+  name: PrefixedIdentifier
+    prefix: SimpleIdentifier
+      token: A
+      staticElement: <testLibraryFragment>::@extensionType::A
+      element: <testLibrary>::@extensionType::A
+      staticType: null
+    period: .
+    identifier: SimpleIdentifier
+      token: named
+      staticElement: <testLibraryFragment>::@extensionType::A::@constructor::named
+      element: <testLibraryFragment>::@extensionType::A::@constructor::named#element
+      staticType: null
+    staticElement: <testLibraryFragment>::@extensionType::A::@constructor::named
+    element: <testLibraryFragment>::@extensionType::A::@constructor::named#element
+    staticType: null
+  arguments: ArgumentList
+    leftParenthesis: (
+    arguments
+      IntegerLiteral
+        literal: 42
+        parameter: <testLibraryFragment>::@extensionType::A::@constructor::named::@parameter::it
+        staticType: int
+    rightParenthesis: )
+  element: <testLibraryFragment>::@extensionType::A::@constructor::named
+  element2: <testLibraryFragment>::@extensionType::A::@constructor::named#element
+''');
+
+    _assertAnnotationValueText(node, r'''
+int 42
+''');
+  }
+
+  test_value_extensionType_unnamedConstructor() async {
+    await assertNoErrorsInCode(r'''
+extension type const A(int it) {}
+
+@A(42)
+void f() {}
+''');
+
+    var node = findNode.singleAnnotation;
+    assertResolvedNodeText(node, r'''
+Annotation
+  atSign: @
+  name: SimpleIdentifier
+    token: A
+    staticElement: <testLibraryFragment>::@extensionType::A
+    element: <testLibrary>::@extensionType::A
+    staticType: null
+  arguments: ArgumentList
+    leftParenthesis: (
+    arguments
+      IntegerLiteral
+        literal: 42
+        parameter: <testLibraryFragment>::@extensionType::A::@constructor::new::@parameter::it
+        staticType: int
+    rightParenthesis: )
+  element: <testLibraryFragment>::@extensionType::A::@constructor::new
+  element2: <testLibraryFragment>::@extensionType::A::@constructor::new#element
+''');
+
+    _assertAnnotationValueText(node, r'''
+int 42
+''');
+  }
+
   test_value_genericClass_downwards_inference_namedConstructor() async {
     await assertNoErrorsInCode(r'''
 class A<T> {

pkg/analyzer/test/src/diagnostics/argument_type_not_assignable_test.dart

@@ -37,6 +37,17 @@ f() {
     expect(message.contains("_A"), isTrue);
   }
 
+  test_annotation_extensionType() async {
+    await assertErrorsInCode('''
+extension type const A(String _) {}
+
+@A(0)
+void f() {}
+''', [
+      error(CompileTimeErrorCode.ARGUMENT_TYPE_NOT_ASSIGNABLE, 40, 1),
+    ]);
+  }
+
   test_annotation_namedConstructor() async {
     await assertErrorsInCode('''
 class A {

pkg/analyzer/test/src/diagnostics/extra_positional_arguments_test.dart

@@ -17,7 +17,7 @@ main() {
 @reflectiveTest
 class ExtraPositionalArgumentsCouldBeNamedTest
     extends PubPackageResolutionTest {
-  test_constConstructor() async {
+  test_class_constConstructor() async {
     await assertErrorsInCode(r'''
 class A {
   const A({int x = 0});
@@ -31,7 +31,7 @@ main() {
     ]);
   }
 
-  test_constConstructor_super() async {
+  test_class_constConstructor_super() async {
     await assertErrorsInCode(r'''
 class A {
   const A({int x = 0});
@@ -45,7 +45,7 @@ class B extends A {
     ]);
   }
 
-  test_constConstructor_typedef() async {
+  test_class_constConstructor_typedef() async {
     await assertErrorsInCode(r'''
 class A {
   const A({int x = 0});
@@ -77,7 +77,18 @@ main() {
         findNode.methodInvocation('f()').typeArgumentTypes!.single, 'dynamic');
   }
 
-  test_enumConstant() async {
+  test_functionExpressionInvocation() async {
+    await assertErrorsInCode('''
+main() {
+  (int x, {int y = 0}) {} (0, 1);
+}
+''', [
+      error(CompileTimeErrorCode.EXTRA_POSITIONAL_ARGUMENTS_COULD_BE_NAMED, 39,
+          1),
+    ]);
+  }
+
+  test_metadata_enumConstant() async {
     await assertErrorsInCode(r'''
 enum E {
   v(0);
@@ -90,14 +101,14 @@ enum E {
     ]);
   }
 
-  test_functionExpressionInvocation() async {
-    await assertErrorsInCode('''
-main() {
-  (int x, {int y = 0}) {} (0, 1);
-}
+  test_metadata_extensionType() async {
+    await assertErrorsInCode(r'''
+extension type const A(int it) {}
+
+@A(0, 1)
+void f() {}
 ''', [
-      error(CompileTimeErrorCode.EXTRA_POSITIONAL_ARGUMENTS_COULD_BE_NAMED, 39,
-          1),
+      error(CompileTimeErrorCode.EXTRA_POSITIONAL_ARGUMENTS, 41, 1),
     ]);
   }