Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(97)

Side by Side Diff: pkg/analysis_server/lib/src/operation/operation_analysis.dart

Issue 652903006: Issue 21373. Fix for removing line info in case of exception (causes NPE in outline computer). (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 operation.analysis; 5 library operation.analysis;
6 6
7 import 'package:analysis_server/src/analysis_server.dart'; 7 import 'package:analysis_server/src/analysis_server.dart';
8 import 'package:analysis_server/src/computer/computer_highlights.dart'; 8 import 'package:analysis_server/src/computer/computer_highlights.dart';
9 import 'package:analysis_server/src/computer/computer_navigation.dart'; 9 import 'package:analysis_server/src/computer/computer_navigation.dart';
10 import 'package:analysis_server/src/computer/computer_occurrences.dart'; 10 import 'package:analysis_server/src/computer/computer_occurrences.dart';
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 43
44 void sendAnalysisNotificationOccurrences(AnalysisServer server, String file, 44 void sendAnalysisNotificationOccurrences(AnalysisServer server, String file,
45 CompilationUnit dartUnit) { 45 CompilationUnit dartUnit) {
46 server.sendNotification(new protocol.AnalysisOccurrencesParams(file, 46 server.sendNotification(new protocol.AnalysisOccurrencesParams(file,
47 new DartUnitOccurrencesComputer(dartUnit).compute()).toNotification()); 47 new DartUnitOccurrencesComputer(dartUnit).compute()).toNotification());
48 } 48 }
49 49
50 50
51 void sendAnalysisNotificationOutline(AnalysisServer server, 51 void sendAnalysisNotificationOutline(AnalysisServer server,
52 AnalysisContext context, Source source, CompilationUnit dartUnit) { 52 Source source, LineInfo lineInfo, CompilationUnit dartUnit) {
53 server.sendNotification(new protocol.AnalysisOutlineParams(source.fullName, 53 server.sendNotification(new protocol.AnalysisOutlineParams(source.fullName,
54 new DartUnitOutlineComputer(context, source, 54 new DartUnitOutlineComputer(source, lineInfo,
55 dartUnit).compute()).toNotification()); 55 dartUnit).compute()).toNotification());
56 } 56 }
57 57
58 58
59 void sendAnalysisNotificationOverrides(AnalysisServer server, String file, 59 void sendAnalysisNotificationOverrides(AnalysisServer server, String file,
60 CompilationUnit dartUnit) { 60 CompilationUnit dartUnit) {
61 server.sendNotification(new protocol.AnalysisOverridesParams(file, 61 server.sendNotification(new protocol.AnalysisOverridesParams(file,
62 new DartUnitOverridesComputer(dartUnit).compute()).toNotification()); 62 new DartUnitOverridesComputer(dartUnit).compute()).toNotification());
63 } 63 }
64 64
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 if (server.hasAnalysisSubscription(protocol.AnalysisService.HIGHLIGHTS, file)) { 120 if (server.hasAnalysisSubscription(protocol.AnalysisService.HIGHLIGHTS, file)) {
121 sendAnalysisNotificationHighlights(server, file, dartUnit); 121 sendAnalysisNotificationHighlights(server, file, dartUnit);
122 } 122 }
123 if (server.hasAnalysisSubscription(protocol.AnalysisService.NAVIGATION, file)) { 123 if (server.hasAnalysisSubscription(protocol.AnalysisService.NAVIGATION, file)) {
124 sendAnalysisNotificationNavigation(server, file, dartUnit); 124 sendAnalysisNotificationNavigation(server, file, dartUnit);
125 } 125 }
126 if (server.hasAnalysisSubscription(protocol.AnalysisService.OCCURRENCES, file)) { 126 if (server.hasAnalysisSubscription(protocol.AnalysisService.OCCURRENCES, file)) {
127 sendAnalysisNotificationOccurrences(server, file, dartUnit); 127 sendAnalysisNotificationOccurrences(server, file, dartUnit);
128 } 128 }
129 if (server.hasAnalysisSubscription(protocol.AnalysisService.OUTLINE, fil e)) { 129 if (server.hasAnalysisSubscription(protocol.AnalysisService.OUTLINE, fil e)) {
130 sendAnalysisNotificationOutline(server, context, source, dartUnit); 130 LineInfo lineInfo = notice.lineInfo;
131 sendAnalysisNotificationOutline(server, source, lineInfo, dartUnit);
131 } 132 }
132 if (server.hasAnalysisSubscription(protocol.AnalysisService.OVERRIDES, f ile)) { 133 if (server.hasAnalysisSubscription(protocol.AnalysisService.OVERRIDES, f ile)) {
133 sendAnalysisNotificationOverrides(server, file, dartUnit); 134 sendAnalysisNotificationOverrides(server, file, dartUnit);
134 } 135 }
135 } 136 }
136 if (server.shouldSendErrorsNotificationFor(file)) { 137 if (server.shouldSendErrorsNotificationFor(file)) {
137 sendAnalysisNotificationErrors( 138 sendAnalysisNotificationErrors(
138 server, 139 server,
139 file, 140 file,
140 notice.lineInfo, 141 notice.lineInfo,
(...skipping 18 matching lines...) Expand all
159 // HTML 160 // HTML
160 { 161 {
161 HtmlUnit htmlUnit = notice.htmlUnit; 162 HtmlUnit htmlUnit = notice.htmlUnit;
162 if (htmlUnit != null) { 163 if (htmlUnit != null) {
163 index.indexHtmlUnit(context, htmlUnit); 164 index.indexHtmlUnit(context, htmlUnit);
164 } 165 }
165 } 166 }
166 } 167 }
167 } 168 }
168 } 169 }
OLDNEW
« no previous file with comments | « pkg/analysis_server/lib/src/computer/computer_outline.dart ('k') | pkg/analysis_server/pubspec.yaml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698