[DAS] Ambiguous Import fix - fix for static members

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

Author: FMorschel

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

@@ -28,7 +28,9 @@ class AmbiguousImportFix extends MultiCorrectionProducer {
       prefix = node.importPrefix?.name.lexeme;
     } else if (node is SimpleIdentifier) {
       element = node.element;
-      if (node.parent case PrefixedIdentifier(prefix: var currentPrefix)) {
+      if (node.parent case PrefixedIdentifier(
+        prefix: var currentPrefix,
+      ) when currentPrefix != node) {
         prefix = currentPrefix.name;
       }
     }

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

@@ -539,6 +539,62 @@ void f(l.N? n) {
 ''', matchFixMessage: "Hide others to use 'N' from 'lib1.dart' as l");
   }
 
+  Future<void> test_static_member() async {
+    newFile(join(testPackageLibPath, 'lib1.dart'), '''
+class N {}''');
+    newFile(join(testPackageLibPath, 'lib2.dart'), '''
+class N {}''');
+    await resolveTestCode('''
+import 'lib1.dart';
+import 'lib2.dart';
+
+void f() {
+  var _ = [N.new];
+}
+''');
+    await assertHasFix(
+      '''
+import 'lib1.dart' hide N;
+import 'lib2.dart';
+
+void f() {
+  var _ = [N.new];
+}
+''',
+      matchFixMessage: "Hide others to use 'N' from 'lib2.dart'",
+      errorFilter:
+          (error) => error.errorCode == CompileTimeErrorCode.AMBIGUOUS_IMPORT,
+    );
+  }
+
+  Future<void> test_static_member_prefixed() async {
+    newFile(join(testPackageLibPath, 'lib1.dart'), '''
+class N {}''');
+    newFile(join(testPackageLibPath, 'lib2.dart'), '''
+class N {}''');
+    await resolveTestCode('''
+import 'lib1.dart' as l;
+import 'lib2.dart' as l;
+
+void f() {
+  var _ = [l.N.new];
+}
+''');
+    await assertHasFix(
+      '''
+import 'lib1.dart' as l hide N;
+import 'lib2.dart' as l;
+
+void f() {
+  var _ = [l.N.new];
+}
+''',
+      matchFixMessage: "Hide others to use 'N' from 'lib2.dart' as l",
+      errorFilter:
+          (error) => error.errorCode == CompileTimeErrorCode.AMBIGUOUS_IMPORT,
+    );
+  }
+
   Future<void> test_triple() async {
     newFile(join(testPackageLibPath, 'lib1.dart'), '''
 export 'lib3.dart';''');