Fix for subscribing for notifications after analysis.

pkg/analysis_server/lib/src/analysis_server.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 analysis.server;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analysis_server/src/analysis_logger.dart';
@@ skipping 380 matching lines @@
     subscriptions.forEach((service, Set<String> newFiles) {
       Set<String> oldFiles = analysisServices[service];
       Set<String> todoFiles = oldFiles != null ? newFiles.difference(oldFiles) : newFiles;
       for (String file in todoFiles) {
         if (service == AnalysisService.ERRORS) {
           Source source = _getSource(file);
           AnalysisContext analysisContext = _getAnalysisContext(file);
           List<AnalysisError> errors = analysisContext.getErrors(source).errors;
           sendAnalysisNotificationErrors(this, file, errors);
         }
-        // TODO(scheglov)
-        // 1. implement resolveCompilationUnit()
-        // 2. Share "if (dartUnit != null)"
-        if (service == AnalysisService.HIGHLIGHTS) {
-          CompilationUnit dartUnit = test_getResolvedCompilationUnit(file);
+        // Dart unit notifications.
+        if (AnalysisEngine.isDartFileName(file)) {
+          CompilationUnit dartUnit = resolveCompilationUnit(file);

[Brian Wilkerson, 2014/06/18 16:25:11]

I think we need to only get the compilation unit if it has already been
resolved. Otherwise we're potentially doing a lot of analysis in response to a
request. And if it hasn't already been resolved then we'll send the
notifications after analysis is performed.

[scheglov, 2014/06/18 17:38:27]

Agree.
Done.

           if (dartUnit != null) {
-            sendAnalysisNotificationHighlights(this, file, dartUnit);
-          }
-        }
-        if (service == AnalysisService.NAVIGATION) {
-          CompilationUnit dartUnit = test_getResolvedCompilationUnit(file);
-          if (dartUnit != null) {
-            sendAnalysisNotificationNavigation(this, file, dartUnit);
-          }
-        }
-        if (service == AnalysisService.OUTLINE) {
-          CompilationUnit dartUnit = test_getResolvedCompilationUnit(file);
-          if (dartUnit != null) {
-            sendAnalysisNotificationOutline(this, file, dartUnit);
+            switch (service) {
+              case AnalysisService.HIGHLIGHTS:
+                sendAnalysisNotificationHighlights(this, file, dartUnit);
+                break;
+              case AnalysisService.NAVIGATION:
+                sendAnalysisNotificationNavigation(this, file, dartUnit);
+                break;
+              case AnalysisService.OUTLINE:
+                sendAnalysisNotificationOutline(this, file, dartUnit);
+                break;
+            }
           }
         }
       }
     });
     // remember new subscriptions
     this.analysisServices = subscriptions;
   }
 
   /**
    * Return the [AnalysisContext] that is used to analyze the given [path].
@@ skipping 13 matching lines @@
    */
   Source _getSource(String path) {
     File file = contextDirectoryManager.resourceProvider.getResource(path);
     return file.createSource(UriKind.FILE_URI);
   }
 
   /**
    * Return the [CompilationUnit] of the Dart file with the given [path].
    * Return `null` if the file is not a part of any context.
    */
+  CompilationUnit resolveCompilationUnit(String path) {
+    // prepare AnalysisContext
+    AnalysisContext context = _getAnalysisContext(path);
+    if (context == null) {
+      return null;
+    }
+    // prepare sources
+    Source unitSource = _getSource(path);
+    List<Source> librarySources = context.getLibrariesContaining(unitSource);
+    if (librarySources.isEmpty) {
+      return null;
+    }
+    // resolve the unit
+    return context.resolveCompilationUnit2(unitSource, librarySources[0]);

[Brian Wilkerson, 2014/06/18 16:25:11]

We need to handle the case where a file is in more than one library, both here
and when analysis has completed. (A TODO comment would be fine for now.)

[scheglov, 2014/06/18 17:38:27]

AFAIK multiple libraries matter only for navigation.

+  }
+
+  /**
+   * Return the [CompilationUnit] of the Dart file with the given [path].
+   * Return `null` if the file is not a part of any context.
+   */
   CompilationUnit test_getResolvedCompilationUnit(String path) {
     // prepare AnalysisContext
     AnalysisContext context = _getAnalysisContext(path);
     if (context == null) {
       return null;
     }
     // prepare sources
     Source unitSource = _getSource(path);
     List<Source> librarySources = context.getLibrariesContaining(unitSource);
     if (librarySources.isEmpty) {
@@ skipping 115 matching lines @@
 /**
  * An enumeration of the services provided by the server domain.
  */
 class ServerService extends Enum2<ServerService> {
   static const ServerService STATUS = const ServerService('STATUS', 0);
 
   static const List<ServerService> VALUES = const [STATUS];
 
   const ServerService(String name, int ordinal) : super(name, ordinal);
 }