| 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 edit.domain; | 5 library edit.domain; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/analysis_server.dart'; | 9 import 'package:analysis_server/src/analysis_server.dart'; |
| 10 import 'package:analysis_server/src/constants.dart'; | 10 import 'package:analysis_server/src/constants.dart'; |
| 11 import 'package:analysis_server/src/protocol.dart' hide Element; | 11 import 'package:analysis_server/src/protocol.dart' hide Element; |
| 12 import 'package:analysis_server/src/services/correction/assist.dart'; | 12 import 'package:analysis_server/src/services/correction/assist.dart'; |
| 13 import 'package:analysis_server/src/services/correction/fix.dart'; | 13 import 'package:analysis_server/src/services/correction/fix.dart'; |
| 14 import 'package:analysis_server/src/services/correction/sort_members.dart'; | 14 import 'package:analysis_server/src/services/correction/sort_members.dart'; |
| 15 import 'package:analysis_server/src/services/correction/status.dart'; | 15 import 'package:analysis_server/src/services/correction/status.dart'; |
| 16 import 'package:analysis_server/src/services/json.dart'; | |
| 17 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 16 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
| 18 import 'package:analysis_server/src/services/search/search_engine.dart'; | 17 import 'package:analysis_server/src/services/search/search_engine.dart'; |
| 19 import 'package:analyzer/src/generated/ast.dart'; | 18 import 'package:analyzer/src/generated/ast.dart'; |
| 20 import 'package:analyzer/src/generated/element.dart'; | 19 import 'package:analyzer/src/generated/element.dart'; |
| 21 import 'package:analyzer/src/generated/engine.dart' as engine; | 20 import 'package:analyzer/src/generated/engine.dart' as engine; |
| 22 import 'package:analyzer/src/generated/error.dart' as engine; | 21 import 'package:analyzer/src/generated/error.dart' as engine; |
| 23 import 'package:analyzer/src/generated/parser.dart' as engine; | 22 import 'package:analyzer/src/generated/parser.dart' as engine; |
| 24 import 'package:analyzer/src/generated/scanner.dart' as engine; | 23 import 'package:analyzer/src/generated/scanner.dart' as engine; |
| 25 import 'package:analyzer/src/generated/source.dart'; | 24 import 'package:analyzer/src/generated/source.dart'; |
| 26 | 25 |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 206 ]; | 205 ]; |
| 207 | 206 |
| 208 final AnalysisServer server; | 207 final AnalysisServer server; |
| 209 final SearchEngine searchEngine; | 208 final SearchEngine searchEngine; |
| 210 | 209 |
| 211 RefactoringKind kind; | 210 RefactoringKind kind; |
| 212 String file; | 211 String file; |
| 213 int offset; | 212 int offset; |
| 214 int length; | 213 int length; |
| 215 Refactoring refactoring; | 214 Refactoring refactoring; |
| 216 HasToJson feedback; | 215 RefactoringFeedback feedback; |
| 217 RefactoringStatus initStatus; | 216 RefactoringStatus initStatus; |
| 218 RefactoringStatus optionsStatus; | 217 RefactoringStatus optionsStatus; |
| 219 RefactoringStatus finalStatus; | 218 RefactoringStatus finalStatus; |
| 220 | 219 |
| 221 String requestId; | 220 String requestId; |
| 222 EditGetRefactoringResult result; | 221 EditGetRefactoringResult result; |
| 223 | 222 |
| 224 _RefactoringManager(this.server, this.searchEngine) { | 223 _RefactoringManager(this.server, this.searchEngine) { |
| 225 server.onAnalysisStarted.listen(_reset); | 224 server.onAnalysisStarted.listen(_reset); |
| 226 _reset(); | 225 _reset(); |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 return _sendResultResponse(); | 272 return _sendResultResponse(); |
| 274 } | 273 } |
| 275 // validation and create change | 274 // validation and create change |
| 276 refactoring.checkFinalConditions().then((_finalStatus) { | 275 refactoring.checkFinalConditions().then((_finalStatus) { |
| 277 finalStatus = _finalStatus; | 276 finalStatus = _finalStatus; |
| 278 if (_hasFatalError) { | 277 if (_hasFatalError) { |
| 279 return _sendResultResponse(); | 278 return _sendResultResponse(); |
| 280 } | 279 } |
| 281 // create change | 280 // create change |
| 282 return refactoring.createChange().then((change) { | 281 return refactoring.createChange().then((change) { |
| 283 result.change = new SourceChange(change.message, edits: change.edits); | 282 result.change = change; |
| 283 result.potentialEdits = refactoring.potentialEditIds; |
| 284 return _sendResultResponse(); | 284 return _sendResultResponse(); |
| 285 }); | 285 }); |
| 286 }); | 286 }); |
| 287 }); | 287 }); |
| 288 } | 288 } |
| 289 | 289 |
| 290 /** | 290 /** |
| 291 * Initializes this context to perform a refactoring with the specified | 291 * Initializes this context to perform a refactoring with the specified |
| 292 * parameters. The existing [Refactoring] is reused or created as needed. | 292 * parameters. The existing [Refactoring] is reused or created as needed. |
| 293 */ | 293 */ |
| (...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 490 } | 490 } |
| 491 if (refactoring is RenameRefactoring) { | 491 if (refactoring is RenameRefactoring) { |
| 492 RenameRefactoring renameRefactoring = refactoring; | 492 RenameRefactoring renameRefactoring = refactoring; |
| 493 RenameOptions renameOptions = params.options; | 493 RenameOptions renameOptions = params.options; |
| 494 renameRefactoring.newName = renameOptions.newName; | 494 renameRefactoring.newName = renameOptions.newName; |
| 495 return renameRefactoring.checkNewName(); | 495 return renameRefactoring.checkNewName(); |
| 496 } | 496 } |
| 497 return new RefactoringStatus(); | 497 return new RefactoringStatus(); |
| 498 } | 498 } |
| 499 } | 499 } |
| OLD | NEW |