[analysis_server] Dot shorthands: Update CreateConstructor.

Update the fix to allow creating constructors in class
declarations from an unresolved dot shorthand invocation.

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

Author: kallentu

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

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:analysis_server/src/services/correction/fix.dart';
+import 'package:analysis_server/src/services/correction/util.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/analysis/results.dart';
 import 'package:analyzer/dart/ast/ast.dart';
@@ -36,16 +37,34 @@ class CreateConstructor extends ResolvedCorrectionProducer {
     var node = this.node;
     var argumentList = node.parent is ArgumentList ? node.parent : node;
     if (argumentList is ArgumentList) {
-      var instanceCreation = argumentList.parent;
-      if (instanceCreation is InstanceCreationExpression) {
-        await _proposeFromInstanceCreation(builder, instanceCreation);
+      var constructorInvocation = argumentList.parent;
+      if (constructorInvocation is InstanceCreationExpression) {
+        await _proposeFromConstructorInvocation(
+          builder,
+          constructorInvocation,
+          constructorInvocation.constructorName.element,
+          constructorInvocation.argumentList,
+        );
+      } else if (constructorInvocation is DotShorthandConstructorInvocation) {
+        await _proposeFromConstructorInvocation(
+          builder,
+          constructorInvocation,
+          constructorInvocation.element,
+          constructorInvocation.argumentList,
+        );
       }
     } else {
       if (node is SimpleIdentifier) {
         var parent = node.parent;
         if (parent is ConstructorName) {
           await _proposeFromConstructorName(builder, node.token, parent);
           return;
+        } else if (parent is DotShorthandInvocation) {
+          return await _proposeFromDotShorthandInvocation(
+            builder,
+            node.token,
+            parent,
+          );
         }
       }
       var parent = node.thisOrAncestorOfType<EnumConstantDeclaration>();
@@ -55,6 +74,93 @@ class CreateConstructor extends ResolvedCorrectionProducer {
     }
   }
 
+  /// Common logic for building and writing a constructor from a
+  /// [ConstructorName] or a [DotShorthandInvocation].
+  Future<void> _finishCreatingConstructor(
+    ChangeBuilder builder,
+    InterfaceElement targetElement,
+    Token name,
+    ArgumentList? argumentList,
+  ) async {
+    var targetFragment = targetElement.firstFragment;
+    var targetResult = await sessionHelper.getFragmentDeclaration(
+      targetFragment,
+    );
+    if (targetResult == null) {
+      return;
+    }
+    var targetNode = targetResult.node;
+    if (targetNode is! ClassDeclaration) {
+      return;
+    }
+
+    var resolvedUnit = targetResult.resolvedUnit;
+    if (resolvedUnit == null) {
+      return;
+    }
+
+    await _write(
+      builder,
+      resolvedUnit,
+      name,
+      targetNode,
+      constructorName: name,
+      argumentList: argumentList,
+    );
+  }
+
+  Future<void> _proposeFromConstructorInvocation(
+    ChangeBuilder builder,
+    AstNode node,
+    ConstructorElement? constructorElement,
+    ArgumentList argumentList,
+  ) async {
+    _constructorName = node.toSource();
+    // should be synthetic default constructor
+    if (constructorElement == null ||
+        !constructorElement.isDefaultConstructor ||
+        !constructorElement.isSynthetic) {
+      return;
+    }
+
+    var targetElement = constructorElement.enclosingElement;
+    if (targetElement is! ClassElement) return;
+    var targetFragment = targetElement.firstFragment;
+
+    var targetElementName = targetElement.name;
+    if (targetElementName == null) {
+      return;
+    }
+
+    // prepare target ClassDeclaration
+    var targetResult = await sessionHelper.getFragmentDeclaration(
+      targetFragment,
+    );
+    if (targetResult == null) {
+      return;
+    }
+    var targetNode = targetResult.node;
+    if (targetNode is! ClassDeclaration) {
+      return;
+    }
+
+    var resolvedUnit = targetResult.resolvedUnit;
+    if (resolvedUnit == null) {
+      return;
+    }
+
+    var targetSource = targetFragment.libraryFragment.source;
+    var targetFile = targetSource.fullName;
+    await builder.addDartFileEdit(targetFile, (builder) {
+      builder.insertConstructor(targetNode, (builder) {
+        builder.writeConstructorDeclaration(
+          targetElementName,
+          argumentList: argumentList,
+        );
+      });
+    });
+  }
+
   Future<void> _proposeFromConstructorName(
     ChangeBuilder builder,
     Token name,
@@ -87,30 +193,31 @@ class CreateConstructor extends ResolvedCorrectionProducer {
 
     // prepare target ClassDeclaration
     var targetElement = targetType.element;
-    var targetFragment = targetElement.firstFragment;
-    var targetResult = await sessionHelper.getFragmentDeclaration(
-      targetFragment,
+    await _finishCreatingConstructor(
+      builder,
+      targetElement,
+      name,
+      instanceCreation.argumentList,
     );
-    if (targetResult == null) {
-      return;
-    }
-    var targetNode = targetResult.node;
-    if (targetNode is! ClassDeclaration) {
-      return;
-    }
+  }
 
-    var resolvedUnit = targetResult.resolvedUnit;
-    if (resolvedUnit == null) {
-      return;
-    }
+  Future<void> _proposeFromDotShorthandInvocation(
+    ChangeBuilder builder,
+    Token name,
+    DotShorthandInvocation node,
+  ) async {
+    _constructorName = node.toSource();
+    var targetElement = computeDotShorthandContextTypeElement(
+      node,
+      unitResult.libraryElement,
+    );
+    if (targetElement == null) return;
 
-    await _write(
+    await _finishCreatingConstructor(
       builder,
-      resolvedUnit,
+      targetElement,
       name,
-      targetNode,
-      constructorName: name,
-      argumentList: instanceCreation.argumentList,
+      node.argumentList,
     );
   }
 
@@ -161,57 +268,6 @@ class CreateConstructor extends ResolvedCorrectionProducer {
     );
   }
 
-  Future<void> _proposeFromInstanceCreation(
-    ChangeBuilder builder,
-    InstanceCreationExpression instanceCreation,
-  ) async {
-    var constructorName = instanceCreation.constructorName;
-    _constructorName = constructorName.toSource();
-    // should be synthetic default constructor
-    var constructorElement = constructorName.element;
-    if (constructorElement == null ||
-        !constructorElement.isDefaultConstructor ||
-        !constructorElement.isSynthetic) {
-      return;
-    }
-
-    var targetElement = constructorElement.enclosingElement;
-    var targetFragment = (targetElement as ClassElement).firstFragment;
-
-    var targetElementName = targetElement.name;
-    if (targetElementName == null) {
-      return;
-    }
-
-    // prepare target ClassDeclaration
-    var targetResult = await sessionHelper.getFragmentDeclaration(
-      targetFragment,
-    );
-    if (targetResult == null) {
-      return;
-    }
-    var targetNode = targetResult.node;
-    if (targetNode is! ClassDeclaration) {
-      return;
-    }
-
-    var resolvedUnit = targetResult.resolvedUnit;
-    if (resolvedUnit == null) {
-      return;
-    }
-
-    var targetSource = targetFragment.libraryFragment.source;
-    var targetFile = targetSource.fullName;
-    await builder.addDartFileEdit(targetFile, (builder) {
-      builder.insertConstructor(targetNode, (builder) {
-        builder.writeConstructorDeclaration(
-          targetElementName,
-          argumentList: instanceCreation.argumentList,
-        );
-      });
-    });
-  }
-
   Future<void> _write(
     ChangeBuilder builder,
     ResolvedUnitResult resolvedUnit,

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

@@ -636,6 +636,7 @@ final _builtInNonLintGenerators = <DiagnosticCode, List<ProducerGenerator>>{
   ],
   CompileTimeErrorCode.DOT_SHORTHAND_UNDEFINED_INVOCATION: [
     ChangeTo.method,
+    CreateConstructor.new,
     CreateMethod.method,
   ],
   CompileTimeErrorCode.EMPTY_MAP_PATTERN: [