Add the dynamic keyword into additional missing portions of the AST in the keyword_contributor.dart

Change-Id: I64ff9721c151e3e51841ea638e8b2fd2b472ac27
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/138743
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Jaime Wren <[email protected]>

Author: jwren

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

@@ -513,12 +513,15 @@ class _KeywordVisitor extends GeneralizingAstVisitor<void> {
 
   @override
   void visitMethodInvocation(MethodInvocation node) {
-    if (entity == node.methodName || entity == node.argumentList) {
-      // no keywords in '.' expressions or type argument lists
+    if (entity == node.methodName) {
+      // no keywords in '.' expressions
+    } else if (entity == node.argumentList) {
       // Note that we're checking the argumentList rather than the typeArgumentList
       // as you'd expect. For some reason, when the cursor is in a type argument
       // list (f<^>()), the entity is the invocation's argumentList...
       // See similar logic in `imported_reference_contributor`.
+
+      _addSuggestion(Keyword.DYNAMIC);
     } else {
       super.visitMethodInvocation(node);
     }
@@ -658,6 +661,11 @@ class _KeywordVisitor extends GeneralizingAstVisitor<void> {
     return visitStatement(node);
   }
 
+  @override
+  void visitTypeArgumentList(TypeArgumentList node) {
+    _addSuggestion(Keyword.DYNAMIC);
+  }
+
   @override
   void visitVariableDeclaration(VariableDeclaration node) {
     if (entity == node.initializer) {

pkg/analysis_server/test/services/completion/dart/keyword_contributor_test.dart

@@ -2150,6 +2150,12 @@ f() => [...^];
     assertSuggestKeywords(statementStartInSwitchOutsideClass);
   }
 
+  Future<void> test_variable_decl_type_args() async {
+    addTestSource('void m() {List<^> list;}');
+    await computeSuggestions();
+    assertSuggestKeywords([Keyword.DYNAMIC]);
+  }
+
   Future<void> test_while_break_continue() async {
     addTestSource('main() {while (true) {^}}');
     await computeSuggestions();
@@ -2267,7 +2273,7 @@ void m() {
 ''');
 
     await computeSuggestions();
-    assertSuggestKeywords([]);
+    assertSuggestKeywords([Keyword.DYNAMIC]);
   }
 }