| 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 import 'package:analysis_server/plugin/protocol/protocol.dart' as protocol; | 5 import 'package:analysis_server/plugin/protocol/protocol.dart' as protocol; |
| 6 import 'package:analysis_server/src/analysis_server.dart' show AnalysisServer; | 6 import 'package:analysis_server/src/analysis_server.dart' show AnalysisServer; |
| 7 import 'package:analysis_server/src/domains/analysis/navigation.dart'; | 7 import 'package:analysis_server/src/domains/analysis/navigation.dart'; |
| 8 import 'package:analysis_server/src/domains/analysis/navigation_dart.dart'; | 8 import 'package:analysis_server/src/domains/analysis/navigation_dart.dart'; |
| 9 import 'package:analysis_server/src/domains/analysis/occurrences.dart'; | 9 import 'package:analysis_server/src/domains/analysis/occurrences.dart'; |
| 10 import 'package:analysis_server/src/domains/analysis/occurrences_dart.dart'; | 10 import 'package:analysis_server/src/domains/analysis/occurrences_dart.dart'; |
| 11 import 'package:analysis_server/src/protocol_server.dart' as protocol; | 11 import 'package:analysis_server/src/protocol_server.dart' as protocol; |
| 12 import 'package:analyzer/error/error.dart'; | |
| 13 import 'package:analyzer/src/dart/analysis/driver.dart'; | 12 import 'package:analyzer/src/dart/analysis/driver.dart'; |
| 14 | 13 |
| 15 void new_sendDartNotificationNavigation( | 14 void new_sendDartNotificationNavigation( |
| 16 AnalysisServer analysisServer, AnalysisResult result) { | 15 AnalysisServer analysisServer, AnalysisResult result) { |
| 17 var unit = result.unit; | 16 var unit = result.unit; |
| 18 if (unit != null) { | 17 if (unit != null) { |
| 19 NavigationCollectorImpl collector = new NavigationCollectorImpl(); | 18 NavigationCollectorImpl collector = new NavigationCollectorImpl(); |
| 20 computeSimpleDartNavigation(collector, unit); | 19 computeSimpleDartNavigation(collector, unit); |
| 21 collector.createRegions(); | 20 collector.createRegions(); |
| 22 var params = new protocol.AnalysisNavigationParams( | 21 var params = new protocol.AnalysisNavigationParams( |
| 23 result.path, collector.regions, collector.targets, collector.files); | 22 result.path, collector.regions, collector.targets, collector.files); |
| 24 analysisServer.sendNotification(params.toNotification()); | 23 analysisServer.sendNotification(params.toNotification()); |
| 25 } | 24 } |
| 26 } | 25 } |
| 27 | 26 |
| 28 void new_sendDartNotificationOccurrences( | 27 void new_sendDartNotificationOccurrences( |
| 29 AnalysisServer analysisServer, AnalysisResult result) { | 28 AnalysisServer analysisServer, AnalysisResult result) { |
| 30 var unit = result.unit; | 29 var unit = result.unit; |
| 31 if (unit != null) { | 30 if (unit != null) { |
| 32 OccurrencesCollectorImpl collector = new OccurrencesCollectorImpl(); | 31 OccurrencesCollectorImpl collector = new OccurrencesCollectorImpl(); |
| 33 addDartOccurrences(collector, unit); | 32 addDartOccurrences(collector, unit); |
| 34 var params = new protocol.AnalysisOccurrencesParams( | 33 var params = new protocol.AnalysisOccurrencesParams( |
| 35 result.path, collector.allOccurrences); | 34 result.path, collector.allOccurrences); |
| 36 analysisServer.sendNotification(params.toNotification()); | 35 analysisServer.sendNotification(params.toNotification()); |
| 37 } | 36 } |
| 38 } | 37 } |
| 39 | 38 |
| 40 void new_sendErrorNotification( | 39 void new_sendErrorNotification( |
| 41 AnalysisServer analysisServer, AnalysisResult result) { | 40 AnalysisServer analysisServer, AnalysisResult result) { |
| 42 var serverErrors = <protocol.AnalysisError>[]; | 41 var serverErrors = protocol.doAnalysisError_listFromEngine( |
| 43 for (AnalysisError error in result.errors) { | 42 result.driver.analysisOptions, result.lineInfo, result.errors); |
| 44 serverErrors | |
| 45 .add(protocol.newAnalysisError_fromEngine(result.lineInfo, error)); | |
| 46 } | |
| 47 var params = new protocol.AnalysisErrorsParams(result.path, serverErrors); | 43 var params = new protocol.AnalysisErrorsParams(result.path, serverErrors); |
| 48 analysisServer.sendNotification(params.toNotification()); | 44 analysisServer.sendNotification(params.toNotification()); |
| 49 } | 45 } |
| OLD | NEW |