Issue 22155. Send outline for both parsed and resolved Dart units.

pkg/analysis_server/lib/src/operation/operation_analysis.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 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_navigation.dart';
 import 'package:analysis_server/src/computer/computer_occurrences.dart';
@@ skipping 156 matching lines @@
 
   /**
    * Send the information in the given list of notices back to the client.
    */
   void _sendNotices(AnalysisServer server, List<ChangeNotice> notices) {
     for (int i = 0; i < notices.length; i++) {
       ChangeNotice notice = notices[i];
       Source source = notice.source;
       String file = source.fullName;
       // Dart
-      CompilationUnit dartUnit = notice.compilationUnit;
-      if (dartUnit != null) {
-        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));
-          }
+      CompilationUnit parsedDartUnit = notice.parsedDartUnit;
+      CompilationUnit resolvedDartUnit = notice.compilationUnit;
+      CompilationUnit dartUnit =
+          resolvedDartUnit != null ? resolvedDartUnit : parsedDartUnit;
+      if (resolvedDartUnit != null) {
+        if (server.hasAnalysisSubscription(
+            protocol.AnalysisService.HIGHLIGHTS,
+            file)) {
+          server.addOperation(
+              new _DartHighlightsOperation(file, resolvedDartUnit));
+        }
+        if (server.hasAnalysisSubscription(
+            protocol.AnalysisService.NAVIGATION,
+            file)) {
+          server.addOperation(
+              new _DartNavigationOperation(file, resolvedDartUnit));
+        }
+        if (server.hasAnalysisSubscription(
+            protocol.AnalysisService.OCCURRENCES,
+            file)) {
+          server.addOperation(
+              new _DartOccurrencesOperation(file, resolvedDartUnit));
+        }
+        if (server.hasAnalysisSubscription(
+            protocol.AnalysisService.OVERRIDES,
+            file)) {
+          server.addOperation(
+              new _DartOverridesOperation(file, resolvedDartUnit));
         }
       }
+      if (dartUnit != null) {
+        if (server.hasAnalysisSubscription(
+            protocol.AnalysisService.OUTLINE,
+            file)) {
+          LineInfo lineInfo = notice.lineInfo;
+          server.addOperation(
+              new _DartOutlineOperation(file, lineInfo, dartUnit));
+        }
+      }
+      // errors
       if (server.shouldSendErrorsNotificationFor(file)) {
         server.addOperation(
             new _NotificationErrorsOperation(file, notice.lineInfo, notice.errors));
       }
+      // done
       server.fileAnalyzed(notice);
     }
   }
 
   void _setCacheSize(int cacheSize) {
     AnalysisOptionsImpl options =
         new AnalysisOptionsImpl.con1(context.analysisOptions);
     options.cacheSize = cacheSize;
     context.analysisOptions = options;
   }
 
   void _updateIndex(AnalysisServer server, List<ChangeNotice> notices) {
     Index index = server.index;
     if (index == null) {
       return;
     }
     for (ChangeNotice notice in notices) {
       // Dart
-      if (notice.resolved) {
-        try {
-          CompilationUnit dartUnit = notice.compilationUnit;
-          if (dartUnit != null) {
-            server.addOperation(new _DartIndexOperation(context, dartUnit));
-          }
-        } catch (exception, stackTrace) {
-          server.sendServerErrorNotification(exception, stackTrace);
+      try {
+        CompilationUnit dartUnit = notice.compilationUnit;
+        if (dartUnit != null) {
+          server.addOperation(new _DartIndexOperation(context, dartUnit));
         }
-        // HTML
-        try {
-          HtmlUnit htmlUnit = notice.htmlUnit;
-          if (htmlUnit != null) {
-            server.addOperation(new _HtmlIndexOperation(context, htmlUnit));
-          }
-        } catch (exception, stackTrace) {
-          server.sendServerErrorNotification(exception, stackTrace);
+      } catch (exception, stackTrace) {
+        server.sendServerErrorNotification(exception, stackTrace);
+      }
+      // HTML
+      try {
+        HtmlUnit htmlUnit = notice.htmlUnit;
+        if (htmlUnit != null) {
+          server.addOperation(new _HtmlIndexOperation(context, htmlUnit));
         }
+      } catch (exception, stackTrace) {
+        server.sendServerErrorNotification(exception, stackTrace);
       }
     }
   }
 }
 
 
 class _DartHighlightsOperation extends _DartNotificationOperation {
   _DartHighlightsOperation(String file, CompilationUnit unit)
       : super(file, unit);
 
@@ skipping 111 matching lines @@
   @override
   ServerOperationPriority get priority {
     return ServerOperationPriority.ANALYSIS_NOTIFICATION;
   }
 
   @override
   void perform(AnalysisServer server) {
     sendAnalysisNotificationErrors(server, file, lineInfo, errors);
   }
 }