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

pkg/analysis_server/lib/src/services/index/indexable_element.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 src.services.index;
 
 import 'dart:collection';
 
 import 'package:analysis_server/analysis/index_core.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 wrapper around an [Element] that implements the [IndexableObject] interface.
  */
 class IndexableElement implements IndexableObject {
   /**
    * The element being wrapped.
    */
   final Element element;
 
   /**
    * Initialize a newly created wrapper to wrap the given [element].
    */
   IndexableElement(this.element) {
     if (element == null) {
       throw new ArgumentError.notNull('element');
     }
   }
 
   @override
   int get hashCode => element.hashCode;
 
   @override
   IndexableObjectKind get kind => IndexableElementKind.forElement(element);
 
   @override
-  int get length => element.nameLength;
-
-  @override
-  String get name => element.displayName;
-
-  @override
   int get offset {
     if (element is ConstructorElement) {
       return element.enclosingElement.nameOffset;
     }
     return element.nameOffset;
   }
 
   @override
   Source get source => element.source;
 
   @override
   bool operator ==(Object object) =>
       object is IndexableElement && element == object.element;
 
   @override
   String toString() => element.toString();
 }
 
 /**
  * The kind associated with an [IndexableElement].
  */
 class IndexableElementKind implements IndexableObjectKind {
   /**
    * A table mapping element kinds to the corresponding indexable element kind.
    */
-  static Map<ElementKind, IndexableElementKind> _kindMap =
+  static final Map<ElementKind, IndexableElementKind> _kindMap =
       new HashMap<ElementKind, IndexableElementKind>();
 
   /**
    * A table mapping the index of a constructor (in the lexically-ordered list
    * of constructors associated with a class) to the indexable element kind used
    * to represent it.
    */
-  static Map<int, IndexableElementKind> _constructorKinds =
+  static final Map<int, IndexableElementKind> _constructorKinds =
       new HashMap<int, IndexableElementKind>();
 
   @override
   final int index = IndexableObjectKind.nextIndex;
 
   /**
    * The element kind represented by this index element kind.
    */
   final ElementKind elementKind;
 
@@ skipping 49 matching lines @@
               return new IndexableElement(element.setter);
             }
           }
           return new IndexableElement(element);
         }
       }
     }
     return null;
   }
 
+  @override
+  int encodeHash(StringToInt stringToInt, IndexableObject indexable) {
+    Element element = (indexable as IndexableElement).element;
+    String elementName = element.displayName;
+    int elementNameId = stringToInt(elementName);
+    if (indexable is IndexableElement) {
+      LibraryElement libraryElement = indexable.element.library;
+      if (libraryElement != null) {
+        String libraryPath = libraryElement.source.fullName;
+        int libraryPathId = stringToInt(libraryPath);
+        return JenkinsSmiHash.combine(libraryPathId, elementNameId);
+      }
+    }
+    return elementNameId;
+  }
+
   /**
    * Return the indexable element kind representing the given [element].
    */
   static IndexableElementKind forElement(Element element) {
     if (element is ConstructorElement) {
       ClassElement classElement = element.enclosingElement;
       int constructorIndex = classElement.constructors.indexOf(element);
       return _constructorKinds.putIfAbsent(constructorIndex,
           () => new IndexableElementKind._(ElementKind.CONSTRUCTOR));
     }
     ElementKind elementKind = element.kind;
     return _kindMap.putIfAbsent(
         elementKind, () => new IndexableElementKind._(elementKind));
   }
 }