Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(70)

Unified Diff: pkg/analysis_server/lib/src/services/correction/flutter_util.dart

Issue 2930793002: Finish refactoring FixProcessor to use ChangeBuilder (Closed)
Patch Set: Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/lib/src/services/correction/flutter_util.dart
diff --git a/pkg/analysis_server/lib/src/services/correction/flutter_util.dart b/pkg/analysis_server/lib/src/services/correction/flutter_util.dart
index fb21d070e007fa3383a3e9f7cb33b3d95b884097..5f009053d5486dd566b29600ba6202561142bfe9 100644
--- a/pkg/analysis_server/lib/src/services/correction/flutter_util.dart
+++ b/pkg/analysis_server/lib/src/services/correction/flutter_util.dart
@@ -6,6 +6,7 @@ import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/dart/element/type.dart';
import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer_plugin/utilities/change_builder/change_builder_dart.dart';
const _FLUTTER_WIDGET_NAME = "Widget";
const _FLUTTER_WIDGET_URI = "package:flutter/src/widgets/framework.dart";
@@ -53,6 +54,48 @@ void convertFlutterChildToChildren(
}
}
+void convertFlutterChildToChildren2(
+ DartFileEditBuilder builder,
+ InstanceCreationExpression childArg,
+ NamedExpression namedExp,
+ String eol,
+ Function getNodeText,
+ Function getLinePrefix,
+ Function getIndent,
+ Function getText,
+ Function rangeNode) {
+ int childLoc = namedExp.offset + 'child'.length;
+ builder.addSimpleInsertion(childLoc, 'ren');
+ int listLoc = childArg.offset;
+ String childArgSrc = getNodeText(childArg);
+ if (!childArgSrc.contains(eol)) {
+ builder.addSimpleInsertion(listLoc, '<Widget>[');
+ builder.addSimpleInsertion(listLoc + childArg.length, ']');
+ } else {
+ int newlineLoc = childArgSrc.lastIndexOf(eol);
+ if (newlineLoc == childArgSrc.length) {
+ newlineLoc -= 1;
+ }
+ String indentOld = getLinePrefix(childArg.offset + 1 + newlineLoc);
+ String indentNew = '$indentOld${getIndent(1)}';
+ // The separator includes 'child:' but that has no newlines.
+ String separator =
+ getText(namedExp.offset, childArg.offset - namedExp.offset);
+ String prefix = separator.contains(eol) ? "" : "$eol$indentNew";
+ if (prefix.isEmpty) {
+ builder.addSimpleInsertion(
+ namedExp.offset + 'child:'.length, ' <Widget>[');
+ builder.addDeletion(new SourceRange(childArg.offset - 2, 2));
+ } else {
+ builder.addSimpleInsertion(listLoc, '<Widget>[');
+ }
+ String newChildArgSrc = childArgSrc.replaceAll(
+ new RegExp("^$indentOld", multiLine: true), "$indentNew");
+ newChildArgSrc = "$prefix$newChildArgSrc,$eol$indentOld]";
+ builder.addSimpleReplacement(rangeNode(childArg), newChildArgSrc);
+ }
+}
+
/**
* Return the named expression representing the 'child' argument of the given
* [newExpr], or null if none.

Powered by Google App Engine
This is Rietveld 408576698