Index: pkg/analysis_server/lib/src/operation/operation_analysis.dart |
diff --git a/pkg/analysis_server/lib/src/operation/operation_analysis.dart b/pkg/analysis_server/lib/src/operation/operation_analysis.dart |
index acd3a993c18c4ea94ae5e8df30c012dc44bb3c68..70b1e9bafd8f7e219eb921246170a5dcc7c6f525 100644 |
--- a/pkg/analysis_server/lib/src/operation/operation_analysis.dart |
+++ b/pkg/analysis_server/lib/src/operation/operation_analysis.dart |
@@ -6,6 +6,7 @@ library operation.analysis; |
import 'package:analysis_server/src/analysis_server.dart'; |
import 'package:analysis_server/src/computer/computer_highlights.dart'; |
+import 'package:analysis_server/src/computer/computer_highlights2.dart'; |
import 'package:analysis_server/src/computer/computer_navigation.dart'; |
import 'package:analysis_server/src/computer/computer_occurrences.dart'; |
import 'package:analysis_server/src/computer/computer_outline.dart'; |
@@ -149,7 +150,12 @@ void sendAnalysisNotificationFlushResults( |
void sendAnalysisNotificationHighlights( |
AnalysisServer server, String file, CompilationUnit dartUnit) { |
_sendNotification(server, () { |
- var regions = new DartUnitHighlightsComputer(dartUnit).compute(); |
+ List<protocol.HighlightRegion> regions; |
+ if (server.options.useAnalysisHighlight2) { |
+ regions = new DartUnitHighlightsComputer2(dartUnit).compute(); |
+ } else { |
+ regions = new DartUnitHighlightsComputer(dartUnit).compute(); |
+ } |
var params = new protocol.AnalysisHighlightsParams(file, regions); |
server.sendNotification(params.toNotification()); |
}); |