Replace NameElement with IndexableName.

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/index_core.dart';
 import 'package:analysis_server/src/services/index/index.dart';
@@ skipping 66 matching lines @@
   /**
    * 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) {
-      return new IndexableElement(new NameElement(_stringCodec.decode(offset)));
+      String name = _stringCodec.decode(offset);
+      return new IndexableName(name);
     }
     return kind.decode(context, filePath, offset);
   }
 
   /**
-   * Returns the first component of the [element] id.
-   * In the most cases it is an encoding of the [element]'s file path.
-   * If the given [element] is not defined in a file, returns `-1`.
+   * 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 [element] id.
-   * In the most cases it is the [element]'s name offset.
+   * 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;
   }
 
   /**
-   * Returns the third component of the [element] id.
-   * In the most cases it is the [element]'s kind.
+   * 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 [element].
+   * 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;
@@ skipping 49 matching lines @@
   int encode(String name) {
     int index = nameToIndex[name];
     if (index == null) {
       index = _indexToName.length;
       nameToIndex[name] = index;
       _indexToName.add(name);
     }
     return index;
   }
 }