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/edit/assist/assist_core.dart'; | 9 import 'package:analysis_server/edit/assist/assist_core.dart'; |
10 import 'package:analysis_server/edit/fix/fix_core.dart'; | 10 import 'package:analysis_server/edit/fix/fix_core.dart'; |
11 import 'package:analysis_server/src/analysis_server.dart'; | 11 import 'package:analysis_server/src/analysis_server.dart'; |
12 import 'package:analysis_server/src/collections.dart'; | 12 import 'package:analysis_server/src/collections.dart'; |
13 import 'package:analysis_server/src/constants.dart'; | 13 import 'package:analysis_server/src/constants.dart'; |
14 import 'package:analysis_server/src/plugin/server_plugin.dart'; | |
15 import 'package:analysis_server/src/protocol_server.dart' hide Element; | 14 import 'package:analysis_server/src/protocol_server.dart' hide Element; |
16 import 'package:analysis_server/src/services/correction/assist.dart'; | 15 import 'package:analysis_server/src/services/correction/assist.dart'; |
17 import 'package:analysis_server/src/services/correction/fix.dart'; | 16 import 'package:analysis_server/src/services/correction/fix.dart'; |
18 import 'package:analysis_server/src/services/correction/sort_members.dart'; | 17 import 'package:analysis_server/src/services/correction/sort_members.dart'; |
19 import 'package:analysis_server/src/services/correction/status.dart'; | 18 import 'package:analysis_server/src/services/correction/status.dart'; |
20 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; | 19 import 'package:analysis_server/src/services/refactoring/refactoring.dart'; |
21 import 'package:analysis_server/src/services/search/search_engine.dart'; | 20 import 'package:analysis_server/src/services/search/search_engine.dart'; |
22 import 'package:analyzer/src/generated/ast.dart'; | 21 import 'package:analyzer/src/generated/ast.dart'; |
23 import 'package:analyzer/src/generated/element.dart'; | 22 import 'package:analyzer/src/generated/element.dart'; |
24 import 'package:analyzer/src/generated/engine.dart' as engine; | 23 import 'package:analyzer/src/generated/engine.dart' as engine; |
(...skipping 11 matching lines...) Expand all Loading... |
36 * Instances of the class [EditDomainHandler] implement a [RequestHandler] | 35 * Instances of the class [EditDomainHandler] implement a [RequestHandler] |
37 * that handles requests in the edit domain. | 36 * that handles requests in the edit domain. |
38 */ | 37 */ |
39 class EditDomainHandler implements RequestHandler { | 38 class EditDomainHandler implements RequestHandler { |
40 /** | 39 /** |
41 * The analysis server that is using this handler to process requests. | 40 * The analysis server that is using this handler to process requests. |
42 */ | 41 */ |
43 final AnalysisServer server; | 42 final AnalysisServer server; |
44 | 43 |
45 /** | 44 /** |
46 * The server plugin that defines the extension points used by this handler. | |
47 */ | |
48 final ServerPlugin plugin; | |
49 | |
50 /** | |
51 * The [SearchEngine] for this server. | 45 * The [SearchEngine] for this server. |
52 */ | 46 */ |
53 SearchEngine searchEngine; | 47 SearchEngine searchEngine; |
54 | 48 |
55 _RefactoringManager refactoringManager; | 49 _RefactoringManager refactoringManager; |
56 | 50 |
57 /** | 51 /** |
58 * Initialize a newly created handler to handle requests for the given [server
]. | 52 * Initialize a newly created handler to handle requests for the given [server
]. |
59 */ | 53 */ |
60 EditDomainHandler(this.server, this.plugin) { | 54 EditDomainHandler(this.server) { |
61 searchEngine = server.searchEngine; | 55 searchEngine = server.searchEngine; |
62 _newRefactoringManager(); | 56 _newRefactoringManager(); |
63 } | 57 } |
64 | 58 |
65 Response format(Request request) { | 59 Response format(Request request) { |
66 EditFormatParams params = new EditFormatParams.fromRequest(request); | 60 EditFormatParams params = new EditFormatParams.fromRequest(request); |
67 String file = params.file; | 61 String file = params.file; |
68 | 62 |
69 ContextSourcePair contextSource = server.getContextSourcePair(file); | 63 ContextSourcePair contextSource = server.getContextSourcePair(file); |
70 | 64 |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
131 .toResponse(request.id); | 125 .toResponse(request.id); |
132 } | 126 } |
133 | 127 |
134 Response getAssists(Request request) { | 128 Response getAssists(Request request) { |
135 EditGetAssistsParams params = new EditGetAssistsParams.fromRequest(request); | 129 EditGetAssistsParams params = new EditGetAssistsParams.fromRequest(request); |
136 ContextSourcePair pair = server.getContextSourcePair(params.file); | 130 ContextSourcePair pair = server.getContextSourcePair(params.file); |
137 engine.AnalysisContext context = pair.context; | 131 engine.AnalysisContext context = pair.context; |
138 Source source = pair.source; | 132 Source source = pair.source; |
139 List<SourceChange> changes = <SourceChange>[]; | 133 List<SourceChange> changes = <SourceChange>[]; |
140 if (context != null && source != null) { | 134 if (context != null && source != null) { |
141 List<Assist> assists = | 135 List<Assist> assists = computeAssists( |
142 computeAssists(plugin, context, source, params.offset, params.length); | 136 server.serverPlugin, context, source, params.offset, params.length); |
143 assists.forEach((Assist assist) { | 137 assists.forEach((Assist assist) { |
144 changes.add(assist.change); | 138 changes.add(assist.change); |
145 }); | 139 }); |
146 } | 140 } |
147 return new EditGetAssistsResult(changes).toResponse(request.id); | 141 return new EditGetAssistsResult(changes).toResponse(request.id); |
148 } | 142 } |
149 | 143 |
150 Response getFixes(Request request) { | 144 Response getFixes(Request request) { |
151 var params = new EditGetFixesParams.fromRequest(request); | 145 var params = new EditGetFixesParams.fromRequest(request); |
152 String file = params.file; | 146 String file = params.file; |
153 int offset = params.offset; | 147 int offset = params.offset; |
154 // add fixes | 148 // add fixes |
155 List<AnalysisErrorFixes> errorFixesList = <AnalysisErrorFixes>[]; | 149 List<AnalysisErrorFixes> errorFixesList = <AnalysisErrorFixes>[]; |
156 List<CompilationUnit> units = server.getResolvedCompilationUnits(file); | 150 List<CompilationUnit> units = server.getResolvedCompilationUnits(file); |
157 for (CompilationUnit unit in units) { | 151 for (CompilationUnit unit in units) { |
158 engine.AnalysisErrorInfo errorInfo = server.getErrors(file); | 152 engine.AnalysisErrorInfo errorInfo = server.getErrors(file); |
159 if (errorInfo != null) { | 153 if (errorInfo != null) { |
160 LineInfo lineInfo = errorInfo.lineInfo; | 154 LineInfo lineInfo = errorInfo.lineInfo; |
161 int requestLine = lineInfo.getLocation(offset).lineNumber; | 155 int requestLine = lineInfo.getLocation(offset).lineNumber; |
162 for (engine.AnalysisError error in errorInfo.errors) { | 156 for (engine.AnalysisError error in errorInfo.errors) { |
163 int errorLine = lineInfo.getLocation(error.offset).lineNumber; | 157 int errorLine = lineInfo.getLocation(error.offset).lineNumber; |
164 if (errorLine == requestLine) { | 158 if (errorLine == requestLine) { |
165 List<Fix> fixes = computeFixes(plugin, unit.element.context, error); | 159 List<Fix> fixes = |
| 160 computeFixes(server.serverPlugin, unit.element.context, error); |
166 if (fixes.isNotEmpty) { | 161 if (fixes.isNotEmpty) { |
167 AnalysisError serverError = | 162 AnalysisError serverError = |
168 newAnalysisError_fromEngine(lineInfo, error); | 163 newAnalysisError_fromEngine(lineInfo, error); |
169 AnalysisErrorFixes errorFixes = | 164 AnalysisErrorFixes errorFixes = |
170 new AnalysisErrorFixes(serverError); | 165 new AnalysisErrorFixes(serverError); |
171 errorFixesList.add(errorFixes); | 166 errorFixesList.add(errorFixes); |
172 fixes.forEach((fix) { | 167 fixes.forEach((fix) { |
173 errorFixes.fixes.add(fix.change); | 168 errorFixes.fixes.add(fix.change); |
174 }); | 169 }); |
175 } | 170 } |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
650 } | 645 } |
651 if (refactoring is RenameRefactoring) { | 646 if (refactoring is RenameRefactoring) { |
652 RenameRefactoring renameRefactoring = refactoring; | 647 RenameRefactoring renameRefactoring = refactoring; |
653 RenameOptions renameOptions = params.options; | 648 RenameOptions renameOptions = params.options; |
654 renameRefactoring.newName = renameOptions.newName; | 649 renameRefactoring.newName = renameOptions.newName; |
655 return renameRefactoring.checkNewName(); | 650 return renameRefactoring.checkNewName(); |
656 } | 651 } |
657 return new RefactoringStatus(); | 652 return new RefactoringStatus(); |
658 } | 653 } |
659 } | 654 } |
OLD | NEW |