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

pkg/analysis_server/lib/src/services/index/store/codec.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 services.src.index.store.codec;
 
 import 'dart:collection';
 
 import 'package:analysis_server/analysis/index_core.dart';
 import 'package:analysis_server/src/services/index/index.dart';
-import 'package:analysis_server/src/services/index/indexable_element.dart';
-import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/source.dart';
-import 'package:analyzer/src/generated/utilities_general.dart';
 
 /**
  * A helper that encodes/decodes [AnalysisContext]s from/to integers.
  */
 class ContextCodec {
   /**
    * A table mapping contexts to their unique indices.
    */
   Map<AnalysisContext, int> _contextToIndex =
       new HashMap<AnalysisContext, int>();
@@ skipping 46 matching lines @@
   // objects rather than elements.
   final StringCodec _stringCodec;
 
   ElementCodec(this._stringCodec);
 
   /**
    * Returns an [IndexableObject] that corresponds to the given identifiers.
    */
   IndexableObject decode(
       AnalysisContext context, int fileId, int offset, int kindId) {
-    String filePath = _stringCodec.decode(fileId);
     IndexableObjectKind kind = IndexableObjectKind.getKind(kindId);
     if (kind == null) {
       return null;
     } else if (kind is IndexableNameKind) {
       String name = _stringCodec.decode(offset);
       return new IndexableName(name);
     }
+    String filePath = _stringCodec.decode(fileId);
     return kind.decode(context, filePath, offset);
   }
 
   /**
    * Returns the first component of the [indexable] id.
    * In the most cases it is an encoding of the [indexable]'s file path.
    * If the given [indexable] is not defined in a file, returns `-1`.
    */
   int encode1(IndexableObject indexable) {
     Source source = indexable.source;
     if (source == null) {
       return -1;
     }
     String filePath = source.fullName;
     return _stringCodec.encode(filePath);
   }
 
   /**
    * Returns the second component of the [indexable] id.
    * In the most cases it is the [indexable]'s name offset.
    */
   int encode2(IndexableObject indexable) {
     if (indexable is IndexableName) {
       String name = indexable.name;
       return _stringCodec.encode(name);
     }
-    int offset = indexable.offset;
-    if (offset < 0) {
-      return _stringCodec.encode(indexable.name);
-    }
-    return offset;
+    return indexable.offset;
   }
 
   /**
    * Returns the third component of the [indexable] id.
    * In the most cases it is the [indexable]'s kind.
    */
   int encode3(IndexableObject indexable) {
     return indexable.kind.index;
   }
 
   /**
    * Returns an integer that corresponds to the name of [indexable].
    */
   int encodeHash(IndexableObject indexable) {
-    // TODO(brianwilkerson) Consider moving this to IndexableObjectKind so that
-    // we don't have to break encapsulation.
-    String elementName = indexable.name; // was: indexable.displayName;
-    int elementNameId = _stringCodec.encode(elementName);
-    if (indexable is IndexableElement) {
-      LibraryElement libraryElement = indexable.element.library;
-      if (libraryElement != null) {
-        String libraryPath = libraryElement.source.fullName;
-        int libraryPathId = _stringCodec.encode(libraryPath);
-        return JenkinsSmiHash.combine(libraryPathId, elementNameId);
-      }
-    }
-    return elementNameId;
+    return indexable.kind.encodeHash(_stringCodec.encode, indexable);
   }
 }
 
 /**
  * A helper that encodes/decodes [Relationship]s to/from integers.
  */
 class RelationshipCodec {
   final StringCodec _stringCodec;
 
   RelationshipCodec(this._stringCodec);
@@ skipping 34 matching lines @@
   int encode(String name) {
     int index = nameToIndex[name];
     if (index == null) {
       index = _indexToName.length;
       nameToIndex[name] = index;
       _indexToName.add(name);
     }
     return index;
   }
 }