[DAS] Fixes values suggestion without enum name

Fixes: #61161
Change-Id: I6938d0ce60aaf50e71e4f1df644217f0344a89d6
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/444441
Commit-Queue: Samuel Rawlins <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/services/completion/dart/declaration_helper.dart

@@ -1349,7 +1349,8 @@ class DeclarationHelper {
     var referencingInterface = _referencingInterfaceFor(element);
 
     for (var accessor in element.getters) {
-      if (!accessor.isSynthetic && (!mustBeStatic || accessor.isStatic)) {
+      if ((!accessor.isSynthetic || accessor.isEnumValues) &&
+          (!mustBeStatic || accessor.isStatic)) {
         _suggestProperty(
           accessor: accessor,
           referencingInterface: referencingInterface,
@@ -2253,7 +2254,8 @@ class DeclarationHelper {
   void _suggestStaticField(FieldElement element, ImportData? importData) {
     if (!element.isStatic ||
         (mustBeAssignable && !(element.isFinal || element.isConst)) ||
-        (mustBeConstant && !element.isConst)) {
+        (mustBeConstant && !element.isConst) ||
+        (!element.isEnumConstant && element.enclosingElement is EnumElement)) {
       return;
     }
     var contextType = request.contextType;
@@ -2724,6 +2726,18 @@ class DeclarationHelper {
   }
 }
 
+extension on GetterElement {
+  /// Whether this getter is the `values` getter for an enum.
+  ///
+  /// Since we have `values_declaration_in_enum` this is a special case that
+  /// will always be valid.
+  bool get isEnumValues =>
+      name == 'values' &&
+      isStatic &&
+      isSynthetic &&
+      enclosingElement is EnumElement;
+}
+
 extension on Element {
   /// Whether this element is visible within the [referencingLibrary].
   ///

pkg/analysis_server/test/lsp/completion_dart_test.dart

@@ -105,6 +105,11 @@ $lintsYaml
 
 @reflectiveTest
 class CompletionDocumentationResolutionTest extends AbstractCompletionTest {
+  Future<void> assertNoCompletionItem(String label) async {
+    var completions = await getCompletion(mainFileUri, code.position.position);
+    expect(completions.where((c) => c.label == label), isEmpty);
+  }
+
   Future<CompletionItem> getCompletionItem(String label) async {
     var completions = await getCompletion(mainFileUri, code.position.position);
     return completions.singleWhere((c) => c.label == label);
@@ -274,6 +279,47 @@ void f() {
     expectDocumentation(resolved, contains('Enum Member.'));
   }
 
+  Future<void> test_enum_values() async {
+    content = '''
+void f() {
+  print(va^)
+}
+
+enum MyEnum {
+  value,
+}
+''';
+
+    await initializeServer();
+
+    await getCompletionItem('MyEnum.value');
+    await assertNoCompletionItem('MyEnum.values');
+    await assertNoCompletionItem('values');
+  }
+
+  Future<void> test_enum_values_insideEnum() async {
+    content = '''
+enum E {value}
+enum MyEnum {
+  value;
+
+  void f() {
+    print(^);
+  }
+}
+''';
+
+    await initializeServer();
+
+    await getCompletionItem('index');
+    await getCompletionItem('name');
+    await getCompletionItem('value');
+    await getCompletionItem('values');
+    await getCompletionItem('E.value');
+    await assertNoCompletionItem('MyEnum.values');
+    await assertNoCompletionItem('E.values');
+  }
+
   Future<void> test_innerPatternKeyword() async {
     content = '''
 class A {

pkg/analysis_server/test/services/completion/dart/declaration/enum_test.dart

@@ -29,6 +29,8 @@ enum E {
 replacement
   left: 1
 suggestions
+  values
+    kind: field
   a1
     kind: enumConstant
   a2
@@ -54,6 +56,8 @@ replacement
 suggestions
   a1
     kind: getter
+  values
+    kind: field
 ''');
   }
 
@@ -73,6 +77,8 @@ enum E {
 replacement
   left: 1
 suggestions
+  values
+    kind: field
   a1
     kind: methodInvocation
 ''');

pkg/analysis_server/test/services/completion/dart/location/dot_shorthand_property_access_test.dart

@@ -165,6 +165,27 @@ suggestions
 ''');
   }
 
+  Future<void> test_enum_static() async {
+    allowedIdentifiers = {'red', 'other'};
+    await computeSuggestions('''
+enum E {
+  red;
+
+  static const other = red;
+}
+void f() {
+  E e = .^
+}
+''');
+    assertResponse(r'''
+suggestions
+  other
+    kind: field
+  red
+    kind: enumConstant
+''');
+  }
+
   Future<void> test_enum_withPrefix() async {
     allowedIdentifiers = {'red', 'blue', 'yellow', 'black'};
     await computeSuggestions('''

pkg/analysis_server/test/services/completion/dart/location/enum_declaration_test.dart

@@ -378,6 +378,28 @@ suggestions
 ''');
   }
 
+  Future<void> test_static() async {
+    allowedIdentifiers = {'other'};
+    await computeSuggestions('''
+enum E {
+  constant;
+
+  static const other = constant;
+
+  void foo() {
+    ot^;
+  }
+}
+''');
+    assertResponse(r'''
+replacement
+  left: 2
+suggestions
+  other
+    kind: field
+''');
+  }
+
   Future<void> test_values() async {
     allowedIdentifiers = {'first', 'last'};
     includeKeywords = false;