[analysis_server] Dot shorthands: Update RemoveConst fix.

Updates `RemoveConst` fix to handle dot shorthands. Will remove `const` where it can't be constant and then push the `const` into a dot shorthand's arguments if possible.

Bug: #60994
Change-Id: Idb7ef4e5006c6561ce621a48e8351fd65b27c5b3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/441863
Reviewed-by: Brian Wilkerson <[email protected]>
Reviewed-by: Chloe Stefantsova <[email protected]>
Commit-Queue: Kallen Tu <[email protected]>

Author: kallentu

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

@@ -75,6 +75,17 @@ class _PushConstVisitor extends GeneralizingAstVisitor<void> {
 
   _PushConstVisitor(this.builder, this.excluded);
 
+  @override
+  void visitDotShorthandConstructorInvocation(
+    DotShorthandConstructorInvocation node,
+  ) {
+    _pushConstInConstructorInvocation(
+      node,
+      node.argumentList,
+      node.constKeyword,
+    );
+  }
+
   @override
   void visitIfElement(IfElement node) {
     node.thenElement.accept(this);
@@ -83,15 +94,7 @@ class _PushConstVisitor extends GeneralizingAstVisitor<void> {
 
   @override
   void visitInstanceCreationExpression(InstanceCreationExpression node) {
-    if (_containsExcluded(node)) {
-      node.argumentList.visitChildren(this);
-    } else if (excluded.any(node.contains)) {
-      // Don't speculate whether arguments can be const.
-    } else {
-      if (node.keyword == null) {
-        builder.addSimpleInsertion(node.offset, '${Keyword.CONST.lexeme} ');
-      }
-    }
+    _pushConstInConstructorInvocation(node, node.argumentList, node.keyword);
   }
 
   @override
@@ -128,6 +131,20 @@ class _PushConstVisitor extends GeneralizingAstVisitor<void> {
   bool _containsExcluded(AstNode node) {
     return {for (var e in excluded) ...e.withAncestors}.contains(node);
   }
+
+  void _pushConstInConstructorInvocation(
+    AstNode node,
+    ArgumentList argumentList,
+    Token? constKeyword,
+  ) {
+    if (_containsExcluded(node)) {
+      argumentList.visitChildren(this);
+    } else if (excluded.any(node.contains)) {
+      // Don't speculate whether arguments can be const.
+    } else if (constKeyword == null) {
+      builder.addSimpleInsertion(node.offset, '${Keyword.CONST.lexeme} ');
+    }
+  }
 }
 
 abstract class _RemoveConst extends ParsedCorrectionProducer {
@@ -175,16 +192,13 @@ abstract class _RemoveConst extends ParsedCorrectionProducer {
               if (_codesWhereThisIsValid.contains(e.diagnosticCode)) e,
           ];
           switch (node) {
-            case InstanceCreationExpression contextNode:
-              var (:constNodes, :nodesWithDiagnostic) = contextNode
-                  .argumentList
-                  .arguments
+            case InstanceCreationExpression(:var argumentList) ||
+                DotShorthandConstructorInvocation(:var argumentList):
+              var (:constNodes, :nodesWithDiagnostic) = argumentList.arguments
                   .withDiagnosticCodeIn(validDiagnostics);
               await builder.addDartFileEdit(file, (builder) {
                 _deleteToken(builder, constKeyword);
-                contextNode.accept(
-                  _PushConstVisitor(builder, nodesWithDiagnostic),
-                );
+                node.accept(_PushConstVisitor(builder, nodesWithDiagnostic));
               });
             case TypedLiteral contextNode:
               var (:constNodes, :nodesWithDiagnostic) = switch (contextNode) {

pkg/analysis_server/test/src/services/correction/fix/remove_const_test.dart

@@ -624,6 +624,21 @@ var x = A([0]);
 ''');
   }
 
+  Future<void> test_explicitConst_dotShorthand() async {
+    await resolveTestCode('''
+class A {
+  A(_);
+}
+A x = const .new([0]);
+''');
+    await assertHasFix('''
+class A {
+  A(_);
+}
+A x = .new([0]);
+''');
+  }
+
   Future<void> test_implicitConst_instanceCreation_argument() async {
     await resolveTestCode('''
 class A {}
@@ -645,6 +660,38 @@ var x = B(A(), const [0]);
 ''');
   }
 
+  Future<void>
+  test_implicitConst_instanceCreation_argument_dotShorthand() async {
+    await resolveTestCode('''
+enum E { a }
+
+class A {
+  A.named();
+  const A.constNamed();
+}
+
+class B {
+  const B(A a, A aa, E e);
+}
+
+B x = const .new(.named(), .constNamed(), .a);
+''');
+    await assertHasFix('''
+enum E { a }
+
+class A {
+  A.named();
+  const A.constNamed();
+}
+
+class B {
+  const B(A a, A aa, E e);
+}
+
+B x = .new(.named(), const .constNamed(), .a);
+''');
+  }
+
   Future<void> test_implicitConst_instanceCreation_argument_named() async {
     await resolveTestCode('''
 class A {}

pkg/analyzer/lib/src/dart/ast/ast.dart

@@ -8287,6 +8287,10 @@ sealed class ExpressionImpl extends AstNodeImpl
             return (current, constKeyword);
           }
           return null;
+        case DotShorthandConstructorInvocation():
+          if (current.constKeyword case var constKeyword?) {
+            return (current, constKeyword);
+          }
         case EnumConstantArguments():
           return (current, null);
         case InstanceCreationExpression():