Elements. Migrate lib/utilities/change_builder/change_builder_dart.dart

scheglov · Commit Queue · commit 2766858fba19 · 2025-01-09T09:47:11.000-08:00
Change-Id: I0351cc1e4ecd88cf584e8a53f2fec7e2d1126c05 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/403706 Reviewed-by: Phil Quitslund <pquitslund@google.com> Commit-Queue: Konstantin Shcheglov <scheglov@google.com>
diff --git a/pkg/analysis_server/lib/src/lsp/completion_utils.dart b/pkg/analysis_server/lib/src/lsp/completion_utils.dart
@@ -38,7 +38,7 @@ Future<OverrideData?> createOverrideSuggestionData(
     builder,
   ) {
     builder.addReplacement(suggestion.replacementRange, (builder) {
-      builder.writeOverride2(
+      builder.writeOverride(
         suggestion.element,
         displayTextBuffer: displayTextBuffer,
         invokeSuper: suggestion.shouldInvokeSuper,
diff --git a/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart b/pkg/analysis_server/lib/src/services/completion/dart/suggestion_builder.dart
@@ -788,7 +788,7 @@ class SuggestionBuilder {
       builder,
     ) {
       builder.addReplacement(replacementRange, (builder) {
-        builder.writeOverride2(
+        builder.writeOverride(
           element,
           displayTextBuffer: displayTextBuffer,
           invokeSuper: invokeSuper,
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/add_missing_switch_cases.dart b/pkg/analysis_server/lib/src/services/correction/dart/add_missing_switch_cases.dart
@@ -175,7 +175,7 @@ class AddMissingSwitchCases extends ResolvedCorrectionProducer {
   ) {
     for (var part in parts) {
       if (part is MissingPatternEnumValuePart) {
-        builder.writeReference2(part.enumElement2);
+        builder.writeReference(part.enumElement2);
         builder.write('.');
         builder.write(part.value2.name3!);
       } else if (part is MissingPatternTextPart) {
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart b/pkg/analysis_server/lib/src/services/correction/dart/change_to_static_access.dart
@@ -59,7 +59,7 @@ class ChangeToStaticAccess extends ResolvedCorrectionProducer {
         _className = declaringElementName;
         await builder.addDartFileEdit(file, (builder) {
           builder.addReplacement(range.node(target_final), (builder) {
-            builder.writeReference2(declaringElement);
+            builder.writeReference(declaringElement);
           });
         });
       }
@@ -69,7 +69,7 @@ class ChangeToStaticAccess extends ResolvedCorrectionProducer {
         _className = extensionName;
         await builder.addDartFileEdit(file, (builder) {
           builder.addReplacement(range.node(target_final), (builder) {
-            builder.writeReference2(declaringElement);
+            builder.writeReference(declaringElement);
           });
         });
       }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_mixin.dart b/pkg/analysis_server/lib/src/services/correction/dart/convert_class_to_mixin.dart
@@ -79,7 +79,7 @@ class ConvertClassToMixin extends ResolvedCorrectionProducer {
         (builder) {
           builder.write('mixin ');
           builder.write(classDeclaration.name.lexeme);
-          builder.writeTypeParameters2(classElement.typeParameters2);
+          builder.writeTypeParameters(classElement.typeParameters2);
           builder.writeTypes(superclassConstraints, prefix: ' on ');
           builder.writeTypes(interfaces, prefix: ' implements ');
           builder.write(' ');
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_method.dart
@@ -85,7 +85,7 @@ class CreateMethod extends ResolvedCorrectionProducer {
           return;
         }
 
-        builder.writeOverride2(element, invokeSuper: true);
+        builder.writeOverride(element, invokeSuper: true);
       });
     });
   }
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/create_missing_overrides.dart b/pkg/analysis_server/lib/src/services/correction/dart/create_missing_overrides.dart
@@ -114,7 +114,7 @@ class CreateMissingOverrides extends ResolvedCorrectionProducer {
           addSeparatorBetweenDeclarations();
           // When only 1 override is being added, we delegate the
           // selection-setting to `builder.writeOverride`.
-          builder.writeOverride2(element, setSelection: _numElements == 1);
+          builder.writeOverride(element, setSelection: _numElements == 1);
         }
       });
     });
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateful_widget.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateful_widget.dart
@@ -127,7 +127,7 @@ class FlutterConvertToStatefulWidget extends ResolvedCorrectionProducer {
 
     await builder.addDartFileEdit(file, (builder) {
       builder.addReplacement(range.node(superclass), (builder) {
-        builder.writeReference2(statefulWidgetClass);
+        builder.writeReference(statefulWidgetClass);
       });
 
       var replaceOffset = 0;
@@ -157,7 +157,7 @@ class FlutterConvertToStatefulWidget extends ResolvedCorrectionProducer {
             }
             builder.writeln('  @override');
             builder.write('  ');
-            builder.writeReference2(stateClass);
+            builder.writeReference(stateClass);
             builder.write('<${widgetClass.name.lexeme}$typeParams>');
             builder.writeln(' createState() => $stateName$typeParams();');
             if (hasEmptyLineAfterCreateState) {
@@ -217,7 +217,7 @@ class FlutterConvertToStatefulWidget extends ResolvedCorrectionProducer {
         builder.writeln();
 
         builder.write('class $stateName$typeParams extends ');
-        builder.writeReference2(stateClass);
+        builder.writeReference(stateClass);
 
         // Write just param names (and not bounds, metadata and docs).
         builder.write('<${widgetClass.name.lexeme}');
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateless_widget.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_convert_to_stateless_widget.dart
@@ -148,7 +148,7 @@ class FlutterConvertToStatelessWidget extends ResolvedCorrectionProducer {
 
     await builder.addDartFileEdit(file, (builder) {
       builder.addReplacement(range.node(superclass), (builder) {
-        builder.writeReference2(statelessWidgetClass);
+        builder.writeReference(statelessWidgetClass);
       });
 
       builder.addDeletion(range.deletionRange(stateClass));
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap.dart
@@ -283,7 +283,7 @@ abstract class _WrapMultipleWidgets extends ResolvedCorrectionProducer {
 
     await builder.addDartFileEdit(file, (builder) {
       builder.addReplacement(selectedRange, (builder) {
-        builder.writeReference2(parentClassElement);
+        builder.writeReference(parentClassElement);
         builder.write('(');
 
         var indentOld = utils.getLinePrefix(firstWidget.offset);
@@ -355,7 +355,7 @@ abstract class _WrapSingleWidget extends ResolvedCorrectionProducer {
         if (parentClassElement == null) {
           builder.addSimpleLinkedEdit('WIDGET', 'widget');
         } else {
-          builder.writeReference2(parentClassElement);
+          builder.writeReference(parentClassElement);
         }
         builder.write('(');
         // When there's no linked edit for the widget name, leave the selection
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap_builder.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap_builder.dart
@@ -40,7 +40,7 @@ class FlutterWrapBuilder extends ResolvedCorrectionProducer {
 
     await builder.addDartFileEdit(file, (builder) {
       builder.addReplacement(range.node(widgetExpr), (builder) {
-        builder.writeReference2(builderElement);
+        builder.writeReference(builderElement);
 
         builder.writeln('(');
 
diff --git a/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap_stream_builder.dart b/pkg/analysis_server/lib/src/services/correction/dart/flutter_wrap_stream_builder.dart
@@ -42,7 +42,7 @@ class FlutterWrapStreamBuilder extends ResolvedCorrectionProducer {
 
     await builder.addDartFileEdit(file, (builder) {
       builder.addReplacement(range.node(widgetExpr), (builder) {
-        builder.writeReference2(streamBuilderElement);
+        builder.writeReference(streamBuilderElement);
 
         builder.write('<');
         builder.addSimpleLinkedEdit('type', 'Object');
diff --git a/pkg/analysis_server/lib/src/services/flutter/property.dart b/pkg/analysis_server/lib/src/services/flutter/property.dart
@@ -126,7 +126,7 @@ class PropertyDescription {
         if (expression != null) {
           builder.write(expression);
         } else if (enumElement != null && enumValue != null) {
-          builder.writeReference2(enumElement);
+          builder.writeReference(enumElement);
           builder.write('.');
           builder.write(enumValue.name);
         } else {
@@ -241,7 +241,7 @@ class PropertyDescription {
             return;
           }
           parent._changeCode(builder, (builder) {
-            builder.writeReference2(classDescription.element);
+            builder.writeReference(classDescription.element);
             // TODO(scheglov): constructor name
             builder.write('(');
             builder.write(parameterName);
@@ -270,7 +270,7 @@ class PropertyDescription {
       builder.addReplacement(
         range.startEnd(parentCreation, parentCreation.constructorName),
         (builder) {
-          builder.writeReference2(virtualContainer.containerElement);
+          builder.writeReference(virtualContainer.containerElement);
         },
       );
 
@@ -312,7 +312,7 @@ class PropertyDescription {
       });
     } else {
       builder.addInsertion(virtualContainer.widgetCreation.offset, (builder) {
-        builder.writeReference2(virtualContainer.containerElement);
+        builder.writeReference(virtualContainer.containerElement);
         builder.write('(');
 
         builder.write(parameterName);
@@ -548,7 +548,7 @@ class _EdgeInsetsProperty {
     await builder.addDartFileEdit(property.resolvedUnit.path, (builder) {
       property._changeCode(builder, (builder) {
         if (leftCode == rightCode && topCode == bottomCode) {
-          builder.writeReference2(classEdgeInsets);
+          builder.writeReference(classEdgeInsets);
           if (leftCode == topCode) {
             builder.write('.all(');
             builder.write(leftCode);
@@ -571,7 +571,7 @@ class _EdgeInsetsProperty {
             builder.write(')');
           }
         } else {
-          builder.writeReference2(classEdgeInsets);
+          builder.writeReference(classEdgeInsets);
           builder.write('.only(');
           var needsComma = false;
           if (leftCode != '0') {
diff --git a/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget.dart b/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget.dart
@@ -58,7 +58,7 @@ class FlutterStatefulWidget extends FlutterSnippetProducer
         builder.write('class _');
         builder.addSimpleLinkedEdit('name', widgetClassName);
         builder.write('State extends ');
-        builder.writeReference2(classState);
+        builder.writeReference(classState);
         builder.write('<');
         builder.addSimpleLinkedEdit('name', widgetClassName);
         builder.writeln('> {');
diff --git a/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart b/pkg/analysis_server/lib/src/services/snippets/dart/flutter_stateful_widget_with_animation.dart
@@ -68,15 +68,15 @@ class FlutterStatefulWidgetWithAnimationController
         builder.write('class _');
         builder.addSimpleLinkedEdit('name', widgetClassName);
         builder.write('State extends ');
-        builder.writeReference2(classState);
+        builder.writeReference(classState);
         builder.write('<');
         builder.addSimpleLinkedEdit('name', widgetClassName);
         builder.writeln('>');
         builder.write('    with ');
-        builder.writeReference2(classSingleTickerProviderStateMixin);
+        builder.writeReference(classSingleTickerProviderStateMixin);
         builder.writeln(' {');
         builder.write('  late ');
-        builder.writeReference2(classAnimationController);
+        builder.writeReference(classAnimationController);
         builder.writeln(' _controller;');
         builder.writeln();
         {
@@ -90,7 +90,7 @@ class FlutterStatefulWidgetWithAnimationController
               builder.writeln('{');
               builder.writeln('    super.initState();');
               builder.write('    _controller = ');
-              builder.writeReference2(classAnimationController);
+              builder.writeReference(classAnimationController);
               builder.writeln('(vsync: this);');
               builder.writeln('  }');
             },
diff --git a/pkg/analysis_server/lib/src/services/snippets/snippet_producer.dart b/pkg/analysis_server/lib/src/services/snippets/snippet_producer.dart
@@ -60,7 +60,7 @@ abstract class DartSnippetProducer extends SnippetProducer {
     var dartBuilder = builder as DartFileEditBuilderImpl;
     await Future.wait(
       requiredElementImports.map(
-        (element) => dartBuilder.importElementLibrary2(
+        (element) => dartBuilder.importElementLibrary(
           element,
           resultCache: _elementImportCache,
         ),
diff --git a/pkg/analyzer_plugin/CHANGELOG.md b/pkg/analyzer_plugin/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## 0.13.0-dev
 - Remove `elementName()` from `RangeFactory`. Use `fragmentName()` instead.
+- Breaking changes to `DartFileEditBuilder` and `DartEditBuilder`.
 
 ## 0.12.0
 - Breaking changes to `DartFileEditBuilder`: `convertFunctionFromSyncToAsync`
diff --git a/pkg/analyzer_plugin/analyzer_use_new_elements.txt b/pkg/analyzer_plugin/analyzer_use_new_elements.txt
@@ -1,12 +1,10 @@
-lib/src/utilities/change_builder/change_builder_dart.dart
 lib/src/utilities/completion/completion_target.dart
 lib/src/utilities/completion/element_suggestion_builder.dart
 lib/src/utilities/completion/optype.dart
 lib/src/utilities/completion/suggestion_builder.dart
 lib/src/utilities/navigation/navigation_dart.dart
 lib/src/utilities/visitors/local_declaration_visitor.dart
 lib/utilities/analyzer_converter.dart
-lib/utilities/change_builder/change_builder_dart.dart
 lib/utilities/completion/inherited_reference_contributor.dart
 lib/utilities/completion/suggestion_builder.dart
 lib/utilities/completion/type_member_contributor.dart
diff --git a/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart b/pkg/analyzer_plugin/lib/src/utilities/change_builder/change_builder_dart.dart
diff --git a/pkg/analyzer_plugin/lib/utilities/change_builder/change_builder_dart.dart b/pkg/analyzer_plugin/lib/utilities/change_builder/change_builder_dart.dart
diff --git a/pkg/analyzer_plugin/pubspec.yaml b/pkg/analyzer_plugin/pubspec.yaml
diff --git a/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart b/pkg/analyzer_plugin/test/src/utilities/change_builder/change_builder_dart_test.dart

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ class CreateMethod extends ResolvedCorrectionProducer {`
`85`	`85`	`return;`
`86`	`86`	`}`
`87`	`87`
`88`		`- builder.writeOverride2(element, invokeSuper: true);`
	`88`	`+ builder.writeOverride(element, invokeSuper: true);`
`89`	`89`	`});`
`90`	`90`	`});`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ class CreateMissingOverrides extends ResolvedCorrectionProducer {`
`114`	`114`	`addSeparatorBetweenDeclarations();`
`115`	`115`	`// When only 1 override is being added, we delegate the`
`116`	`116`	// selection-setting to `builder.writeOverride`.
`117`		`- builder.writeOverride2(element, setSelection: _numElements == 1);`
	`117`	`+ builder.writeOverride(element, setSelection: _numElements == 1);`
`118`	`118`	`}`
`119`	`119`	`});`
`120`	`120`	`});`