| 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 test.edit.refactoring; | 5 library test.edit.refactoring; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/plugin/protocol/protocol.dart'; | 9 import 'package:analysis_server/plugin/protocol/protocol.dart'; |
| 10 import 'package:analysis_server/src/edit/edit_domain.dart'; | 10 import 'package:analysis_server/src/edit/edit_domain.dart'; |
| (...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 652 } | 652 } |
| 653 '''); | 653 '''); |
| 654 } | 654 } |
| 655 | 655 |
| 656 Future<Response> _computeChange() async { | 656 Future<Response> _computeChange() async { |
| 657 await _prepareOptions(); | 657 await _prepareOptions(); |
| 658 // send request with the options | 658 // send request with the options |
| 659 return _sendExtractRequest(); | 659 return _sendExtractRequest(); |
| 660 } | 660 } |
| 661 | 661 |
| 662 Future<ExtractMethodFeedback> _computeInitialFeedback() { | 662 Future<ExtractMethodFeedback> _computeInitialFeedback() async { |
| 663 return waitForTasksFinished().then((_) { | 663 await waitForTasksFinished(); |
| 664 return _sendExtractRequest(); | 664 Response response = await _sendExtractRequest(); |
| 665 }).then((Response response) { | 665 var result = new EditGetRefactoringResult.fromResponse(response); |
| 666 var result = new EditGetRefactoringResult.fromResponse(response); | 666 return result.feedback; |
| 667 return result.feedback; | |
| 668 }); | |
| 669 } | 667 } |
| 670 | 668 |
| 671 Future _prepareOptions() { | 669 Future _prepareOptions() { |
| 672 return getRefactoringResult(() { | 670 return getRefactoringResult(() { |
| 673 // get initial feedback | 671 // get initial feedback |
| 674 return _sendExtractRequest(); | 672 return _sendExtractRequest(); |
| 675 }).then((result) { | 673 }).then((result) { |
| 676 assertResultProblemsOK(result); | 674 assertResultProblemsOK(result); |
| 677 // fill options from result | 675 // fill options from result |
| 678 ExtractMethodFeedback feedback = result.feedback; | 676 ExtractMethodFeedback feedback = result.feedback; |
| (...skipping 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1924 .toRequest('0'); | 1922 .toRequest('0'); |
| 1925 return _assertErrorResponseNoIndex(request); | 1923 return _assertErrorResponseNoIndex(request); |
| 1926 } | 1924 } |
| 1927 | 1925 |
| 1928 _assertErrorResponseNoIndex(Request request) async { | 1926 _assertErrorResponseNoIndex(Request request) async { |
| 1929 Response response = await serverChannel.sendRequest(request); | 1927 Response response = await serverChannel.sendRequest(request); |
| 1930 expect(response.error, isNotNull); | 1928 expect(response.error, isNotNull); |
| 1931 expect(response.error.code, RequestErrorCode.NO_INDEX_GENERATED); | 1929 expect(response.error.code, RequestErrorCode.NO_INDEX_GENERATED); |
| 1932 } | 1930 } |
| 1933 } | 1931 } |
| OLD | NEW |