Update Element/navigation/outline to use Location.

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 'dart:collection';
-
 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 'package:analyzer/src/generated/source.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 = <HashMap<String, Object>>[];
+  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) {
-    Map<String, Object> target = _createTarget(element);
-    if (target == null) {
+    if (element == null) {
       return;
     }
+    if (element is FieldFormalParameterElement) {
+      element = (element as FieldFormalParameterElement).field;
+    }
+    var elementJson = new computer.Element.fromEngine(element).toJson();
     _regions.add({
       OFFSET: offset,
       LENGTH: length,
-      TARGETS: [target]
+      TARGETS: [elementJson]
     });
   }
 
   void _addRegionForNode(AstNode node, Element element) {
     int offset = node.offset;
     int length = node.length;
     _addRegion(offset, length, element);
   }
 
   void _addRegionForToken(Token token, Element element) {
@@ skipping 12 matching lines @@
     int offset = a.offset;
     int length = b.offset - offset;
     _addRegion(offset, length, element);
   }
 
   void _addRegion_tokenStart_nodeEnd(Token a, AstNode b, Element element) {
     int offset = a.offset;
     int length = b.end - offset;
     _addRegion(offset, length, element);
   }
-
-  /**
-   * Returns the JSON for the given [Element], maybe `null` if `null` was given.
-   */
-  Map<String, Object> _createTarget(Element element) {
-    if (element == null) {
-      return null;
-    }
-    if (element is FieldFormalParameterElement) {
-      element = (element as FieldFormalParameterElement).field;
-    }
-    // prepare Source
-    Source source = element.source;
-    if (source == null) {
-      return null;
-    }
-    // prepare location
-    int offset = element.nameOffset;
-    int length = element.displayName.length;
-    if (element is CompilationUnitElement) {
-      offset = 0;
-      length = 0;
-    }
-    // return as JSON
-    return {
-      FILE: source.fullName,
-      OFFSET: offset,
-      LENGTH: length,
-      ELEMENT: new computer.Element.fromEngine(element).toJson()
-    };
-  }
 }
 
 
 
 class _DartUnitNavigationComputerVisitor extends RecursiveAstVisitor {
   final DartUnitNavigationComputer computer;
 
   _DartUnitNavigationComputerVisitor(this.computer);
 
   @override
@@ skipping 89 matching lines @@
 
   @override
   visitSimpleIdentifier(SimpleIdentifier node) {
     if (node.parent is ConstructorDeclaration) {
     } else {
       computer._addRegionForNode(node, node.bestElement);
     }
     return super.visitSimpleIdentifier(node);
   }
 }