Navigation extension point.

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_navigation.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/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 22 matching lines @@
     AnalysisContext context, CompilationUnit dartUnit) {
   if (server.index != null) {
     server.addOperation(new _DartIndexOperation(context, file, dartUnit));
   }
 }
 
 /**
  * Schedules sending notifications for the given [file] using the resolved
  * [resolvedDartUnit].
  */
-void scheduleNotificationOperations(AnalysisServer server, String file,
-    LineInfo lineInfo, AnalysisContext context, CompilationUnit parsedDartUnit,
-    CompilationUnit resolvedDartUnit, List<AnalysisError> errors) {
+void scheduleNotificationOperations(
+    AnalysisServer server,
+    String file,
+    LineInfo lineInfo,
+    AnalysisContext context,
+    CompilationUnit parsedDartUnit,
+    CompilationUnit resolvedDartUnit,
+    List<AnalysisError> errors) {
   // If the file belongs to any analysis root, check whether we're in it now.
   AnalysisContext containingContext = server.getContainingContext(file);
   if (containingContext != null && context != containingContext) {
     return;
   }
   // Dart
   CompilationUnit dartUnit =
       resolvedDartUnit != null ? resolvedDartUnit : parsedDartUnit;
   if (resolvedDartUnit != null) {
     if (server.hasAnalysisSubscription(
@@ skipping 86 matching lines @@
       regions = new DartUnitHighlightsComputer2(dartUnit).compute();
     } else {
       regions = new DartUnitHighlightsComputer(dartUnit).compute();
     }
     var params = new protocol.AnalysisHighlightsParams(file, regions);
     server.sendNotification(params.toNotification());
   });
 }
 
 void sendAnalysisNotificationNavigation(
-    AnalysisServer server, String file, CompilationUnit dartUnit) {
+    AnalysisServer server, AnalysisContext context, Source source) {
   _sendNotification(server, () {
-    var computer = new DartUnitNavigationComputer();
-    computer.compute(dartUnit);
+    NavigationHolderImpl holder =
+        computeNavigation(server, context, source, null, null);
+    String file = source.fullName;
     var params = new protocol.AnalysisNavigationParams(
-        file, computer.regions, computer.targets, computer.files);
+        file, holder.regions, holder.targets, holder.files);
     server.sendNotification(params.toNotification());
   });
 }
 
 void sendAnalysisNotificationOccurrences(
     AnalysisServer server, String file, CompilationUnit dartUnit) {
   _sendNotification(server, () {
     var occurrences = new DartUnitOccurrencesComputer(dartUnit).compute();
     var params = new protocol.AnalysisOccurrencesParams(file, occurrences);
     server.sendNotification(params.toNotification());
@@ skipping 193 matching lines @@
   }
 }
 
 class _DartNavigationOperation extends _DartNotificationOperation {
   _DartNavigationOperation(
       AnalysisContext context, String file, CompilationUnit unit)
       : super(context, file, unit);
 
   @override
   void perform(AnalysisServer server) {
-    sendAnalysisNotificationNavigation(server, file, unit);
+    Source source = unit.element.source;
+    sendAnalysisNotificationNavigation(server, context, source);
   }
 }
 
 abstract class _DartNotificationOperation extends _SingleFileOperation {
   final CompilationUnit unit;
 
   _DartNotificationOperation(AnalysisContext context, String file, this.unit)
       : super(context, file);
 
   @override
@@ skipping 77 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;
   }
 }