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

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

Issue 820763002: Fix for extracting from interpolated string. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years 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
« no previous file with comments | « no previous file | pkg/analysis_server/test/services/refactoring/extract_local_test.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0925b38a67100b5dc6e4079f6aabc50ef912c743..48390a20820b046944bb23a4cfc3b949151dc9c0 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/extract_local.dart
@@ -549,11 +549,10 @@ class _OccurrencesVisitor extends GeneralizingAstVisitor<Object> {
}
@override
- Object visitSimpleStringLiteral(SimpleStringLiteral node) {
+ Object visitStringLiteral(StringLiteral node) {
if (ref.stringLiteralPart != null) {
int occuLength = ref.stringLiteralPart.length;
- String value = node.value;
- int valueOffset = node.offset + (node.isMultiline ? 3 : 1);
+ String value = ref.utils.getNodeText(node);
int lastIndex = 0;
while (true) {
int index = value.indexOf(ref.stringLiteralPart, lastIndex);
@@ -561,7 +560,7 @@ class _OccurrencesVisitor extends GeneralizingAstVisitor<Object> {
break;
}
lastIndex = index + occuLength;
- int occuStart = valueOffset + index;
+ int occuStart = node.offset + index;
SourceRange occuRange = rangeStartLength(occuStart, occuLength);
occurrences.add(occuRange);
}
« no previous file with comments | « no previous file | pkg/analysis_server/test/services/refactoring/extract_local_test.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698