[DAS] Fixes auto-complete import combinator update for enum constants

Fixes: #60565

Change-Id: I9bd4740b48569afe86c4a7f02412f5e50e654bfd
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/423621
Auto-Submit: Felipe Morschel <git@fmorschel.dev>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Samuel Rawlins <srawlins@google.com>

Author: FMorschel

pkg/analysis_server/lib/src/lsp/handlers/handler_completion_resolve.dart

@@ -12,6 +12,7 @@ import 'package:analysis_server/src/lsp/mapping.dart';
 import 'package:analysis_server/src/utilities/element_location2.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/analysis/session.dart';
+import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 
 class CompletionResolveHandler
@@ -93,10 +94,15 @@ class CompletionResolveHandler
                 ).locateIn(session)
                 : null;
 
+        var showName = element?.name3;
+        if (element?.enclosingElement case InstanceElement(:var name3)) {
+          showName = name3;
+        }
+
         var builder = ChangeBuilder(session: session);
         await builder.addDartFileEdit(file, (builder) {
           for (var uri in importUris) {
-            builder.importLibraryElement(uri, showName: element?.name3);
+            builder.importLibraryElement(uri, showName: showName);
           }
         });
 

pkg/analysis_server/test/lsp/completion_dart_test.dart

@@ -2103,6 +2103,76 @@ import 'dart:^';
     expect(res.any((c) => c.label == 'dart:async'), isTrue);
   }
 
+  Future<void> test_importedSymbol_libraryImported_hidingVariable() async {
+    newFile(join(projectFolderPath, 'lib', 'import.dart'), '''
+enum MyEnum {
+  value1,
+  value2,
+}
+void myFunction(MyEnum _) {}
+var myVariable = 1;
+''');
+
+    var content = '''
+import 'import.dart' hide myVariable;
+
+void main() {
+  myFunction(MyE^);
+}
+''';
+
+    var expectedContent = '''
+import 'import.dart' hide myVariable;
+
+void main() {
+  myFunction(MyEnum.value1);
+}
+''';
+
+    var completionLabel = 'MyEnum.value1';
+
+    await _checkCompletionEdits(
+      mainFileUri,
+      content,
+      completionLabel,
+      expectedContent,
+    );
+  }
+
+  Future<void> test_importedSymbol_libraryImported_showingEnum() async {
+    newFile(join(projectFolderPath, 'lib', 'import.dart'), '''
+enum MyEnum {
+  value1,
+  value2,
+}
+''');
+
+    var content = '''
+import 'import.dart' show MyEnum;
+
+void main() {
+  MyEnum _ = My^;
+}
+''';
+
+    var expectedContent = '''
+import 'import.dart' show MyEnum;
+
+void main() {
+  MyEnum _ = MyEnum.value1;
+}
+''';
+
+    var completionLabel = 'MyEnum.value1';
+
+    await _checkCompletionEdits(
+      mainFileUri,
+      content,
+      completionLabel,
+      expectedContent,
+    );
+  }
+
   Future<void> test_insertReplaceRanges() async {
     setCompletionItemInsertReplaceSupport();