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

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

Issue 497393002: Make more use of generated code in analysis server. (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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 Location, SourceEdit; 9 import 'package:analysis_server/src/protocol2.dart' show Location,
10 import 'package:analysis_server/src/services/correction/change.dart'; 10 SourceChange, SourceEdit;
11 import 'package:analysis_server/src/services/correction/name_suggestion.dart'; 11 import 'package:analysis_server/src/services/correction/name_suggestion.dart';
12 import 'package:analysis_server/src/services/correction/selection_analyzer.dart' ; 12 import 'package:analysis_server/src/services/correction/selection_analyzer.dart' ;
13 import 'package:analysis_server/src/services/correction/source_range.dart'; 13 import 'package:analysis_server/src/services/correction/source_range.dart';
14 import 'package:analysis_server/src/services/correction/status.dart'; 14 import 'package:analysis_server/src/services/correction/status.dart';
15 import 'package:analysis_server/src/services/correction/strings.dart'; 15 import 'package:analysis_server/src/services/correction/strings.dart';
16 import 'package:analysis_server/src/services/correction/util.dart'; 16 import 'package:analysis_server/src/services/correction/util.dart';
17 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart '; 17 import 'package:analysis_server/src/services/refactoring/naming_conventions.dart ';
18 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; 18 import 'package:analysis_server/src/services/refactoring/refactoring.dart';
19 import 'package:analysis_server/src/services/refactoring/refactoring_internal.da rt'; 19 import 'package:analysis_server/src/services/refactoring/refactoring_internal.da rt';
20 import 'package:analysis_server/src/services/search/element_visitors.dart'; 20 import 'package:analysis_server/src/services/search/element_visitors.dart';
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // done 100 // done
101 return new Future.value(result); 101 return new Future.value(result);
102 } 102 }
103 103
104 @override 104 @override
105 RefactoringStatus checkName() { 105 RefactoringStatus checkName() {
106 return validateVariableName(name); 106 return validateVariableName(name);
107 } 107 }
108 108
109 @override 109 @override
110 Future<Change> createChange() { 110 Future<SourceChange> createChange() {
111 Change change = new Change(refactoringName); 111 SourceChange change = new SourceChange(refactoringName);
112 // prepare occurrences 112 // prepare occurrences
113 List<SourceRange> occurrences; 113 List<SourceRange> occurrences;
114 if (extractAll) { 114 if (extractAll) {
115 occurrences = this.occurrences; 115 occurrences = this.occurrences;
116 } else { 116 } else {
117 occurrences = [selectionRange]; 117 occurrences = [selectionRange];
118 } 118 }
119 // If the whole expression of a statement is selected, like '1 + 2', 119 // If the whole expression of a statement is selected, like '1 + 2',
120 // then convert it into a variable declaration statement. 120 // then convert it into a variable declaration statement.
121 if (wholeStatementExpression && occurrences.length == 1) { 121 if (wholeStatementExpression && occurrences.length == 1) {
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 Token startToken = nodeTokens[startTokenIndex]; 529 Token startToken = nodeTokens[startTokenIndex];
530 Token endToken = nodeTokens[endTokenIndex]; 530 Token endToken = nodeTokens[endTokenIndex];
531 // add occurrence range 531 // add occurrence range
532 int occuStart = nodeOffset + startToken.offset; 532 int occuStart = nodeOffset + startToken.offset;
533 int occuEnd = nodeOffset + endToken.end; 533 int occuEnd = nodeOffset + endToken.end;
534 SourceRange occuRange = rangeStartEnd(occuStart, occuEnd); 534 SourceRange occuRange = rangeStartEnd(occuStart, occuEnd);
535 _addOccurrence(occuRange); 535 _addOccurrence(occuRange);
536 } 536 }
537 } 537 }
538 } 538 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698