Add OCCURRENCES_CONTRIBUTOR_EXTENSION_POINT_ID.

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_highlights2.dart';
-import 'package:analysis_server/src/computer/computer_occurrences.dart';
 import 'package:analysis_server/src/computer/computer_outline.dart';
 import 'package:analysis_server/src/computer/computer_overrides.dart';
 import 'package:analysis_server/src/domains/analysis/navigation.dart';
+import 'package:analysis_server/src/domains/analysis/occurrences.dart';
 import 'package:analysis_server/src/operation/operation.dart';
 import 'package:analysis_server/src/protocol_server.dart' as protocol;
 import 'package:analysis_server/src/services/dependencies/library_dependencies.dart';
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
 import 'package:analyzer/src/generated/html.dart';
 import 'package:analyzer/src/generated/source.dart';
 
@@ skipping 51 matching lines @@
       server.scheduleOperation(
           new _DartHighlightsOperation(context, file, resolvedDartUnit));
     }
     if (server.hasAnalysisSubscription(
         protocol.AnalysisService.NAVIGATION, file)) {
       Source source = resolvedDartUnit.element.source;
       server.scheduleOperation(new NavigationOperation(context, source));
     }
     if (server.hasAnalysisSubscription(
         protocol.AnalysisService.OCCURRENCES, file)) {
-      server.scheduleOperation(
-          new _DartOccurrencesOperation(context, file, resolvedDartUnit));
+      Source source = resolvedDartUnit.element.source;
+      server.scheduleOperation(new OccurrencesOperation(context, source));
     }
     if (server.hasAnalysisSubscription(
         protocol.AnalysisService.OVERRIDES, file)) {
       server.scheduleOperation(
           new _DartOverridesOperation(context, file, resolvedDartUnit));
     }
   }
   if (dartUnit != null) {
     if (server.hasAnalysisSubscription(
         protocol.AnalysisService.OUTLINE, file)) {
@@ skipping 75 matching lines @@
     NavigationCollectorImpl collector =
         computeNavigation(server, context, source, null, null);
     String file = source.fullName;
     var params = new protocol.AnalysisNavigationParams(
         file, collector.regions, collector.targets, collector.files);
     server.sendNotification(params.toNotification());
   });
 }
 
 void sendAnalysisNotificationOccurrences(
-    AnalysisServer server, String file, CompilationUnit dartUnit) {
+    AnalysisServer server, AnalysisContext context, Source source) {
   _sendNotification(server, () {
-    var occurrences = new DartUnitOccurrencesComputer(dartUnit).compute();
-    var params = new protocol.AnalysisOccurrencesParams(file, occurrences);
+    OccurrencesCollectorImpl collector =
+        computeOccurrences(server, context, source);
+    String file = source.fullName;
+    var params =
+        new protocol.AnalysisOccurrencesParams(file, collector.allOccurrences);
     server.sendNotification(params.toNotification());
   });
 }
 
 void sendAnalysisNotificationOutline(AnalysisServer server, String file,
     LineInfo lineInfo, CompilationUnit dartUnit) {
   _sendNotification(server, () {
     var computer = new DartUnitOutlineComputer(file, lineInfo, dartUnit);
     var outline = computer.compute();
     var params = new protocol.AnalysisOutlineParams(file, outline);
@@ skipping 32 matching lines @@
     }
   });
 }
 
 class NavigationOperation extends _NotificationOperation
     implements MergeableOperation {
   NavigationOperation(AnalysisContext context, Source source)
       : super(context, source);
 
   @override
-  void perform(AnalysisServer server) {
-    sendAnalysisNotificationNavigation(server, context, source);
-  }
-
-  @override
   bool merge(ServerOperation other) {
     return other is NavigationOperation &&
         other.context == context &&
         other.source == source;
   }
+
+  @override
+  void perform(AnalysisServer server) {
+    sendAnalysisNotificationNavigation(server, context, source);
+  }
+}
+
+class OccurrencesOperation extends _NotificationOperation
+    implements MergeableOperation {
+  OccurrencesOperation(AnalysisContext context, Source source)
+      : super(context, source);
+
+  @override
+  bool merge(ServerOperation other) {
+    return other is OccurrencesOperation &&
+        other.context == context &&
+        other.source == source;
+  }
+
+  @override
+  void perform(AnalysisServer server) {
+    sendAnalysisNotificationOccurrences(server, context, source);
+  }
 }
 
 /**
  * Instances of [PerformAnalysisOperation] perform a single analysis task.
  */
 class PerformAnalysisOperation extends ServerOperation {
   static const int IDLE_CACHE_SIZE = AnalysisOptionsImpl.DEFAULT_CACHE_SIZE;
   static const int WORKING_CACHE_SIZE = 512;
 
   final bool isContinue;
@@ skipping 145 matching lines @@
 
   _DartNotificationOperation(AnalysisContext context, String file, this.unit)
       : super(context, file);
 
   @override
   ServerOperationPriority get priority {
     return ServerOperationPriority.ANALYSIS_NOTIFICATION;
   }
 }
 
-class _DartOccurrencesOperation extends _DartNotificationOperation {
-  _DartOccurrencesOperation(
-      AnalysisContext context, String file, CompilationUnit unit)
-      : super(context, file, unit);
-
-  @override
-  void perform(AnalysisServer server) {
-    sendAnalysisNotificationOccurrences(server, file, unit);
-  }
-}
-
 class _DartOutlineOperation extends _DartNotificationOperation {
   final LineInfo lineInfo;
 
   _DartOutlineOperation(
       AnalysisContext context, String file, this.lineInfo, CompilationUnit unit)
       : super(context, file, unit);
 
   @override
   void perform(AnalysisServer server) {
     sendAnalysisNotificationOutline(server, file, lineInfo, unit);
@@ skipping 67 matching lines @@
 abstract class _SingleFileOperation extends SourceSensitiveOperation {
   final String file;
 
   _SingleFileOperation(AnalysisContext context, this.file) : super(context);
 
   @override
   bool shouldBeDiscardedOnSourceChange(Source source) {
     return source.fullName == file;
   }
 }