[DAS] Fixes completion for collection ifs and fors

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

Author: FMorschel

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

@@ -765,6 +765,16 @@ class _ContextTypeVisitor extends SimpleAstVisitor<DartType> {
     return null;
   }
 
+  @override
+  DartType? visitForElement(ForElement node) {
+    if (range
+        .endStart(node.leftParenthesis, node.rightParenthesis)
+        .contains(offset)) {
+      return node.forLoopParts.accept(this);
+    }
+    return node.parent!.accept(this);
+  }
+
   @override
   DartType? visitForPartsWithDeclarations(ForPartsWithDeclarations node) {
     if (range
@@ -812,7 +822,7 @@ class _ContextTypeVisitor extends SimpleAstVisitor<DartType> {
         .contains(offset)) {
       return typeProvider.boolType;
     }
-    return null;
+    return node.parent?.accept(this);
   }
 
   @override

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

@@ -19,20 +19,20 @@ f() => [for (var e in c) ^];
 ''');
     assertResponse(r'''
 suggestions
+  false
+    kind: keyword
+  null
+    kind: keyword
+  true
+    kind: keyword
   if
     kind: keyword
   const
     kind: keyword
-  false
-    kind: keyword
   for
     kind: keyword
-  null
-    kind: keyword
   switch
     kind: keyword
-  true
-    kind: keyword
 ''');
   }
 }

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

@@ -39,20 +39,20 @@ f() => [if (true) 1 else ^];
 ''');
     assertResponse(r'''
 suggestions
+  false
+    kind: keyword
+  null
+    kind: keyword
+  true
+    kind: keyword
   if
     kind: keyword
   for
     kind: keyword
   const
     kind: keyword
-  false
-    kind: keyword
-  null
-    kind: keyword
   switch
     kind: keyword
-  true
-    kind: keyword
 ''');
   }
 
@@ -77,20 +77,20 @@ f() => [if (true) ^];
 ''');
     assertResponse(r'''
 suggestions
+  false
+    kind: keyword
+  null
+    kind: keyword
+  true
+    kind: keyword
   const
     kind: keyword
   for
     kind: keyword
-  false
-    kind: keyword
   if
     kind: keyword
-  null
-    kind: keyword
   switch
     kind: keyword
-  true
-    kind: keyword
 ''');
   }
 

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

@@ -130,6 +130,58 @@ suggestions
 ''');
   }
 
+  Future<void> test_expectedType_namedField_forElement() async {
+    await computeSuggestions('''
+List<({int f01})> f() {
+  return [
+    for (int i = 0; i < 10; i++)
+      (^),
+  ];
+}
+''');
+    assertResponse(r'''
+suggestions
+  |f01: |
+    kind: namedArgument
+  const
+    kind: keyword
+  false
+    kind: keyword
+  null
+    kind: keyword
+  switch
+    kind: keyword
+  true
+    kind: keyword
+''');
+  }
+
+  Future<void> test_expectedType_namedField_ifElement() async {
+    await computeSuggestions('''
+List<({int f01})> f() {
+  return [
+    if (1 == 1)
+      (^),
+  ];
+}
+''');
+    assertResponse(r'''
+suggestions
+  |f01: |
+    kind: namedArgument
+  const
+    kind: keyword
+  false
+    kind: keyword
+  null
+    kind: keyword
+  switch
+    kind: keyword
+  true
+    kind: keyword
+''');
+  }
+
   Future<void> test_matchingContext_namedField_name() async {
     await computeSuggestions('''
 void f(({int f01, int f02, int g01}) x0) {

pkg/analysis_server/test/services/completion/dart/relevance/locality_test.dart

@@ -66,10 +66,10 @@ replacement
 suggestions
   v02
     kind: localVariable
-    relevance: 572
+    relevance: 594
   v01
     kind: parameter
-    relevance: 556
+    relevance: 578
 ''');
   }
 
@@ -86,13 +86,13 @@ replacement
 suggestions
   v02
     kind: localVariable
-    relevance: 572
+    relevance: 594
   v03
     kind: localVariable
-    relevance: 566
+    relevance: 588
   v01
     kind: parameter
-    relevance: 551
+    relevance: 573
 ''');
   }
 

pkg/analysis_server/test/src/services/completion/dart/feature_computer_test.dart

@@ -562,6 +562,14 @@ void f() {
 ''', 'Iterable<dynamic>');
   }
 
+  Future<void> test_forElement() async {
+    await assertContextType('''
+List<String> f() => [
+  for (int i = 0; i < 10; i ++) ^
+];
+''', 'String');
+  }
+
   Future<void> test_forPartsWithPattern_condition() async {
     await assertContextType('''
 void f() {
@@ -578,6 +586,14 @@ void f(bool b, int e) {
 ''', 'bool');
   }
 
+  Future<void> test_ifElement_else() async {
+    await assertContextType('''
+List<String> f(bool b) => [
+  if (b) '' else ^
+];
+''', 'String');
+  }
+
   Future<void> test_ifElement_identifier() async {
     await assertContextType('''
 void f(bool b, int e) {
@@ -586,6 +602,14 @@ void f(bool b, int e) {
 ''', 'bool');
   }
 
+  Future<void> test_ifElement_then() async {
+    await assertContextType('''
+List<String> f(bool b) => [
+  if (b) ^
+];
+''', 'String');
+  }
+
   Future<void> test_ifStatement_condition() async {
     await assertContextType('''
 void foo() {