Make more use of generated code in analysis server.

pkg/analysis_server/lib/src/computer/computer_navigation.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 computer.navigation;
 
+import 'package:analysis_server/src/protocol2.dart' as protocol;
 import 'package:analysis_server/src/constants.dart';
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/scanner.dart';
 
-import 'element.dart' as computer;
-
 
 /**
  * A computer for navigation regions in a Dart [CompilationUnit].
  */
 class DartUnitNavigationComputer {
   final CompilationUnit _unit;
 
   final List<Map<String, Object>> _regions = <Map<String, Object>>[];
 
   DartUnitNavigationComputer(this._unit);
 
   /**
    * Returns the computed navigation regions, not `null`.
    */
   List<Map<String, Object>> compute() {
     _unit.accept(new _DartUnitNavigationComputerVisitor(this));
     return new List.from(_regions);
   }
 
   void _addRegion(int offset, int length, Element element) {
     if (element == null || element == DynamicElementImpl.instance) {
       return;
     }
     if (element is FieldFormalParameterElement) {
       element = (element as FieldFormalParameterElement).field;
     }
-    var elementJson = new computer.Element.fromEngine(element).toJson();
+    var elementJson = new protocol.Element.fromEngine(element).toJson();
     _regions.add({
       OFFSET: offset,
       LENGTH: length,
       TARGETS: [elementJson]
     });
   }
 
   void _addRegionForNode(AstNode node, Element element) {
     int offset = node.offset;
     int length = node.length;
@@ skipping 130 matching lines @@
 
   @override
   visitSimpleIdentifier(SimpleIdentifier node) {
     if (node.parent is ConstructorDeclaration) {
     } else {
       computer._addRegionForNode(node, node.bestElement);
     }
     return super.visitSimpleIdentifier(node);
   }
 }