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

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

Issue 574573002: Add SourceFileEdit.time field. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: tweak 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/inline_method.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart b/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
index 1008e65290ecfdc59935a20415a61dd80929637e..0f862963112cd7b32c0812a771ebeb5b80892020 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/inline_method.dart
@@ -170,7 +170,6 @@ class InlineMethodRefactoringImpl extends RefactoringImpl implements
final SearchEngine searchEngine;
final CompilationUnit unit;
final int offset;
- String file;
CorrectionUtils utils;
SourceChange change;
@@ -192,7 +191,6 @@ class InlineMethodRefactoringImpl extends RefactoringImpl implements
List<_ReferenceProcessor> _referenceProcessors = [];
InlineMethodRefactoringImpl(this.searchEngine, this.unit, this.offset) {
- file = unit.element.source.fullName;
utils = new CorrectionUtils(unit);
}
@@ -241,7 +239,10 @@ class InlineMethodRefactoringImpl extends RefactoringImpl implements
if (deleteSource && inlineAll) {
SourceRange methodRange = rangeNode(_methodNode);
SourceRange linesRange = _methodUtils.getLinesRange(methodRange);
- change.addEdit(_methodFile, new SourceEdit.range(linesRange, ""));
+ addElementSourceChange(
+ change,
+ _methodElement,
+ new SourceEdit.range(linesRange, ''));
}
// done
return new Future.value(result);
@@ -405,16 +406,14 @@ class _ParameterOccurrence {
class _ReferenceProcessor {
final InlineMethodRefactoringImpl ref;
- String _refFile;
+ Element refElement;
CorrectionUtils _refUtils;
SimpleIdentifier _node;
SourceRange _refLineRange;
String _refPrefix;
_ReferenceProcessor(this.ref, SearchMatch reference) {
- // prepare SourceChange to update
- Element refElement = reference.element;
- _refFile = refElement.source.fullName;
+ refElement = reference.element;
// prepare CorrectionUtils
CompilationUnit refUnit = refElement.unit;
_refUtils = new CorrectionUtils(refUnit);
@@ -497,7 +496,7 @@ class _ReferenceProcessor {
// do insert
SourceRange range = rangeStartLength(_refLineRange, 0);
SourceEdit edit = new SourceEdit.range(range, source);
- ref.change.addEdit(_refFile, edit);
+ _addRefEdit(edit);
}
// replace invocation with return expression
if (ref._methodExpressionPart != null) {
@@ -515,10 +514,10 @@ class _ReferenceProcessor {
// do replace
SourceRange methodUsageRange = rangeNode(usage);
SourceEdit edit = new SourceEdit.range(methodUsageRange, source);
- ref.change.addEdit(_refFile, edit);
+ _addRefEdit(edit);
} else {
SourceEdit edit = new SourceEdit.range(_refLineRange, "");
- ref.change.addEdit(_refFile, edit);
+ _addRefEdit(edit);
}
return;
}
@@ -535,7 +534,7 @@ class _ReferenceProcessor {
// do insert
SourceRange range = rangeNode(_node);
SourceEdit edit = new SourceEdit.range(range, source);
- ref.change.addEdit(_refFile, edit);
+ _addRefEdit(edit);
}
void _process(RefactoringStatus status) {
@@ -606,10 +605,14 @@ class _ReferenceProcessor {
// do insert
SourceRange range = rangeNode(_node);
SourceEdit edit = new SourceEdit.range(range, source);
- ref.change.addEdit(_refFile, edit);
+ _addRefEdit(edit);
}
}
+ void _addRefEdit(SourceEdit edit) {
+ addElementSourceChange(ref.change, refElement, edit);
+ }
+
bool _shouldProcess() {
if (!ref.inlineAll) {
SourceRange parentRange = rangeNode(_node);

Powered by Google App Engine
This is Rietveld 408576698