Improve used name relations and fields indexing.

pkg/analysis_server/lib/src/services/index2/index2.dart

 // Copyright (c) 2016, 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.
 
 import 'dart:async';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
 import 'package:analyzer/src/generated/source.dart';
@@ skipping 133 matching lines @@
    * The URI of the source of the library containing this location.
    */
   final String libraryUri;
 
   /**
    * The URI of the source of the unit containing this location.
    */
   final String unitUri;
 
   /**
+   * The kind of usage at this location.
+   */
+  final IndexRelationKind kind;
+
+  /**
    * The offset of this location within the [unitUri].
    */
   final int offset;
 
   /**
    * The length of this location.
    */
   final int length;
 
   /**
    * Is `true` if this location is qualified.
    */
   final bool isQualified;
 
-  Location(this.context, this.libraryUri, this.unitUri, this.offset,
-      this.length, this.isQualified);
+  /**
+   * Is `true` if this location is resolved.
+   */
+  final bool isResolved;
+
+  Location(this.context, this.libraryUri, this.unitUri, this.kind, this.offset,
+      this.length, this.isQualified, this.isResolved);
 
   @override
   String toString() => 'Location{librarySourceUri: $libraryUri, '
       'unitSourceUri: $unitUri, offset: $offset, length: $length, '
-      'isQualified: $isQualified}';
+      'isQualified: $isQualified}, isResolved: $isResolved}';
 }
 
 /**
  * Opaque identifier of a [PackageIndex].
  */
 abstract class PackageIndexId {}
 
 /**
  * Storage of [PackageIndex] objects.
  */
@@ skipping 268 matching lines @@
     List<Location> locations = <Location>[];
     String unitLibraryUri = null;
     String unitUnitUri = null;
     for (int i = 0; i < unitIndex.definedNames.length; i++) {
       if (unitIndex.definedNameKinds[i] == kind) {
         int nameIndex = unitIndex.definedNames[i];
         String name = packageRequester.index.strings[nameIndex];
         if (regExp.matchAsPrefix(name) != null) {
           unitLibraryUri ??= packageRequester.getUnitLibraryUri(unitIndex.unit);
           unitUnitUri ??= packageRequester.getUnitUnitUri(unitIndex.unit);
-          locations.add(new Location(context, unitLibraryUri, unitUnitUri,
-              unitIndex.definedNameOffsets[i], name.length, false));
+          locations.add(new Location(context, unitLibraryUri, unitUnitUri, null,
+              unitIndex.definedNameOffsets[i], name.length, false, true));
         }
       }
     }
     return locations;
   }
 
   /**
    * Return a list of locations where an element with the given [elementId] has
    * relation of the given [kind].
    */
@@ skipping 12 matching lines @@
         i < unitIndex.usedElements.length &&
             unitIndex.usedElements[i] == elementId;
         i++) {
       if (unitIndex.usedElementKinds[i] == kind) {
         unitLibraryUri ??= packageRequester.getUnitLibraryUri(unitIndex.unit);
         unitUnitUri ??= packageRequester.getUnitUnitUri(unitIndex.unit);
         locations.add(new Location(
             context,
             unitLibraryUri,
             unitUnitUri,
+            kind,
             unitIndex.usedElementOffsets[i],
             unitIndex.usedElementLengths[i],
-            unitIndex.usedElementIsQualifiedFlags[i]));
+            unitIndex.usedElementIsQualifiedFlags[i],
+            true));
       }
     }
     return locations;
   }
 
   /**
    * Complete with a list of locations where a class members with the given
    * [name] is referenced with a qualifier, but is not resolved.
    */
   List<Location> getUnresolvedMemberReferences(
@@ skipping 10 matching lines @@
     }
     // Create locations for every usage of the name.
     List<Location> locations = <Location>[];
     String unitLibraryUri = null;
     String unitUnitUri = null;
     for (;
         i < unitIndex.usedNames.length && unitIndex.usedNames[i] == nameId;
         i++) {
       unitLibraryUri ??= packageRequester.getUnitLibraryUri(unitIndex.unit);
       unitUnitUri ??= packageRequester.getUnitUnitUri(unitIndex.unit);
-      locations.add(new Location(context, unitLibraryUri, unitUnitUri,
-          unitIndex.usedNameOffsets[i], name.length, true));
+      locations.add(new Location(
+          context,
+          unitLibraryUri,
+          unitUnitUri,
+          unitIndex.usedNameKinds[i],
+          unitIndex.usedNameOffsets[i],
+          name.length,
+          true,
+          false));
     }
     return locations;
   }
 }