Remove the 'name' and 'length' getters from IndexableObject.

pkg/analysis_server/lib/analysis/index_core.dart

 // Copyright (c) 2015, 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 analysis_server.analysis.index.index_core;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
 
 /**
+ * Return the integer value that corresponds to the given [str].
+ */
+typedef int StringToInt(String str);
+
+/**
  * An object that can have a [Relationship] with various [Location]s in a code
  * base. The object is abstractly represented by a [kind] and an [offset] within
  * a [source].
  *
  * Clients must ensure that two distinct objects in the same source cannot have
  * the same kind and offset. Failure to do so will make it impossible for
  * clients to identify the model element corresponding to the indexable object.
  *
  * Clients are expected to subtype this class when implementing plugins.
  */
 abstract class IndexableObject {
   /**
    * Return the kind of this object.
    */
   IndexableObjectKind get kind;
 
   /**
-   * Return the length of the indexable object within its source.
-   */
-  int get length;
-
-  /**
-   * Return the name of this element.
-   */
-  // TODO(brianwilkerson) Remove the need for this getter.
-  String get name;
-
-  /**
    * Return the offset of the indexable object within its source.
    */
   int get offset;
 
   /**
    * Return the source containing the indexable object.
    */
   Source get source;
 }
 
@@ skipping 28 matching lines @@
   int get index;
 
   /**
    * Return the indexable object of this kind that exists in the given
    * [context], in the source with the given [filePath], and at the given
    * [offset].
    */
   IndexableObject decode(AnalysisContext context, String filePath, int offset);
 
   /**
+   * Returns an integer that corresponds to the name of [indexable].

[Brian Wilkerson, 2015/10/05 14:01:02]

This needs to be more complete. What should it return in the indexable object
doesn't have a name? Why does IndexableElementKind combine the integer
corresponding to the name and the integer corresponding to the library's file
path? (The requirement that causes us to do that needs to be explicit in the
comment so that plugin authors know what they need to do.)

[scheglov, 2015/10/05 14:28:16]

Done.

+   */
+  int encodeHash(StringToInt stringToInt, IndexableObject indexable);
+
+  /**
    * Return the object kind with the given [index].
    */
   static IndexableObjectKind getKind(int index) {
     return _registry[index];
   }
 
   /**
    * Register the given object [kind] so that it can be found by it's unique
    * index. The index of the [kind] must not be changed after it is passed to
    * this method.
    */
   static void register(IndexableObjectKind kind) {
     int index = kind.index;
     if (_registry.containsKey(index)) {
       throw new ArgumentError('duplicate index for kind: $index');
     }
     _registry[index] = kind;
   }
 }
 
-/**
- * An object used to add relationships to the index.
- *
- * Clients are expected to subtype this class when implementing plugins.
- */
-abstract class IndexContributor {
-  /**
-   * Contribute relationships existing in the given [object] to the given
-   * index [store] in the given [context].
-   */
-  void contributeTo(IndexStore store, AnalysisContext context, Object object);
-}
-
 // A sketch of what the driver routine might look like:
 //
 //void buildIndexForSource(AnalysisContext context, Source source) {
 //  IndexStoreImpl store;
 //  store.aboutToIndex(context, source);
 //  try {
 //    for (IndexContributor contributor in contributors) {
 //      contributor.contributeTo(store, context, source);
 //    }
 //  } finally {
 //    store.doneIndexing();
 //  }
 //}
 
 /**
+ * An object used to add relationships to the index.
+ *
+ * Clients are expected to subtype this class when implementing plugins.
+ */
+abstract class IndexContributor {
+  /**
+   * Contribute relationships existing in the given [object] to the given
+   * index [store] in the given [context].
+   */
+  void contributeTo(IndexStore store, AnalysisContext context, Object object);
+}
+
+/**
  * An object that stores information about the relationships between locations
  * in a code base.
  *
  * Clients are not expected to subtype this class.
  */
 abstract class IndexStore {
   /**
    * Remove all of the information from the index.
    */
   void clear();
@@ skipping 116 matching lines @@
  */
 abstract class Relationship {
   /**
    * Return a relationship that has the given [identifier]. If the relationship
    * has already been created, then it will be returned, otherwise a new
    * relationship will be created
    */
   factory Relationship(String identifier) =>
       RelationshipImpl.getRelationship(identifier);
 }