Augment. Report AUGMENTATION_TYPE_PARAMETER_NAME

Change-Id: Icd455e26ec11f2daa9907e996df2706bd8f7d9f0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/373321
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: scheglov

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -215,6 +215,10 @@ CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_BOUND:
   status: noFix
 CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_COUNT:
   status: noFix
+CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_NAME:
+  status: needsFix
+  notes: |-
+    We could rename the type parameter, this is purely local operation.
 CompileTimeErrorCode.AUGMENTATION_WITHOUT_DECLARATION:
   status: noFix
 CompileTimeErrorCode.AUGMENTATION_WITHOUT_IMPORT:

pkg/analyzer/lib/src/error/codes.g.dart

@@ -277,6 +277,16 @@ class CompileTimeErrorCode extends AnalyzerErrorCode {
         "parameters.",
   );
 
+  static const CompileTimeErrorCode AUGMENTATION_TYPE_PARAMETER_NAME =
+      CompileTimeErrorCode(
+    'AUGMENTATION_TYPE_PARAMETER_NAME',
+    "The augmentation type parameter must have the same name as the "
+        "corresponding type parameter of the declaration.",
+    correctionMessage:
+        "Try changing the augmentation to match the declaration type "
+        "parameters.",
+  );
+
   static const CompileTimeErrorCode AUGMENTATION_WITHOUT_DECLARATION =
       CompileTimeErrorCode(
     'AUGMENTATION_WITHOUT_DECLARATION',

pkg/analyzer/lib/src/error/error_code_values.g.dart

@@ -69,6 +69,7 @@ const List<ErrorCode> errorCodeValues = [
   CompileTimeErrorCode.AUGMENTATION_OF_DIFFERENT_DECLARATION_KIND,
   CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_BOUND,
   CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_COUNT,
+  CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_NAME,
   CompileTimeErrorCode.AUGMENTATION_WITHOUT_DECLARATION,
   CompileTimeErrorCode.AUGMENTATION_WITHOUT_IMPORT,
   CompileTimeErrorCode.AUGMENTATION_WITHOUT_LIBRARY,

pkg/analyzer/lib/src/generated/error_verifier.dart

@@ -1707,6 +1707,15 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
             for (var index = 0; index < declarationCount; index++) {
               var ofDeclaration = declarationTypeParameters[index];
               var ofAugmentation = typeParameters[index];
+
+              if (ofAugmentation.name.lexeme != ofDeclaration.name) {
+                errorReporter.atToken(
+                  ofAugmentation.name,
+                  CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_NAME,
+                );
+                continue;
+              }
+
               var declarationBound = ofDeclaration.bound;
               var augmentationBound = ofAugmentation.bound;
               switch ((declarationBound, augmentationBound)) {
@@ -1733,7 +1742,6 @@ class ErrorVerifier extends RecursiveAstVisitor<void>
                   }
               }
             }
-          // TODO(scheglov): check names
         }
       }
     }

pkg/analyzer/messages.yaml

@@ -1162,6 +1162,10 @@ CompileTimeErrorCode:
     problemMessage: The augmentation must have the same number of type parameters as the declaration.
     correctionMessage: Try changing the augmentation to match the declaration type parameters.
     hasPublishedDocs: false
+  AUGMENTATION_TYPE_PARAMETER_NAME:
+    problemMessage: The augmentation type parameter must have the same name as the corresponding type parameter of the declaration.
+    correctionMessage: Try changing the augmentation to match the declaration type parameters.
+    hasPublishedDocs: false
   AUGMENTATION_WITHOUT_DECLARATION:
     problemMessage: The declaration being augmented doesn't exist.
     correctionMessage: Try changing the augmentation to match an existing declaration.

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

@@ -0,0 +1,97 @@
+// Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:analyzer/src/error/codes.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+import '../dart/resolution/context_collection_resolution.dart';
+
+main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(AugmentationTypeParameterNameTest);
+  });
+}
+
+@reflectiveTest
+class AugmentationTypeParameterNameTest extends PubPackageResolutionTest {
+  test_class() async {
+    newFile('$testPackageLibPath/a.dart', r'''
+import augment 'test.dart';
+
+class A<T> {}
+''');
+
+    await assertErrorsInCode(r'''
+augment library 'a.dart';
+
+augment class A<U> {}
+''', [
+      error(CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_NAME, 43, 1),
+    ]);
+  }
+
+  test_enum() async {
+    newFile('$testPackageLibPath/a.dart', r'''
+import augment 'test.dart';
+
+enum A<T> {v}
+''');
+
+    await assertErrorsInCode(r'''
+augment library 'a.dart';
+
+augment enum A<U> {}
+''', [
+      error(CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_NAME, 42, 1),
+    ]);
+  }
+
+  test_extension() async {
+    newFile('$testPackageLibPath/a.dart', r'''
+import augment 'test.dart';
+
+extension A<T> on int {}
+''');
+
+    await assertErrorsInCode(r'''
+augment library 'a.dart';
+
+augment extension A<U> {}
+''', [
+      error(CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_NAME, 47, 1),
+    ]);
+  }
+
+  test_extensionType() async {
+    newFile('$testPackageLibPath/a.dart', r'''
+import augment 'test.dart';
+
+extension type A<T>(int it) {}
+''');
+
+    await assertErrorsInCode(r'''
+augment library 'a.dart';
+
+augment extension type A<U>(int it) {}
+''', [
+      error(CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_NAME, 52, 1),
+    ]);
+  }
+
+  test_mixin() async {
+    newFile('$testPackageLibPath/a.dart', r'''
+import augment 'test.dart';
+
+mixin A<T> {}
+''');
+
+    await assertErrorsInCode(r'''
+augment library 'a.dart';
+
+augment mixin A<U> {}
+''', [
+      error(CompileTimeErrorCode.AUGMENTATION_TYPE_PARAMETER_NAME, 43, 1),
+    ]);
+  }
+}

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

@@ -49,6 +49,8 @@ import 'augmentation_type_parameter_bound_test.dart'
     as augmentation_type_parameter_bound;
 import 'augmentation_type_parameter_count_test.dart'
     as augmentation_type_parameter_count;
+import 'augmentation_type_parameter_name_test.dart'
+    as augmentation_type_parameter_name;
 import 'augmentation_without_declaration_test.dart'
     as augmentation_without_declaration;
 import 'await_in_late_local_variable_initializer_test.dart'
@@ -955,6 +957,7 @@ main() {
     augmentation_of_different_declaration_kind.main();
     augmentation_type_parameter_bound.main();
     augmentation_type_parameter_count.main();
+    augmentation_type_parameter_name.main();
     augmentation_without_declaration.main();
     await_in_late_local_variable_initializer.main();
     await_in_wrong_context.main();