[DAS] Fixes wrong prefixes

[email protected]

Fixes #57090

Change-Id: I4a6597b174216dcdb8ce1801437b539e7f47136c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/396563
Reviewed-by: Samuel Rawlins <[email protected]>
Commit-Queue: Samuel Rawlins <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Phil Quitslund <[email protected]>

Author: FMorschel

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

@@ -21,6 +21,7 @@ import 'package:analyzer_plugin/src/utilities/change_builder/change_builder_dart
 import 'package:analyzer_plugin/src/utilities/library.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
+import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 class ImportLibrary extends MultiCorrectionProducer {
   final _ImportKind _importKind;
@@ -212,7 +213,8 @@ class ImportLibrary extends MultiCorrectionProducer {
         continue;
       }
       _ImportLibraryCombinator? combinatorProducer;
-      // Maybe update a "show" directive.
+      var importPrefix = import.prefix?.element;
+      // Maybe update a "show"/"hide" directive.
       var combinators = import.combinators;
       if (combinators.length == 1) {
         // Prepare library name - unit name or 'dart:name' for SDK library.
@@ -229,6 +231,7 @@ class ImportLibrary extends MultiCorrectionProducer {
             libraryName,
             combinator,
             name,
+            removePrefix: importPrefix == null,
             context: context,
           );
         } else if (combinator is ShowElementCombinator) {
@@ -238,18 +241,19 @@ class ImportLibrary extends MultiCorrectionProducer {
             libraryName,
             combinator,
             name,
+            removePrefix: importPrefix == null,
             context: context,
           );
         }
       }
       // Maybe apply a prefix.
-      var prefix = import.prefix?.element;
-      if (prefix != null) {
+      if (importPrefix != null) {
         producers.add(
           _ImportLibraryPrefix(
             libraryElement,
-            prefix,
+            importPrefix,
             combinatorProducer,
+            prefix,
             context: context,
           ),
         );
@@ -593,12 +597,15 @@ class _ImportLibraryCombinator extends ResolvedCorrectionProducer {
 
   final String _updatedName;
 
+  final bool _removePrefix;
+
   _ImportLibraryCombinator(
     this._libraryName,
     this._combinator,
     this._updatedName, {
+    bool removePrefix = false,
     required super.context,
-  });
+  }) : _removePrefix = removePrefix;
 
   @override
   CorrectionApplicability get applicability =>
@@ -643,6 +650,20 @@ class _ImportLibraryCombinator extends ResolvedCorrectionProducer {
         SourceRange(offset - 1, length + 1),
         newCombinatorCode,
       );
+      if (_removePrefix) {
+        AstNode? prefix;
+        if (node case NamedType(:var importPrefix?)) {
+          prefix = importPrefix;
+        } else if (node case PrefixedIdentifier(:var prefix)) {
+          prefix = prefix;
+        } else {
+          return;
+        }
+        if (prefix == null) {
+          return;
+        }
+        builder.addDeletion(range.node(prefix));
+      }
     });
   }
 }
@@ -699,12 +720,14 @@ class _ImportLibraryContainingExtension extends ResolvedCorrectionProducer {
 class _ImportLibraryPrefix extends ResolvedCorrectionProducer {
   final LibraryElement _importedLibrary;
   final PrefixElement _importPrefix;
+  final String? _nodePrefix;
   final _ImportLibraryCombinator? _editCombinator;
 
   _ImportLibraryPrefix(
     this._importedLibrary,
     this._importPrefix,
-    this._editCombinator, {
+    this._editCombinator,
+    this._nodePrefix, {
     required super.context,
   });
 
@@ -735,9 +758,23 @@ class _ImportLibraryPrefix extends ResolvedCorrectionProducer {
 
     await _editCombinator?.compute(builder);
 
-    await builder.addDartFileEdit(file, (builder) {
-      builder.addSimpleInsertion(targetNode.offset, '$_prefixName.');
-    });
+    if (_nodePrefix == null) {
+      await builder.addDartFileEdit(file, (builder) {
+        builder.addSimpleInsertion(targetNode.offset, '$_prefixName.');
+      });
+    } else if (_nodePrefix != _prefixName) {
+      AstNode prefix;
+      if (targetNode case NamedType(:var importPrefix?)) {
+        prefix = importPrefix;
+      } else if (targetNode case PrefixedIdentifier(prefix: var prefixNode)) {
+        prefix = prefixNode;
+      } else {
+        return;
+      }
+      await builder.addDartFileEdit(file, (builder) {
+        builder.addSimpleReplacement(range.node(prefix), '$_prefixName.');
+      });
+    }
   }
 }
 

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

@@ -318,7 +318,7 @@ abstract class FixProcessorTest extends BaseFixProcessorTest {
   /// [expected] output.
   Future<void> assertHasFix(
     String expected, {
-    bool Function(AnalysisError)? errorFilter,
+    bool Function(AnalysisError error)? errorFilter,
     String? target,
     int? expectedNumberOfFixesForKind,
     String? matchFixMessage,

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

@@ -42,6 +42,31 @@ void f(String s, lib.C c) {
 ''');
   }
 
+  Future<void> test_extension_hidden_class() async {
+    newFile('$testPackageLibPath/lib.dart', '''
+class C {}
+extension E on String {
+  int get m => 0;
+}
+''');
+    await resolveTestCode('''
+import 'package:test/lib.dart' as lib hide C;
+import 'package:test/lib.dart' hide C;
+
+void f(String s, lib.C c) {
+  s.m;
+}
+''');
+    await assertHasFix('''
+import 'package:test/lib.dart' as lib hide C;
+import 'package:test/lib.dart';
+
+void f(String s, C c) {
+  s.m;
+}
+''');
+  }
+
   Future<void> test_extension_hidden_getter() async {
     newFile('$testPackageLibPath/lib.dart', '''
 class C {}

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

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analyzer/src/error/codes.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -47,6 +48,62 @@ void f(lib.C c) {
 ''');
   }
 
+  Future<void> test_with_hideCombinator() async {
+    newFile('$testPackageLibPath/lib.dart', '''
+class A {}
+class B {}
+''');
+    await resolveTestCode(r'''
+import 'lib.dart' as lib hide A;
+void f() {
+  lib.A? a;
+  lib.B b;
+  print('$a $b');
+}
+''');
+    await assertHasFix(
+      r'''
+import 'lib.dart' as lib;
+void f() {
+  lib.A? a;
+  lib.B b;
+  print('$a $b');
+}
+''',
+      errorFilter: (error) {
+        return error.errorCode == CompileTimeErrorCode.UNDEFINED_CLASS;
+      },
+    );
+  }
+
+  Future<void> test_with_hideCombinator_differentPrefix() async {
+    newFile('$testPackageLibPath/lib.dart', '''
+class A {}
+class B {}
+''');
+    await resolveTestCode(r'''
+import 'lib.dart' as lib hide A;
+void f() {
+  lib2.A? a;
+  lib.B b;
+  print('$a $b');
+}
+''');
+    await assertHasFix(
+      r'''
+import 'lib.dart' as lib;
+void f() {
+  lib.A? a;
+  lib.B b;
+  print('$a $b');
+}
+''',
+      errorFilter: (error) {
+        return error.errorCode == CompileTimeErrorCode.UNDEFINED_CLASS;
+      },
+    );
+  }
+
   Future<void> test_with_showCombinator() async {
     newFile('$testPackageLibPath/lib.dart', '''
 class A {}