[DAS] Adds fixes for implicit_this_reference_in_initializer

Fixes: #60729
Change-Id: Ie2ee6ff84062b749a9a8385a3140f9bc35760df2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/429081
Auto-Submit: Felipe Morschel <[email protected]>
Reviewed-by: Konstantin Shcheglov <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: FMorschel

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

@@ -16,6 +16,11 @@ abstract final class DartAssistKind {
     DartAssistKindPriority.DEFAULT,
     'Add digit separators',
   );
+  static const ADD_LATE = AssistKind(
+    'dart.assist.add.late',
+    DartAssistKindPriority.DEFAULT,
+    "Add 'late' modifier",
+  );
   static const ADD_RETURN_TYPE = AssistKind(
     'dart.assist.add.returnType',
     DartAssistKindPriority.DEFAULT,

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

@@ -4,6 +4,7 @@
 
 import 'package:analysis_server/src/services/correction/dart/add_diagnostic_property_reference.dart';
 import 'package:analysis_server/src/services/correction/dart/add_digit_separators.dart';
+import 'package:analysis_server/src/services/correction/dart/add_late.dart';
 import 'package:analysis_server/src/services/correction/dart/add_return_type.dart';
 import 'package:analysis_server/src/services/correction/dart/add_type_annotation.dart';
 import 'package:analysis_server/src/services/correction/dart/assign_to_local_variable.dart';
@@ -82,6 +83,7 @@ const Set<ProducerGenerator> _builtInGenerators = {
   AddDiagnosticPropertyReference.new,
   AddDigitSeparatorEveryThreeDigits.new,
   AddDigitSeparatorEveryTwoDigits.new,
+  AddLate.new,
   AddReturnType.new,
   AddTypeAnnotation.bulkFixable,
   AssignToLocalVariable.new,

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

@@ -2,30 +2,42 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
+import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/token.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/source/source.dart';
 import 'package:analyzer/src/dart/ast/extensions.dart';
+import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
 import 'package:analyzer_plugin/utilities/fixes/fixes.dart';
 
 class AddLate extends ResolvedCorrectionProducer {
-  AddLate({required super.context});
+  final _Type _type;
+
+  AddLate({required super.context}) : _type = _Type.base;
+
+  AddLate.implicitThis({required super.context}) : _type = _Type.implicitThis;
 
   @override
   CorrectionApplicability get applicability =>
-      // TODO(applicability): comment on why.
+      // TODO(applicability): not necessarily the right thing to do.
       CorrectionApplicability.singleLocation;
 
+  @override
+  AssistKind? get assistKind => DartAssistKind.ADD_LATE;
+
   @override
   FixKind get fixKind => DartFixKind.ADD_LATE;
 
   @override
   Future<void> compute(ChangeBuilder builder) async {
-    var node = this.node;
+    AstNode? node = this.node;
+    if (_type == _Type.implicitThis) {
+      node = node.thisOrAncestorOfType<VariableDeclaration>();
+    }
     if (node is VariableDeclaration) {
       var variableList = node.parent;
       if (variableList is VariableDeclarationList) {
@@ -34,15 +46,8 @@ class AddLate extends ResolvedCorrectionProducer {
             var keyword = variableList.keyword;
             if (keyword == null) {
               await _insertAt(builder, variableList.variables[0].offset);
-              // TODO(brianwilkerson): Consider converting this into an assist and
-              //  expand it to support converting `var` to `late` as well as
-              //  working anywhere a non-late local variableElement or field is selected.
-              //          } else if (keyword.type == Keyword.VAR) {
-              //            builder.addFileEdit(file, (builder) {
-              //              builder.addSimpleReplacement(range.token(keyword), 'late');
-              //            });
             } else if (keyword.type != Keyword.CONST) {
-              await _insertAt(builder, variableList.variables[0].offset);
+              await _insertAt(builder, variableList.offset);
             }
           } else {
             var keyword = variableList.keyword;
@@ -105,3 +110,5 @@ class AddLate extends ResolvedCorrectionProducer {
     });
   }
 }
+
+enum _Type { base, implicitThis }

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

@@ -6,6 +6,7 @@ import 'package:analysis_server/src/services/correction/assist.dart';
 import 'package:analysis_server/src/services/correction/fix.dart';
 import 'package:analysis_server_plugin/edit/dart/correction_producer.dart';
 import 'package:analyzer/dart/ast/ast.dart';
+import 'package:analyzer/dart/element/type.dart';
 import 'package:analyzer/src/utilities/extensions/ast.dart';
 import 'package:analyzer_plugin/utilities/assist/assist.dart';
 import 'package:analyzer_plugin/utilities/change_builder/change_builder_core.dart';
@@ -14,12 +15,15 @@ import 'package:analyzer_plugin/utilities/range_factory.dart';
 
 class ConvertIntoGetter extends ResolvedCorrectionProducer {
   String _memberName = '';
+  final _Type _type;
 
-  ConvertIntoGetter({required super.context});
+  ConvertIntoGetter({required super.context}) : _type = _Type.base;
+  ConvertIntoGetter.implicitThis({required super.context})
+    : _type = _Type.implicitThis;
 
   @override
   CorrectionApplicability get applicability =>
-      // TODO(applicability): comment on why.
+      // TODO(applicability): not necessarily the right thing to do.
       CorrectionApplicability.singleLocation;
 
   @override
@@ -38,19 +42,23 @@ class ConvertIntoGetter extends ResolvedCorrectionProducer {
   Future<void> compute(ChangeBuilder builder) async {
     // Find the enclosing field declaration.
     FieldDeclaration? fieldDeclaration;
-    for (var n in node.withParents) {
-      if (n is FieldDeclaration) {
-        fieldDeclaration = n;
+    if (_type == _Type.implicitThis) {
+      fieldDeclaration = node.thisOrAncestorOfType();
+    } else {
+      for (var n in node.withParents) {
+        if (n is FieldDeclaration) {
+          fieldDeclaration = n;
+          break;
+        }
+        if (n is SimpleIdentifier ||
+            n is VariableDeclaration ||
+            n is VariableDeclarationList ||
+            n is TypeAnnotation ||
+            n is TypeArgumentList) {
+          continue;
+        }
         break;
       }
-      if (n is SimpleIdentifier ||
-          n is VariableDeclaration ||
-          n is VariableDeclarationList ||
-          n is TypeAnnotation ||
-          n is TypeArgumentList) {
-        continue;
-      }
-      break;
     }
     if (fieldDeclaration == null) {
       return;
@@ -68,12 +76,7 @@ class ConvertIntoGetter extends ResolvedCorrectionProducer {
     // Prepare the initializer.
     var initializer = field.initializer;
     // Add proposal.
-    var code = '';
-    var typeAnnotation = fieldList.type;
-    if (typeAnnotation != null) {
-      code += '${utils.getNodeText(typeAnnotation)} ';
-    }
-    code += 'get';
+    var code = 'get';
     code += ' ${field.name.lexeme}';
     code += ' => ';
 
@@ -83,9 +86,26 @@ class ConvertIntoGetter extends ResolvedCorrectionProducer {
         fieldList.type ??
         field.name;
 
+    var writeType = getCodeStyleOptions(unitResult.file).specifyReturnTypes;
     var replacementRange = range.startEnd(startingKeyword, fieldDeclaration);
     await builder.addDartFileEdit(file, (builder) {
       builder.addReplacement(replacementRange, (builder) {
+        if (fieldList.type?.type case var type) {
+          if (type == null || type is DynamicType) {
+            type = initializer?.staticType;
+          }
+          if (type is InvalidType) {
+            type = typeProvider.dynamicType;
+          }
+          if ((type != null && type is! DynamicType) || writeType) {
+            builder.writeType(
+              type,
+              shouldWriteDynamic: writeType,
+              required: writeType,
+            );
+            builder.write(' ');
+          }
+        }
         builder.write(code);
         if (initializer == null) {
           builder.addSimpleLinkedEdit('initializer', 'null');
@@ -97,3 +117,5 @@ class ConvertIntoGetter extends ResolvedCorrectionProducer {
     });
   }
 }
+
+enum _Type { base, implicitThis }

pkg/analysis_server/lib/src/services/correction/error_fix_status.yaml

@@ -834,7 +834,7 @@ CompileTimeErrorCode.IMPLEMENTS_SUPER_CLASS:
 CompileTimeErrorCode.IMPLEMENTS_TYPE_ALIAS_EXPANDS_TO_TYPE_PARAMETER:
   status: hasFix
 CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER:
-  status: noFix
+  status: hasFix
 CompileTimeErrorCode.IMPLICIT_SUPER_INITIALIZER_MISSING_ARGUMENTS:
   status: hasFix
 CompileTimeErrorCode.IMPORT_INTERNAL_LIBRARY:

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

@@ -726,6 +726,10 @@ final _builtInNonLintGenerators = <DiagnosticCode, List<ProducerGenerator>>{
   CompileTimeErrorCode.IMPLICIT_SUPER_INITIALIZER_MISSING_ARGUMENTS: [
     AddSuperParameter.new,
   ],
+  CompileTimeErrorCode.IMPLICIT_THIS_REFERENCE_IN_INITIALIZER: [
+    ConvertIntoGetter.implicitThis,
+    AddLate.implicitThis,
+  ],
   CompileTimeErrorCode.IMPORT_OF_NON_LIBRARY: [RemoveUnusedImport.new],
   CompileTimeErrorCode.IMPORT_INTERNAL_LIBRARY: [RemoveUnusedImport.new],
   CompileTimeErrorCode.INITIALIZING_FORMAL_FOR_NON_EXISTENT_FIELD: [

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

@@ -0,0 +1,96 @@
+// Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+import 'package:analysis_server/src/services/correction/assist.dart';
+import 'package:analyzer_plugin/utilities/assist/assist.dart';
+import 'package:test_reflective_loader/test_reflective_loader.dart';
+
+import 'assist_processor.dart';
+
+void main() {
+  defineReflectiveSuite(() {
+    defineReflectiveTests(AddLateTest);
+  });
+}
+
+@reflectiveTest
+class AddLateTest extends AssistProcessorTest {
+  @override
+  AssistKind get kind => DartAssistKind.ADD_LATE;
+
+  Future<void> test_field_const() async {
+    verifyNoTestUnitErrors = false;
+    await resolveTestCode('''
+class C {
+  const ^s = '';
+}
+''');
+    await assertNoAssist();
+  }
+
+  Future<void> test_field_final() async {
+    await resolveTestCode('''
+class C {
+  final s^ = '';
+}
+''');
+    await assertHasAssist('''
+class C {
+  late final s = '';
+}
+''');
+  }
+
+  Future<void> test_field_finalType() async {
+    await resolveTestCode('''
+class C {
+  final String s^ = '';
+}
+''');
+    await assertHasAssist('''
+class C {
+  late final String s = '';
+}
+''');
+  }
+
+  Future<void> test_field_type() async {
+    await resolveTestCode('''
+class C {
+  String s^ = '';
+}
+''');
+    await assertHasAssist('''
+class C {
+  late String s = '';
+}
+''');
+  }
+
+  Future<void> test_field_var() async {
+    await resolveTestCode('''
+class C {
+  var s^;
+}
+''');
+    await assertHasAssist('''
+class C {
+  late var s;
+}
+''');
+  }
+
+  Future<void> test_local() async {
+    await resolveTestCode('''
+void foo() {
+  String ^s;
+}
+''');
+    await assertHasAssist('''
+void foo() {
+  late String s;
+}
+''');
+  }
+}