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

Unified Diff: pkg/analysis_server/lib/src/services/refactoring/extract_local.dart

Issue 580273002: Push add*Edit helpers into SourceChange. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 3 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/refactoring/extract_local.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart b/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
index 6d1b462c945314d095ed0f7f34275e22c01e90b2..3c41ff0e23a06416c533ef50d3459845522e204d 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
@@ -123,7 +123,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl implements
String declarationSource = '$keyword $name = ';
SourceEdit edit =
new SourceEdit(singleExpression.offset, 0, declarationSource);
- addElementSourceChange(change, unitElement, edit);
+ change.addElementEdit(unitElement, edit);
return new Future.value(change);
}
// add variable declaration
@@ -159,22 +159,20 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl implements
String prefix = utils.getNodePrefix(target);
SourceEdit edit =
new SourceEdit(target.offset, 0, declarationSource + eol + prefix);
- addElementSourceChange(change, unitElement, edit);
+ change.addElementEdit(unitElement, edit);
} else if (target is ExpressionFunctionBody) {
String prefix = utils.getNodePrefix(target.parent);
String indent = utils.getIndent(1);
String declStatement = prefix + indent + declarationSource + eol;
String exprStatement = prefix + indent + 'return ';
Expression expr = target.expression;
- addElementSourceChange(
- change,
+ change.addElementEdit(
unitElement,
new SourceEdit(
target.offset,
expr.offset - target.offset,
'{' + eol + declStatement + exprStatement));
- addElementSourceChange(
- change,
+ change.addElementEdit(
unitElement,
new SourceEdit(expr.end, 0, ';' + eol + prefix + '}'));
}
@@ -187,7 +185,7 @@ class ExtractLocalRefactoringImpl extends RefactoringImpl implements
// replace occurrences with variable reference
for (SourceRange range in occurrences) {
SourceEdit edit = new SourceEdit.range(range, occurrenceReplacement);
- addElementSourceChange(change, unitElement, edit);
+ change.addElementEdit(unitElement, edit);
}
// done
return new Future.value(change);

Powered by Google App Engine
This is Rietveld 408576698