languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-07 08:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove convertChildToChildren; tidy convertChildToChildren2

Browse source 
convertChildToChildren is unused within the package.

Convert Function type to function types in convertChildToChildren2,
to reduce implicit casts.

Bug: https://github.com/dart-lang/sdk/issues/41651
Change-Id: I60dcec3649a98c39057869f3210b6b44aba0ddd2
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/222040
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
Commit-Queue: Samuel Rawlins <srawlins@google.com>
This commit is contained in:
Sam Rawlins 2021-12-06 19:54:46 +00:00 committed by Commit Bot
parent abd1dc8465
commit ed9f6b0015
1 changed files with 8 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
pkg/analysis_server/lib/src/utilities/flutter.dart
View file

@ -72,64 +72,20 @@ class Flutter {
return null;
}
void convertChildToChildren(
InstanceCreationExpression childArg,
NamedExpression namedExp,
String eol,
Function getNodeText,
Function getLinePrefix,
Function getIndent,
Function getText,
Function _addInsertEdit,
Function _addRemoveEdit,
Function _addReplaceEdit,
Function rangeNode) {
var childLoc = namedExp.offset + 'child'.length;
_addInsertEdit(childLoc, 'ren');
var listLoc = childArg.offset;
String childArgSrc = getNodeText(childArg);
if (!childArgSrc.contains(eol)) {
_addInsertEdit(listLoc, '[');
_addInsertEdit(listLoc + childArg.length, ']');
} else {
var newlineLoc = childArgSrc.lastIndexOf(eol);
if (newlineLoc == childArgSrc.length) {
newlineLoc -= 1;
}
String indentOld =
getLinePrefix(childArg.offset + eol.length + newlineLoc);
var indentNew = '$indentOld${getIndent(1)}';
// The separator includes 'child:' but that has no newlines.
String separator =
getText(namedExp.offset, childArg.offset - namedExp.offset);
var prefix = separator.contains(eol) ? '' : '$eol$indentNew';
if (prefix.isEmpty) {
_addInsertEdit(namedExp.offset + 'child:'.length, ' [');
_addRemoveEdit(SourceRange(childArg.offset - 2, 2));
} else {
_addInsertEdit(listLoc, '[');
}
var newChildArgSrc = childArgSrc.replaceAll(
RegExp('^$indentOld', multiLine: true), '$indentNew');
newChildArgSrc = '$prefix$newChildArgSrc,$eol$indentOld]';
_addReplaceEdit(rangeNode(childArg), newChildArgSrc);
}
}
void convertChildToChildren2(
DartFileEditBuilder builder,
Expression childArg,
NamedExpression namedExp,
String eol,
Function getNodeText,
Function getLinePrefix,
Function getIndent,
Function getText,
Function rangeNode) {
String Function(Expression) getNodeText,
String Function(int) getLinePrefix,
String Function(int) getIndent,
String Function(int, int) getText,
SourceRange Function(Expression) rangeNode) {
var childLoc = namedExp.offset + 'child'.length;
builder.addSimpleInsertion(childLoc, 'ren');
var listLoc = childArg.offset;
String childArgSrc = getNodeText(childArg);
var childArgSrc = getNodeText(childArg);
if (!childArgSrc.contains(eol)) {
builder.addSimpleInsertion(listLoc, '[');
builder.addSimpleInsertion(listLoc + childArg.length, ']');
@ -138,11 +94,10 @@ class Flutter {
if (newlineLoc == childArgSrc.length) {
newlineLoc -= 1;
}
String indentOld =
getLinePrefix(childArg.offset + eol.length + newlineLoc);
var indentOld = getLinePrefix(childArg.offset + eol.length + newlineLoc);
var indentNew = '$indentOld${getIndent(1)}';
// The separator includes 'child:' but that has no newlines.
String separator =
var separator =
getText(namedExp.offset, childArg.offset - namedExp.offset);
var prefix = separator.contains(eol) ? '' : '$eol$indentNew';
if (prefix.isEmpty) {