[analysis_server] Dot shorthands: Update CreateGetter and CreateField.

`CreateGetter` and `CreateField` are now two available fixes for dot shorthand property accesses.
Updated each fix to handle dot shorthands using the computed context type element and added tests.

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

Author: kallentu

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

@@ -146,7 +146,8 @@ class CreateField extends CreateFieldOrGetter {
     }
     _fieldName = nameNode.name;
     // Prepare target `Expression`.
-    var target = switch (nameNode.parent) {
+    var parent = nameNode.parent;
+    var target = switch (parent) {
       PrefixedIdentifier(:var prefix) => prefix,
       PropertyAccess(:var realTarget) => realTarget,
       _ => null,
@@ -165,6 +166,12 @@ class CreateField extends CreateFieldOrGetter {
         }
         staticModifier = targetElement.kind == ElementKind.CLASS;
       }
+    } else if (parent is DotShorthandPropertyAccess) {
+      targetClassElement = computeDotShorthandContextTypeElement(
+        node,
+        unitResult.libraryElement,
+      );
+      staticModifier = true;
     } else {
       targetClassElement = node.enclosingInterfaceElement;
       staticModifier = inStaticContext;

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

@@ -132,14 +132,13 @@ class CreateGetter extends CreateFieldOrGetter {
     }
     // prepare target
     Expression? target;
-    {
-      var nameParent = nameNode.parent;
-      if (nameParent is PrefixedIdentifier) {
-        target = nameParent.prefix;
-      } else if (nameParent is PropertyAccess) {
-        target = nameParent.realTarget;
-      }
+    var nameParent = nameNode.parent;
+    if (nameParent is PrefixedIdentifier) {
+      target = nameParent.prefix;
+    } else if (nameParent is PropertyAccess) {
+      target = nameParent.realTarget;
     }
+
     // prepare target element
     var staticModifier = false;
     InstanceElement? targetElement;
@@ -161,6 +160,12 @@ class CreateGetter extends CreateFieldOrGetter {
         var targetElement = targetIdentifier.element;
         staticModifier = targetElement?.kind == ElementKind.CLASS;
       }
+    } else if (nameParent is DotShorthandPropertyAccess) {
+      staticModifier = true;
+      targetElement = computeDotShorthandContextTypeElement(
+        node,
+        unitResult.libraryElement,
+      );
     } else {
       staticModifier = inStaticContext;
       targetElement = nameNode.enclosingInstanceElement;

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

@@ -628,8 +628,13 @@ final _builtInNonLintGenerators = <DiagnosticCode, List<ProducerGenerator>>{
   ],
   CompileTimeErrorCode.DOT_SHORTHAND_UNDEFINED_GETTER: [
     ChangeTo.getterOrSetter,
+    CreateGetter.new,
+    CreateField.new,
+  ],
+  CompileTimeErrorCode.DOT_SHORTHAND_UNDEFINED_INVOCATION: [
+    ChangeTo.method,
+    CreateMethod.method,
   ],
-  CompileTimeErrorCode.DOT_SHORTHAND_UNDEFINED_INVOCATION: [ChangeTo.method],
   CompileTimeErrorCode.EMPTY_MAP_PATTERN: [
     ReplaceEmptyMapPattern.any,
     ReplaceEmptyMapPattern.empty,

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

@@ -18,8 +18,8 @@ import 'package:analyzer/src/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/range_factory.dart';
 import 'package:path/path.dart' as path;
 
-/// Climbs up [PrefixedIdentifier] and [PropertyAccess] nodes that include
-/// [node].
+/// Climbs up [PrefixedIdentifier], [PropertyAccess], and
+/// [DotShorthandPropertyAccess] nodes that include [node].
 Expression climbPropertyAccess(Expression node) {
   while (true) {
     var parent = node.parent;
@@ -31,6 +31,10 @@ Expression climbPropertyAccess(Expression node) {
       node = parent;
       continue;
     }
+    if (parent is DotShorthandPropertyAccess && parent.propertyName == node) {
+      node = parent;
+      continue;
+    }
     return node;
   }
 }

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

@@ -101,6 +101,29 @@ int f(E e) {
 ''');
   }
 
+  Future<void> test_usedAsGetter_dotShorthand() async {
+    await resolveTestCode('''
+enum E {
+  one, two;
+}
+
+E f() {
+  return .a;
+}
+''');
+    await assertHasFix('''
+enum E {
+  one, two;
+
+  static final E a;
+}
+
+E f() {
+  return .a;
+}
+''');
+  }
+
   Future<void> test_usedAsSetter() async {
     await resolveTestCode('''
 enum E {
@@ -120,6 +143,25 @@ class CreateFieldMixinTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.CREATE_FIELD;
 
+  Future<void> test_dotShorthand() async {
+    await resolveTestCode('''
+mixin A {}
+void f() {
+  A v = .test;
+  print(v);
+}
+''');
+    await assertHasFix('''
+mixin A {
+  static A test;
+}
+void f() {
+  A v = .test;
+  print(v);
+}
+''');
+  }
+
   Future<void> test_getter_qualified_instance() async {
     await resolveTestCode('''
 mixin M {
@@ -177,6 +219,36 @@ class CreateFieldTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.CREATE_FIELD;
 
+  Future<void> test_dotShorthand_class() async {
+    await resolveTestCode('''
+class A {}
+void f() {
+  A v = .test;
+  print(v);
+}
+''');
+    await assertHasFix('''
+class A {
+  static A test;
+}
+void f() {
+  A v = .test;
+  print(v);
+}
+''');
+  }
+
+  Future<void> test_dotShorthand_extensionType() async {
+    await resolveTestCode('''
+extension type A(int x) {}
+void f() {
+  A v = .test;
+  print(v);
+}
+''');
+    await assertNoFix();
+  }
+
   Future<void> test_getter_multiLevel() async {
     await resolveTestCode('''
 class A {

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

@@ -20,6 +20,28 @@ class CreateGetterMixinTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.CREATE_GETTER;
 
+  Future<void> test_dotShorthand() async {
+    await resolveTestCode('''
+mixin M {
+}
+
+void f() {
+  M v = .test;
+  print(v);
+}
+''');
+    await assertHasFix('''
+mixin M {
+  static M get test => null;
+}
+
+void f() {
+  M v = .test;
+  print(v);
+}
+''');
+  }
+
   Future<void> test_inExtensionGetter() async {
     await resolveTestCode('''
 mixin M {
@@ -179,6 +201,46 @@ class CreateGetterTest extends FixProcessorTest {
   @override
   FixKind get kind => DartFixKind.CREATE_GETTER;
 
+  Future<void> test_dotShorthand_class() async {
+    await resolveTestCode('''
+class A {
+}
+void f() {
+  A v = .getter;
+  print(v);
+}
+''');
+    await assertHasFix('''
+class A {
+  static A get getter => null;
+}
+void f() {
+  A v = .getter;
+  print(v);
+}
+''');
+  }
+
+  Future<void> test_dotShorthand_extensionType() async {
+    await resolveTestCode('''
+extension type A(int i) {
+}
+void f() {
+  A v = .getter;
+  print(v);
+}
+''');
+    await assertHasFix('''
+extension type A(int i) {
+  static A get getter => null;
+}
+void f() {
+  A v = .getter;
+  print(v);
+}
+''');
+  }
+
   Future<void> test_extension_type() async {
     await resolveTestCode('''
 extension type A(String s) {