| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 library services.src.refactoring.extract_local; | 5 library services.src.refactoring.extract_local; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/protocol2.dart' show SourceEdit; | 9 import 'package:analysis_server/src/protocol2.dart' show SourceEdit; |
| 10 import 'package:analysis_server/src/services/correction/change.dart'; | 10 import 'package:analysis_server/src/services/correction/change.dart'; |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 144 '${declarationSource}${eol}${prefix}'); | 144 '${declarationSource}${eol}${prefix}'); |
| 145 change.addEdit(file, edit); | 145 change.addEdit(file, edit); |
| 146 } | 146 } |
| 147 // prepare replacement | 147 // prepare replacement |
| 148 String occurrenceReplacement = name; | 148 String occurrenceReplacement = name; |
| 149 if (stringLiteralPart != null) { | 149 if (stringLiteralPart != null) { |
| 150 occurrenceReplacement = "\${$name}"; | 150 occurrenceReplacement = "\${$name}"; |
| 151 } | 151 } |
| 152 // replace occurrences with variable reference | 152 // replace occurrences with variable reference |
| 153 for (SourceRange range in occurrences) { | 153 for (SourceRange range in occurrences) { |
| 154 SourceEdit edit = editFromRange(range, occurrenceReplacement); | 154 SourceEdit edit = new SourceEdit.range(range, occurrenceReplacement); |
| 155 change.addEdit(file, edit); | 155 change.addEdit(file, edit); |
| 156 } | 156 } |
| 157 // done | 157 // done |
| 158 return new Future.value(change); | 158 return new Future.value(change); |
| 159 } | 159 } |
| 160 | 160 |
| 161 @override | 161 @override |
| 162 bool requiresPreview() => false; | 162 bool requiresPreview() => false; |
| 163 | 163 |
| 164 /** | 164 /** |
| (...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 521 Token startToken = nodeTokens[startTokenIndex]; | 521 Token startToken = nodeTokens[startTokenIndex]; |
| 522 Token endToken = nodeTokens[endTokenIndex]; | 522 Token endToken = nodeTokens[endTokenIndex]; |
| 523 // add occurrence range | 523 // add occurrence range |
| 524 int occuStart = nodeOffset + startToken.offset; | 524 int occuStart = nodeOffset + startToken.offset; |
| 525 int occuEnd = nodeOffset + endToken.end; | 525 int occuEnd = nodeOffset + endToken.end; |
| 526 SourceRange occuRange = rangeStartEnd(occuStart, occuEnd); | 526 SourceRange occuRange = rangeStartEnd(occuStart, occuEnd); |
| 527 _addOccurrence(occuRange); | 527 _addOccurrence(occuRange); |
| 528 } | 528 } |
| 529 } | 529 } |
| 530 } | 530 } |
| OLD | NEW |