Index defined top-level and class member names.

pkg/analyzer/lib/src/summary/index_unit.dart

Index: pkg/analyzer/lib/src/summary/index_unit.dart
diff --git a/pkg/analyzer/lib/src/summary/index_unit.dart b/pkg/analyzer/lib/src/summary/index_unit.dart
index b5de76652169b0c1a1aff2a473713c47fec80c00..c2c298e513ce0a40ce20dca4b8a390eb420ef460 100644
--- a/pkg/analyzer/lib/src/summary/index_unit.dart
+++ b/pkg/analyzer/lib/src/summary/index_unit.dart
@@ -31,26 +31,26 @@ class PackageIndexAssembler {
 
   /**
    * Each item of this list corresponds to the library URI of a unique
-   * [CompilationUnitElement].  It is an index into [_uris].
+   * [CompilationUnitElement].  It is an index into [_strings].
    */
   final List<int> _elementLibraryUris = <int>[];
 
   /**
    * Each item of this list corresponds to the unit URI of a unique
-   * [CompilationUnitElement].  It is an index into [_uris].
+   * [CompilationUnitElement].  It is an index into [_strings].
    */
   final List<int> _elementUnitUris = <int>[];
 
   /**
-   * Map associating URIs with their identifiers, which are indices
-   * into [_uris].
+   * Map associating strings with their identifiers, which are indices
+   * into [_strings].
    */
-  final Map<String, int> _uriMap = <String, int>{};
+  final Map<String, int> _stringMap = <String, int>{};
 
   /**
-   * List of unique URIs used in this index.
+   * List of unique strings used in this index.
    */
-  final List<String> _uris = <String>[];
+  final List<String> _strings = <String>[];
 
   /**
    * List of information about each unit indexed in this index.
@@ -75,7 +75,7 @@ class PackageIndexAssembler {
         elementUnits: elementInfoList.map((e) => e.unitId).toList(),
         elementOffsets: elementInfoList.map((e) => e.offset).toList(),
         elementKinds: elementInfoList.map((e) => e.kind).toList(),
-        uris: _uris,
+        strings: _strings,
         units: _units.map((unit) => unit.assemble()).toList());
   }
 
@@ -107,6 +107,18 @@ class PackageIndexAssembler {
   }
 
   /**
+   * Add information about [str] to [_strings] if necessary, and return the
+   * location in this array representing [str].
+   */
+  int _getStringId(String str) {
+    return _stringMap.putIfAbsent(str, () {
+      int id = _strings.length;
+      _strings.add(str);
+      return id;
+    });
+  }
+
+  /**
    * Add information about [unitElement] to [_elementUnitUris] and
    * [_elementLibraryUris] if necessary, and return the location in those
    * arrays representing [unitElement].
@@ -122,16 +134,11 @@ class PackageIndexAssembler {
   }
 
   /**
-   * Add information about [uri] to [_uris] if necessary, and return the
-   * location in this array representing [uri].
+   * Return the identifier corresponding to [uri].
    */
   int _getUriId(Uri uri) {
     String str = uri.toString();
-    return _uriMap.putIfAbsent(str, () {
-      int id = _uris.length;
-      _uris.add(str);
-      return id;
-    });
+    return _getStringId(str);
   }
 
   /**
@@ -169,6 +176,19 @@ class PackageIndexAssembler {
 }
 
 /**
+ * Information about a single defined name.  Any [_DefinedNameInfo] is always
+ * part of a [_UnitIndexAssembler], so [offset] should be understood within the
+ * context of the compilation unit pointed to by the [_UnitIndexAssembler].
+ */
+class _DefinedNameInfo {
+  final int nameId;

[Paul Berry, 2016/02/29 20:26:02]

Please document what this id refers to (I assume it's an index into
PackageIndexAssembler._strings)

[scheglov, 2016/02/29 20:47:44]

Fixed in https://codereview.chromium.org/1753433002

+  final IndexNameKind kind;
+  final int offset;
+
+  _DefinedNameInfo(this.nameId, this.kind, this.offset);
+}
+
+/**
  * Information about an element referenced in index.
  */
 class _ElementInfo {
@@ -205,6 +225,22 @@ class _IndexContributor extends GeneralizingAstVisitor {
   _IndexContributor(this.assembler);
 
   /**
+   * Record definition of the given [element].
+   */
+  void recordDefinedElement(Element element) {
+    if (element != null) {
+      String name = element.displayName;
+      int offset = element.nameOffset;
+      Element enclosing = element.enclosingElement;
+      if (enclosing is CompilationUnitElement) {
+        assembler.defineName(name, IndexNameKind.topLevel, offset);
+      } else if (enclosing is ClassElement) {
+        assembler.defineName(name, IndexNameKind.classMember, offset);
+      }
+    }
+  }
+
+  /**
    * Record reference to the given operator [Element] and name.
    */
   void recordOperatorReference(Token operator, Element element) {
@@ -289,22 +325,6 @@ class _IndexContributor extends GeneralizingAstVisitor {
     }
   }
 
-  /**
-   * Record the top-level [element] definition.
-   */
-  void recordTopLevelElementDefinition(Element element) {
-    // TODO(scheglov) do we need this?
-//    if (element?.enclosingElement is CompilationUnitElement) {
-//      IndexableElement indexable = new IndexableElement(element);
-//      int offset = element.nameOffset;
-//      int length = element.nameLength;
-//      LocationImpl location = new LocationImpl(indexable, offset, length);
-//      recordRelationshipElement(
-//          _libraryElement, IndexConstants.DEFINES, location);
-//      _store.recordTopLevelDeclaration(element);
-//    }
-  }
-
   void recordUriReference(Element element, UriBasedDirective directive) {
     recordRelation(element, IndexRelationKind.IS_REFERENCED_BY, directive.uri);
   }
@@ -323,10 +343,8 @@ class _IndexContributor extends GeneralizingAstVisitor {
 
   @override
   visitClassDeclaration(ClassDeclaration node) {
-    ClassElement element = node.element;
-    recordTopLevelElementDefinition(element);
     if (node.extendsClause == null) {
-      ClassElement objectElement = element.supertype?.element;
+      ClassElement objectElement = node.element.supertype?.element;
       recordRelationOffset(
           objectElement, IndexRelationKind.IS_EXTENDED_BY, node.name.offset, 0);
     }
@@ -334,13 +352,6 @@ class _IndexContributor extends GeneralizingAstVisitor {
   }
 
   @override
-  visitClassTypeAlias(ClassTypeAlias node) {
-    ClassElement element = node.element;
-    recordTopLevelElementDefinition(element);
-    super.visitClassTypeAlias(node);
-  }
-
-  @override
   visitConstructorFieldInitializer(ConstructorFieldInitializer node) {
     SimpleIdentifier fieldName = node.fieldName;
     if (fieldName != null) {
@@ -376,13 +387,6 @@ class _IndexContributor extends GeneralizingAstVisitor {
   }
 
   @override
-  visitEnumDeclaration(EnumDeclaration node) {
-    ClassElement element = node.element;
-    recordTopLevelElementDefinition(element);
-    super.visitEnumDeclaration(node);
-  }
-
-  @override
   visitExportDirective(ExportDirective node) {
     ExportElement element = node.element;
     recordUriReference(element?.exportedLibrary, node);
@@ -395,20 +399,6 @@ class _IndexContributor extends GeneralizingAstVisitor {
   }
 
   @override
-  visitFunctionDeclaration(FunctionDeclaration node) {
-    Element element = node.element;
-    recordTopLevelElementDefinition(element);
-    super.visitFunctionDeclaration(node);
-  }
-
-  @override
-  visitFunctionTypeAlias(FunctionTypeAlias node) {
-    Element element = node.element;
-    recordTopLevelElementDefinition(element);
-    super.visitFunctionTypeAlias(node);
-  }
-
-  @override
   visitImplementsClause(ImplementsClause node) {
     for (TypeName typeName in node.interfaces) {
       recordSuperType(typeName, IndexRelationKind.IS_IMPLEMENTED_BY);
@@ -494,6 +484,7 @@ class _IndexContributor extends GeneralizingAstVisitor {
 
   @override
   visitSimpleIdentifier(SimpleIdentifier node) {
+    Element element = node.bestElement;
     // TODO(scheglov) do we need this?
 //    IndexableName indexableName = new IndexableName(node.name);
 //    LocationImpl location = _createLocationForNode(node);
@@ -502,12 +493,9 @@ class _IndexContributor extends GeneralizingAstVisitor {
 //    }
     // name in declaration
     if (node.inDeclarationContext()) {
-      // TODO(scheglov) do we need this?
-//      recordRelationshipIndexable(
-//          indexableName, IndexConstants.NAME_IS_DEFINED_BY, location);
+      recordDefinedElement(element);
       return;
     }
-    Element element = node.bestElement;
     // this.field parameter
     if (element is FieldFormalParameterElement) {
       recordRelation(element.field, IndexRelationKind.IS_REFERENCED_BY, node);
@@ -547,22 +535,6 @@ class _IndexContributor extends GeneralizingAstVisitor {
   }
 
   @override
-  visitVariableDeclaration(VariableDeclaration node) {
-    VariableElement element = node.element;
-    recordTopLevelElementDefinition(element);
-    // TODO(scheglov) do we need this?
-//    // record declaration
-//    {
-//      SimpleIdentifier name = node.name;
-//      LocationImpl location = _createLocationForNode(name);
-//      location = _getLocationWithExpressionType(location, node.initializer);
-//      recordRelationshipElement(
-//          element, IndexConstants.NAME_IS_DEFINED_BY, location);
-//    }
-    super.visitVariableDeclaration(node);
-  }
-
-  @override
   visitWithClause(WithClause node) {
     for (TypeName typeName in node.mixinTypes) {
       recordSuperType(typeName, IndexRelationKind.IS_MIXED_IN_BY);
@@ -588,6 +560,7 @@ class _RelationInfo {
 /**
  * Assembler of a single [CompilationUnit] index.  The intended usage sequence:
  *
+ *  - Call [defineName] for name defined in the compilation unit.

[Paul Berry, 2016/02/29 20:26:02]

s/for name/for each name/

  *  - Call [addRelation] for each relation found in the compilation unit.
  *  - Assign ids to all the [_ElementInfo] objects reachable from [relations].
  *  - Call [assemble] to produce the final unit index.
@@ -595,6 +568,7 @@ class _RelationInfo {
 class _UnitIndexAssembler {
   final PackageIndexAssembler pkg;
   final CompilationUnitElement unitElement;
+  final List<_DefinedNameInfo> definedNames = <_DefinedNameInfo>[];
   final List<_RelationInfo> relations = <_RelationInfo>[];
 
   _UnitIndexAssembler(this.pkg, this.unitElement);
@@ -609,13 +583,19 @@ class _UnitIndexAssembler {
 
   /**
    * Assemble a new [UnitIndexBuilder] using the information gathered
-   * by [addRelation]
+   * by [addRelation] and [defineName].
    */
   UnitIndexBuilder assemble() {
     relations.sort((a, b) {
       return a.elementInfo.id - b.elementInfo.id;
     });
+    definedNames.sort((a, b) {
+      return a.nameId - b.nameId;
+    });
     return new UnitIndexBuilder(
+        definedNames: definedNames.map((n) => n.nameId).toList(),
+        definedNameKinds: definedNames.map((n) => n.kind).toList(),
+        definedNameOffsets: definedNames.map((n) => n.offset).toList(),
         elements: relations.map((r) => r.elementInfo.id).toList(),
         kinds: relations.map((r) => r.kind).toList(),
         locationOffsets: relations.map((r) => r.offset).toList(),
@@ -623,4 +603,9 @@ class _UnitIndexAssembler {
         libraryUri: pkg._getUriId(unitElement.library.source.uri),
         unitUri: pkg._getUriId(unitElement.source.uri));
   }
+
+  void defineName(String name, IndexNameKind kind, int offset) {
+    int nameId = pkg._getStringId(name);
+    definedNames.add(new _DefinedNameInfo(nameId, kind, offset));
+  }
 }