[macros] quick fix for DUPLICATE_AUGMENTATION_IMPORT

(This was stashed locally and just remembering it.)

If this feels risky to land, happy to hold off.


Change-Id: I5349414bf7eb609ea151866436df4df7bb46bcec
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/366884
Reviewed-by: Konstantin Shcheglov <[email protected]>
Commit-Queue: Phil Quitslund <[email protected]>

Author: pq

pkg/analysis_server/lib/src/services/correction/dart/remove_unused_import.dart

@@ -26,7 +26,7 @@ class RemoveUnusedImport extends ResolvedCorrectionProducer {
   @override
   Future<void> compute(ChangeBuilder builder) async {
     // prepare ImportDirective
-    var importDirective = node.thisOrAncestorOfType<ImportDirective>();
+    var importDirective = node.thisOrAncestorOfType<UriBasedDirective>();
     if (importDirective == null) {
       return;
     }

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

@@ -519,9 +519,7 @@ CompileTimeErrorCode.DISALLOWED_TYPE_INSTANTIATION_EXPRESSION:
   status: needsFix
   since: 2.15
 CompileTimeErrorCode.DUPLICATE_AUGMENTATION_IMPORT:
-  status: needsFix
-  notes: |-
-    Remove the duplicated import.
+  status: hasFix
 CompileTimeErrorCode.DUPLICATE_CONSTRUCTOR_DEFAULT:
   status: noFix
   notes: |-

pkg/analysis_server/lib/src/services/correction/fix_internal.dart

@@ -906,6 +906,9 @@ final _builtInNonLintProducers = <ErrorCode, List<ProducerGenerator>>{
     RemoveDefaultValue.new,
     RemoveRequired.new,
   ],
+  CompileTimeErrorCode.DUPLICATE_AUGMENTATION_IMPORT: [
+    RemoveUnusedImport.new,
+  ],
   CompileTimeErrorCode.EMPTY_MAP_PATTERN: [
     ReplaceEmptyMapPattern.any,
     ReplaceEmptyMapPattern.empty,

pkg/analysis_server/test/src/services/correction/fix/remove_unused_import_test.dart

@@ -178,6 +178,29 @@ void f(Completer f) {
 ''');
   }
 
+  Future<void> test_duplicateAugmentation() async {
+    newFile('$testPackageLibPath/a.dart', '''
+augment library 'test.dart';
+class A {}
+''');
+
+    newFile('$testPackageLibPath/b.dart', '''
+augment library 'test.dart';
+class B {}
+''');
+
+    await resolveTestCode('''
+import augment 'a.dart';
+import augment 'b.dart';
+import augment 'a.dart';
+''');
+
+    await assertHasFix('''
+import augment 'a.dart';
+import augment 'b.dart';
+''');
+  }
+
   Future<void> test_duplicateImport() async {
     await resolveTestCode('''
 import 'dart:math';