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

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

Issue 2869083002: Convert server to use RangeFactory (Closed)
Patch Set: Created 3 years, 7 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_local.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart b/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart
index 74e1add2fc130bad3606b0c0cf425e6077a7d9b6..3607aa182555f95d5d840a8e3d9d057c95f39fec 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/inline_local.dart
@@ -7,7 +7,6 @@ library services.src.refactoring.inline_local;
import 'dart:async';
import 'package:analysis_server/src/protocol_server.dart' hide Element;
-import 'package:analysis_server/src/services/correction/source_range.dart';
import 'package:analysis_server/src/services/correction/status.dart';
import 'package:analysis_server/src/services/correction/util.dart';
import 'package:analysis_server/src/services/refactoring/refactoring.dart';
@@ -20,6 +19,7 @@ import 'package:analyzer/src/dart/ast/utilities.dart';
import 'package:analyzer/src/dart/element/ast_provider.dart';
import 'package:analyzer/src/generated/java_core.dart';
import 'package:analyzer/src/generated/source.dart';
+import 'package:analyzer_plugin/utilities/range_factory.dart';
/**
* [InlineLocalRefactoring] implementation.
@@ -131,9 +131,9 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
String initializerCode = utils.getNodeText(initializer);
// replace references
for (SearchMatch reference in _references) {
- SourceRange range = reference.sourceRange;
+ SourceRange editRange = reference.sourceRange;
// prepare context
- int offset = range.offset;
+ int offset = editRange.offset;
AstNode node = utils.findNode(offset);
AstNode parent = node.parent;
// prepare code
@@ -144,7 +144,7 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
!initializer.isRaw &&
initializer.isSingleQuoted == target.isSingleQuoted &&
(!initializer.isMultiline || target.isMultiline)) {
- range = rangeNode(parent);
+ editRange = range.node(parent);
// unwrap the literal being inlined
int initOffset = initializer.contentsOffset;
int initLength = initializer.contentsEnd - initOffset;
@@ -160,8 +160,8 @@ class InlineLocalRefactoringImpl extends RefactoringImpl
codeForReference = initializerCode;
}
// do replace
- doSourceChange_addElementEdit(
- change, unitElement, newSourceEdit_range(range, codeForReference));
+ doSourceChange_addElementEdit(change, unitElement,
+ newSourceEdit_range(editRange, codeForReference));
}
// done
return new Future.value(change);

Powered by Google App Engine
This is Rietveld 408576698