[DAS] Fixes keywords suggestion for patterns

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

Author: FMorschel

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

@@ -302,7 +302,6 @@ class DeclarationHelper {
       );
     } else if (type is RecordType) {
       _addFieldsOfRecordType(type: type, excludedFields: excludedGetters);
-      _addMembersOfDartCoreObject();
     }
   }
 

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

@@ -18,7 +18,6 @@ import 'package:analysis_server/src/utilities/extensions/ast.dart';
 import 'package:analysis_server/src/utilities/extensions/completion_request.dart';
 import 'package:analysis_server/src/utilities/extensions/object.dart';
 import 'package:analyzer/dart/analysis/features.dart';
-import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/ast/visitor.dart';
@@ -2211,7 +2210,10 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
       }
     } else if (name.name == null) {
       collector.completionLocation = 'PatternField_pattern';
-      _forVariablePattern();
+      var parent = node.thisOrAncestorOfType<PatternVariableDeclarationImpl>();
+      if (parent == null) {
+        _forVariablePattern();
+      }
       _forPatternFieldName(name);
     } else {
       collector.completionLocation = 'PatternField_pattern';
@@ -3627,15 +3629,24 @@ class InScopeCompletionPass extends SimpleAstVisitor<void> {
     // Might be a start of a ObjectPattern.
     // Might be a ConstantPattern.
     if (coveringNode case SimpleIdentifier identifier) {
-      if (!identifier.isSynthetic) {
-        if (identifier.parent is ConstantPattern) {
-          keywordHelper.addPatternKeywords();
-          // TODO(scheglov): Actually we need constructors, but only const.
-          // And not-yet imported contributors does not work well yet.
+      if (identifier.isSynthetic) {
+        if (coveringNode.parent?.parent case PatternField _) {
+          keywordHelper.addVariablePatternKeywords();
           collector.preferConstants = true;
-          declarationHelper(mustBeNonVoid: true).addLexicalDeclarations(node);
+          declarationHelper(
+            mustBeConstant: mustBeConst,
+            mustBeStatic: node.inStaticContext,
+            objectPatternAllowed: true,
+          ).addLexicalDeclarations(node);
           return;
         }
+      } else if (identifier.parent is ConstantPattern) {
+        keywordHelper.addPatternKeywords();
+        // TODO(scheglov): Actually we need constructors, but only const.
+        // And not-yet imported contributors does not work well yet.
+        collector.preferConstants = true;
+        declarationHelper(mustBeNonVoid: true).addLexicalDeclarations(node);
+        return;
       }
     }
 

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

@@ -58,14 +58,10 @@ suggestions
     kind: field
   f11
     kind: field
-  final
-    kind: keyword
   g01
     kind: getter
   g11
     kind: getter
-  var
-    kind: keyword
 ''');
   }
 

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

@@ -41,21 +41,12 @@ void f(({int f01, int f02, int g01}) x0) {
   (f01: ^) = x0;
 }
 ''');
-    // TODO(scheglov): This is wrong.
     assertResponse(r'''
 suggestions
   v01
     kind: localVariable
   x0
     kind: parameter
-  false
-    kind: keyword
-  null
-    kind: keyword
-  true
-    kind: keyword
-  const
-    kind: keyword
   final
     kind: keyword
   var
@@ -109,12 +100,8 @@ suggestions
     kind: identifier
   f02
     kind: identifier
-  final
-    kind: keyword
   g01
     kind: identifier
-  var
-    kind: keyword
 ''');
   }
 
@@ -277,6 +264,33 @@ suggestions
     kind: identifier
   f02
     kind: identifier
+''');
+  }
+
+  Future<void> test_noObjectGetters() async {
+    allowedIdentifiers = {'hashCode'};
+    await computeSuggestions('''
+void f(({int f01, int f02}) record) {
+  var (:^) = record;
+}
+''');
+    assertResponse(r'''
+suggestions
+  f01
+    kind: identifier
+  f02
+    kind: identifier
+''');
+  }
+
+  Future<void> test_noVarKeyword_afterVar() async {
+    await computeSuggestions('''
+void f((int, int) record) {
+  var (:^) = record;
+}
+''');
+    assertResponse(r'''
+suggestions
 ''');
   }
 }