| 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.assists; | 5 library test.edit.assists; |
| 6 | 6 |
| 7 import 'dart:async'; | 7 import 'dart:async'; |
| 8 | 8 |
| 9 import 'package:analysis_server/src/edit/edit_domain.dart'; | 9 import 'package:analysis_server/src/edit/edit_domain.dart'; |
| 10 import 'package:analysis_server/src/protocol.dart'; | 10 import 'package:analysis_server/src/protocol.dart'; |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 void prepareAssists(String search, [int length = 0]) { | 27 void prepareAssists(String search, [int length = 0]) { |
| 28 int offset = findOffset(search); | 28 int offset = findOffset(search); |
| 29 prepareAssistsAt(offset, length); | 29 prepareAssistsAt(offset, length); |
| 30 } | 30 } |
| 31 | 31 |
| 32 void prepareAssistsAt(int offset, int length) { | 32 void prepareAssistsAt(int offset, int length) { |
| 33 Request request = new EditGetAssistsParams(testFile, offset, | 33 Request request = new EditGetAssistsParams(testFile, offset, |
| 34 length).toRequest('0'); | 34 length).toRequest('0'); |
| 35 Response response = handleSuccessfulRequest(request); | 35 Response response = handleSuccessfulRequest(request); |
| 36 var result = new EditGetAssistsResult.fromResponse(response); | 36 var result = new EditGetAssistsResult.fromResponse(response); |
| 37 List<SourceChange> sourceChangeList = result.assists; | 37 changes = result.assists; |
| 38 // TODO(scheglov) consider using generated classes and decoders | |
| 39 changes = sourceChangeList.map((SourceChange sourceChange) { | |
| 40 SourceChange change = new SourceChange(sourceChange.message); | |
| 41 sourceChange.edits.forEach((SourceFileEdit sourceFileEdit) { | |
| 42 SourceFileEdit fileEdit = new SourceFileEdit(sourceFileEdit.file); | |
| 43 change.edits.add(fileEdit); | |
| 44 fileEdit.edits.addAll(sourceFileEdit.edits); | |
| 45 }); | |
| 46 return change; | |
| 47 }).toList(); | |
| 48 } | 38 } |
| 49 | 39 |
| 50 @override | 40 @override |
| 51 void setUp() { | 41 void setUp() { |
| 52 super.setUp(); | 42 super.setUp(); |
| 53 createProject(); | 43 createProject(); |
| 54 handler = new EditDomainHandler(server); | 44 handler = new EditDomainHandler(server); |
| 55 } | 45 } |
| 56 | 46 |
| 57 Future test_removeTypeAnnotation() { | 47 Future test_removeTypeAnnotation() { |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 if (change.message == message) { | 104 if (change.message == message) { |
| 115 String resultCode = | 105 String resultCode = |
| 116 SourceEdit.applySequence(testCode, change.edits[0].edits); | 106 SourceEdit.applySequence(testCode, change.edits[0].edits); |
| 117 expect(resultCode, expectedCode); | 107 expect(resultCode, expectedCode); |
| 118 return; | 108 return; |
| 119 } | 109 } |
| 120 } | 110 } |
| 121 fail("Expected to find |$message| in\n" + changes.join('\n')); | 111 fail("Expected to find |$message| in\n" + changes.join('\n')); |
| 122 } | 112 } |
| 123 } | 113 } |
| OLD | NEW |