[DAS] Makes "Add type annotation" consider explicit type arguments

[email protected]

Fixes: #60080
Change-Id: I88bb6c3ece6f6a95bc22aa57e34aa16afa34bc7e
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412540
Commit-Queue: Konstantin Shcheglov <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Samuel Rawlins <[email protected]>

Author: FMorschel

pkg/analysis_server/lib/src/services/correction/dart/add_type_annotation.dart

@@ -55,7 +55,9 @@ class AddTypeAnnotation extends ResolvedCorrectionProducer {
       return;
     }
 
-    if (node is TypedLiteral) {
+    if (node case TypedLiteral(
+      :var typeArguments,
+    ) when typeArguments == null || typeArguments.isSynthetic) {
       await _typedLiteral(builder, node);
       return;
     }
@@ -205,7 +207,7 @@ class AddTypeAnnotation extends ResolvedCorrectionProducer {
     await builder.addDartFileEdit(file, (builder) {
       builder.addInsertion(offset, (builder) {
         builder.write('<');
-        builder.writeTypes(type.typeArguments);
+        builder.writeTypes(type.typeArguments, shouldWriteDynamic: true);
         builder.write('>');
       });
     });

pkg/analysis_server/test/src/services/correction/assist/add_type_annotation_test.dart

@@ -688,6 +688,38 @@ void f() {
     await assertNoAssistAt('var ');
   }
 
+  Future<void> test_mapLiteral_notype() async {
+    await resolveTestCode('''
+var map = {};
+''');
+    await assertHasAssistAt('{}', '''
+var map = <dynamic, dynamic>{};
+''');
+  }
+
+  Future<void> test_mapLiteral_writtenAnnotation() async {
+    await resolveTestCode('''
+var map = <String, int>{};
+''');
+    await assertNoAssistAt('{}');
+  }
+
+  Future<void> test_mapLiteral_writtenAnnotation2() async {
+    await resolveTestCode('''
+var map = <String, int>{};
+''');
+    await assertNoAssistAt('}');
+  }
+
+  Future<void> test_mapLiteral_writtenStaticType() async {
+    await resolveTestCode('''
+Map<String, int> map = {};
+''');
+    await assertHasAssistAt('{}', '''
+Map<String, int> map = <String, int>{};
+''');
+  }
+
   Future<void> test_parameter() async {
     await resolveTestCode('''
 foo(f(int p)) {}

pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart

@@ -792,18 +792,27 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
     String? groupName,
     ExecutableElement2? methodBeingCopied,
     bool required = false,
+    bool shouldWriteDynamic = false,
   }) {
     var wroteType = false;
-    if (type != null && type is! DynamicType) {
+    if (type != null && (shouldWriteDynamic || type is! DynamicType)) {
       if (groupName != null) {
         addLinkedEdit(groupName, (LinkedEditBuilder builder) {
-          wroteType = _writeType(type, methodBeingCopied: methodBeingCopied);
+          wroteType = _writeType(
+            type,
+            methodBeingCopied: methodBeingCopied,
+            required: shouldWriteDynamic,
+          );
           if (wroteType && addSupertypeProposals) {
             _addSuperTypeProposals(builder, type, {});
           }
         });
       } else {
-        wroteType = _writeType(type, methodBeingCopied: methodBeingCopied);
+        wroteType = _writeType(
+          type,
+          methodBeingCopied: methodBeingCopied,
+          required: shouldWriteDynamic,
+        );
       }
     }
     if (!wroteType && required) {
@@ -839,17 +848,21 @@ class DartEditBuilderImpl extends EditBuilderImpl implements DartEditBuilder {
   }
 
   @override
-  void writeTypes(Iterable<DartType>? types, {String? prefix}) {
+  void writeTypes(
+    Iterable<DartType>? types, {
+    String? prefix,
+    bool shouldWriteDynamic = false,
+  }) {
     if (types == null || types.isEmpty) {
       return;
     }
     if (prefix != null) {
       write(prefix);
     }
-    writeType(types.first);
+    writeType(types.first, shouldWriteDynamic: shouldWriteDynamic);
     for (var type in types.skip(1)) {
       write(', ');
-      writeType(type);
+      writeType(type, shouldWriteDynamic: shouldWriteDynamic);
     }
   }
 

pkg/analyzer_plugin/lib/utilities/change_builder/change_builder_dart.dart

@@ -329,6 +329,9 @@ abstract class DartEditBuilder implements EditBuilder {
 
   /// Writes the code for a type annotation for the given [type].
   ///
+  /// If [shouldWriteDynamic] is `true`, then the keyword `dynamic` will be
+  /// written if the type is `dynamic`.
+  ///
   /// If the [type] is either `null` or represents the type `dynamic`, then the
   /// behavior depends on whether a type is [required]. If [required] is `true`,
   /// then the keyword `var` will be written; otherwise, nothing is written.
@@ -344,11 +347,14 @@ abstract class DartEditBuilder implements EditBuilder {
   /// types.
   ///
   /// Returns `true` if any text was written.
-  bool writeType(DartType? type,
-      {bool addSupertypeProposals = false,
-      String? groupName,
-      ExecutableElement2? methodBeingCopied,
-      bool required = false});
+  bool writeType(
+    DartType? type, {
+    bool addSupertypeProposals = false,
+    String? groupName,
+    ExecutableElement2? methodBeingCopied,
+    bool required = false,
+    bool shouldWriteDynamic = false,
+  });
 
   /// Writes the code to declare the given [typeParameter].
   ///
@@ -374,7 +380,15 @@ abstract class DartEditBuilder implements EditBuilder {
   ///
   /// If the list of [types] is `null` or does not contain any types, then
   /// nothing will be written.
-  void writeTypes(Iterable<DartType>? types, {String? prefix});
+  ///
+  /// If [shouldWriteDynamic] is `true`, then the keyword `dynamic` will be
+  /// written if the type is `dynamic`. Otherwise, the `dynamic` type will be
+  /// ommitted.
+  void writeTypes(
+    Iterable<DartType>? types, {
+    String? prefix,
+    bool shouldWriteDynamic = false,
+  });
 }
 
 /// A [FileEditBuilder] used to build edits for Dart files.