[DAS] Update combinator - Use aliased import fix

[email protected]

Fixes #54786

Change-Id: I1354e3cde559229d5167a27e51efb6d030e5f8bc
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/392400
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Commit-Queue: Konstantin Shcheglov <[email protected]>

Author: FMorschel

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

@@ -194,14 +194,8 @@ class ImportLibrary extends MultiCorrectionProducer {
       if (!kinds.contains(element.kind)) {
         continue;
       }
-      // Maybe apply a prefix.
-      var prefix = import.prefix?.element;
-      if (prefix != null) {
-        producers.add(
-            _ImportLibraryPrefix(libraryElement, prefix, context: context));
-        continue;
-      }
-      // Maybe update a "show"/"hide" directive.
+      _ImportLibraryCombinator? combinatorProducer;
+      // Maybe update a "show" directive.
       var combinators = import.combinators;
       if (combinators.length == 1) {
         // Prepare library name - unit name or 'dart:name' for SDK library.
@@ -214,15 +208,27 @@ class ImportLibrary extends MultiCorrectionProducer {
         if (combinator is HideElementCombinator) {
           // Don't add this library again.
           alreadyImportedWithPrefix.add(libraryElement);
-          producers.add(_ImportLibraryCombinator(libraryName, combinator, name,
-              context: context));
+          combinatorProducer = _ImportLibraryCombinator(
+              libraryName, combinator, name,
+              context: context);
         } else if (combinator is ShowElementCombinator) {
           // Don't add this library again.
           alreadyImportedWithPrefix.add(libraryElement);
-          producers.add(_ImportLibraryCombinator(libraryName, combinator, name,
-              context: context));
+          combinatorProducer = _ImportLibraryCombinator(
+              libraryName, combinator, name,
+              context: context);
         }
       }
+      // Maybe apply a prefix.
+      var prefix = import.prefix?.element;
+      if (prefix != null) {
+        producers.add(_ImportLibraryPrefix(
+            libraryElement, prefix, combinatorProducer,
+            context: context));
+        continue;
+      } else if (combinatorProducer != null) {
+        producers.add(combinatorProducer);
+      }
     }
     // Find new top-level declarations.
     var librariesWithElements = await getTopLevelDeclarations(name);
@@ -564,10 +570,12 @@ class _ImportLibraryContainingExtension extends ResolvedCorrectionProducer {
 class _ImportLibraryPrefix extends ResolvedCorrectionProducer {
   final LibraryElement _importedLibrary;
   final PrefixElement _importPrefix;
+  final _ImportLibraryCombinator? _editCombinator;
 
   _ImportLibraryPrefix(
     this._importedLibrary,
-    this._importPrefix, {
+    this._importPrefix,
+    this._editCombinator, {
     required super.context,
   });
 
@@ -595,6 +603,8 @@ class _ImportLibraryPrefix extends ResolvedCorrectionProducer {
       targetNode = targetNode.name;
     }
 
+    await _editCombinator?.compute(builder);
+
     await builder.addDartFileEdit(file, (builder) {
       builder.addSimpleInsertion(targetNode.offset, '$_prefixName.');
     });

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

@@ -19,6 +19,57 @@ class ImportLibraryPrefixTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.IMPORT_LIBRARY_PREFIX;
 
+  Future<void> test_double_with_showCombinator() async {
+    newFile('$testPackageLibPath/lib1.dart', '''
+class A {}
+class B {}
+''');
+    newFile('$testPackageLibPath/lib2.dart', '''
+class C {}
+''');
+    await resolveTestCode(r'''
+import 'lib1.dart' as lib show A;
+import 'lib2.dart' as lib show C;
+void f(lib.C c) {
+  lib.A? a;
+  B b;
+  print('$a $b');
+}
+''');
+    await assertHasFix(r'''
+import 'lib1.dart' as lib show A, B;
+import 'lib2.dart' as lib show C;
+void f(lib.C c) {
+  lib.A? a;
+  lib.B b;
+  print('$a $b');
+}
+''');
+  }
+
+  Future<void> test_with_showCombinator() async {
+    newFile('$testPackageLibPath/lib.dart', '''
+class A {}
+class B {}
+''');
+    await resolveTestCode(r'''
+import 'lib.dart' as lib show A;
+void f() {
+  lib.A? a;
+  B b;
+  print('$a $b');
+}
+''');
+    await assertHasFix(r'''
+import 'lib.dart' as lib show A, B;
+void f() {
+  lib.A? a;
+  lib.B b;
+  print('$a $b');
+}
+''');
+  }
+
   Future<void> test_withAnnotation() async {
     newFile('$testPackageLibPath/a.dart', '''
 class MyAnnotation {