Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: pkg/analysis_server/lib/src/services/index2/index2.dart

Issue 1787803003: Improve used name relations and fields indexing. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/lib/src/services/index2/index2.dart
diff --git a/pkg/analysis_server/lib/src/services/index2/index2.dart b/pkg/analysis_server/lib/src/services/index2/index2.dart
index aeff8c94867575689ad54122220b2b1bfdddd739..a660bc2c37c6a087572bbd2db0b57323584a0809 100644
--- a/pkg/analysis_server/lib/src/services/index2/index2.dart
+++ b/pkg/analysis_server/lib/src/services/index2/index2.dart
@@ -151,6 +151,11 @@ class Location {
final String unitUri;
/**
+ * The kind of usage at this location.
+ */
+ final IndexRelationKind kind;
+
+ /**
* The offset of this location within the [unitUri].
*/
final int offset;
@@ -165,13 +170,18 @@ class Location {
*/
final bool isQualified;
- Location(this.context, this.libraryUri, this.unitUri, this.offset,
- this.length, this.isQualified);
+ /**
+ * Is `true` if this location is resolved.
+ */
+ final bool isResolved;
+
+ Location(this.context, this.libraryUri, this.unitUri, this.kind, this.offset,
+ this.length, this.isQualified, this.isResolved);
@override
String toString() => 'Location{librarySourceUri: $libraryUri, '
'unitSourceUri: $unitUri, offset: $offset, length: $length, '
- 'isQualified: $isQualified}';
+ 'isQualified: $isQualified}, isResolved: $isResolved}';
}
/**
@@ -460,8 +470,8 @@ class _UnitIndexRequester {
if (regExp.matchAsPrefix(name) != null) {
unitLibraryUri ??= packageRequester.getUnitLibraryUri(unitIndex.unit);
unitUnitUri ??= packageRequester.getUnitUnitUri(unitIndex.unit);
- locations.add(new Location(context, unitLibraryUri, unitUnitUri,
- unitIndex.definedNameOffsets[i], name.length, false));
+ locations.add(new Location(context, unitLibraryUri, unitUnitUri, null,
+ unitIndex.definedNameOffsets[i], name.length, false, true));
}
}
}
@@ -494,9 +504,11 @@ class _UnitIndexRequester {
context,
unitLibraryUri,
unitUnitUri,
+ kind,
unitIndex.usedElementOffsets[i],
unitIndex.usedElementLengths[i],
- unitIndex.usedElementIsQualifiedFlags[i]));
+ unitIndex.usedElementIsQualifiedFlags[i],
+ true));
}
}
return locations;
@@ -527,8 +539,15 @@ class _UnitIndexRequester {
i++) {
unitLibraryUri ??= packageRequester.getUnitLibraryUri(unitIndex.unit);
unitUnitUri ??= packageRequester.getUnitUnitUri(unitIndex.unit);
- locations.add(new Location(context, unitLibraryUri, unitUnitUri,
- unitIndex.usedNameOffsets[i], name.length, true));
+ locations.add(new Location(
+ context,
+ unitLibraryUri,
+ unitUnitUri,
+ unitIndex.usedNameKinds[i],
+ unitIndex.usedNameOffsets[i],
+ name.length,
+ true,
+ false));
}
return locations;
}

Powered by Google App Engine
This is Rietveld 408576698