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

Unified Diff: pkg/analysis_server/lib/src/operation/operation_analysis.dart

Issue 842533004: Return outline after parse (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pkg/analysis_server/lib/src/domain_execution.dart ('k') | pkg/analyzer/lib/src/generated/engine.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 c789c219b5e7a29c78770b402fa7f8870e8096d2..c1a8436ea45bd7b80eb8c108e193e48c49941d9a 100644
--- a/pkg/analysis_server/lib/src/operation/operation_analysis.dart
+++ b/pkg/analysis_server/lib/src/operation/operation_analysis.dart
@@ -174,32 +174,35 @@ class PerformAnalysisOperation extends ServerOperation {
// Dart
CompilationUnit dartUnit = notice.compilationUnit;
if (dartUnit != null) {
- if (server.hasAnalysisSubscription(
- protocol.AnalysisService.HIGHLIGHTS,
- file)) {
- server.addOperation(new _DartHighlightsOperation(file, dartUnit));
- }
- if (server.hasAnalysisSubscription(
- protocol.AnalysisService.NAVIGATION,
- file)) {
- server.addOperation(new _DartNavigationOperation(file, dartUnit));
- }
- if (server.hasAnalysisSubscription(
- protocol.AnalysisService.OCCURRENCES,
- file)) {
- server.addOperation(new _DartOccurrencesOperation(file, dartUnit));
- }
- if (server.hasAnalysisSubscription(
- protocol.AnalysisService.OUTLINE,
- file)) {
- LineInfo lineInfo = notice.lineInfo;
- server.addOperation(
- new _DartOutlineOperation(file, lineInfo, dartUnit));
- }
- if (server.hasAnalysisSubscription(
- protocol.AnalysisService.OVERRIDES,
- file)) {
- server.addOperation(new _DartOverridesOperation(file, dartUnit));
+ if (notice.resolved) {
+ if (server.hasAnalysisSubscription(
+ protocol.AnalysisService.HIGHLIGHTS,
+ file)) {
+ server.addOperation(new _DartHighlightsOperation(file, dartUnit));
+ }
+ if (server.hasAnalysisSubscription(
+ protocol.AnalysisService.NAVIGATION,
+ file)) {
+ server.addOperation(new _DartNavigationOperation(file, dartUnit));
+ }
+ if (server.hasAnalysisSubscription(
+ protocol.AnalysisService.OCCURRENCES,
+ file)) {
+ server.addOperation(new _DartOccurrencesOperation(file, dartUnit));
+ }
+ if (server.hasAnalysisSubscription(
+ protocol.AnalysisService.OVERRIDES,
+ file)) {
+ server.addOperation(new _DartOverridesOperation(file, dartUnit));
+ }
+ } else {
+ if (server.hasAnalysisSubscription(
+ protocol.AnalysisService.OUTLINE,
+ file)) {
+ LineInfo lineInfo = notice.lineInfo;
+ server.addOperation(
+ new _DartOutlineOperation(file, lineInfo, dartUnit));
+ }
}
}
if (server.shouldSendErrorsNotificationFor(file)) {
@@ -224,22 +227,24 @@ class PerformAnalysisOperation extends ServerOperation {
}
for (ChangeNotice notice in notices) {
// Dart
- try {
- CompilationUnit dartUnit = notice.compilationUnit;
- if (dartUnit != null) {
- index.indexUnit(context, dartUnit);
+ if (notice.resolved) {
+ try {
+ CompilationUnit dartUnit = notice.compilationUnit;
+ if (dartUnit != null) {
+ index.indexUnit(context, dartUnit);
+ }
+ } catch (exception, stackTrace) {
+ server.sendServerErrorNotification(exception, stackTrace);
}
- } catch (exception, stackTrace) {
- server.sendServerErrorNotification(exception, stackTrace);
- }
- // HTML
- try {
- HtmlUnit htmlUnit = notice.htmlUnit;
- if (htmlUnit != null) {
- index.indexHtmlUnit(context, htmlUnit);
+ // HTML
+ try {
+ HtmlUnit htmlUnit = notice.htmlUnit;
+ if (htmlUnit != null) {
+ index.indexHtmlUnit(context, htmlUnit);
+ }
+ } catch (exception, stackTrace) {
+ server.sendServerErrorNotification(exception, stackTrace);
}
- } catch (exception, stackTrace) {
- server.sendServerErrorNotification(exception, stackTrace);
}
}
}
« no previous file with comments | « pkg/analysis_server/lib/src/domain_execution.dart ('k') | pkg/analyzer/lib/src/generated/engine.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698