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

Unified Diff: pkg/analysis_server/lib/src/services/index/store/split_store.dart

Issue 1087483006: Rename two more classes to prepare for the public API (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 8 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/index/store/split_store.dart
diff --git a/pkg/analysis_server/lib/src/services/index/store/split_store.dart b/pkg/analysis_server/lib/src/services/index/store/split_store.dart
index b3c9ef14b87a3b8d67bd866e2f397884fac21803..bde1d08689e96a1ba6821d810250d887c0bd9410 100644
--- a/pkg/analysis_server/lib/src/services/index/store/split_store.dart
+++ b/pkg/analysis_server/lib/src/services/index/store/split_store.dart
@@ -272,22 +272,23 @@ class IndexNode {
*
* [element] - the the element that has the relationship with the locations to
* be returned.
- * [relationship] - the [Relationship] between the given [element] and the
+ * [relationship] - the [RelationshipImpl] between the given [element] and the
* locations to be returned
*/
- List<Location> getRelationships(Element element, Relationship relationship) {
+ List<LocationImpl> getRelationships(
+ Element element, RelationshipImpl relationship) {
// prepare key
RelationKeyData key = new RelationKeyData.forObject(
_elementCodec, _relationshipCodec, element, relationship);
// find LocationData(s)
List<LocationData> locationDatas = _relations[key];
if (locationDatas == null) {
- return Location.EMPTY_ARRAY;
+ return LocationImpl.EMPTY_ARRAY;
}
// convert to Location(s)
- List<Location> locations = <Location>[];
+ List<LocationImpl> locations = <LocationImpl>[];
for (LocationData locationData in locationDatas) {
- Location location = locationData.getLocation(context, _elementCodec);
+ LocationImpl location = locationData.getLocation(context, _elementCodec);
if (location != null) {
locations.add(location);
}
@@ -320,11 +321,11 @@ class IndexNode {
* Records that the given [element] and [location] have the given [relationship].
*
* [element] - the [Element] that is related to the location.
- * [relationship] - the [Relationship] between [element] and [location].
- * [location] - the [Location] where relationship happens.
+ * [relationship] - the [RelationshipImpl] between [element] and [location].
+ * [location] - the [LocationImpl] where relationship happens.
*/
void recordRelationship(
- Element element, Relationship relationship, Location location) {
+ Element element, RelationshipImpl relationship, LocationImpl location) {
RelationKeyData key = new RelationKeyData.forObject(
_elementCodec, _relationshipCodec, element, relationship);
// prepare LocationData(s)
@@ -340,7 +341,7 @@ class IndexNode {
class InspectLocation {
final String nodeName;
- final Relationship relationship;
+ final RelationshipImpl relationship;
final List<String> path;
final int offset;
final int length;
@@ -351,7 +352,7 @@ class InspectLocation {
}
/**
- * A container with information about a [Location].
+ * A container with information about a [LocationImpl].
*/
class LocationData {
static const int _FLAG_QUALIFIED = 1 << 0;
@@ -367,7 +368,7 @@ class LocationData {
LocationData.forData(this.elementId1, this.elementId2, this.elementId3,
this.offset, this.length, this.flags);
- LocationData.forObject(ElementCodec elementCodec, Location location)
+ LocationData.forObject(ElementCodec elementCodec, LocationImpl location)
: elementId1 = elementCodec.encode1(location.element),
elementId2 = elementCodec.encode2(location.element),
elementId3 = elementCodec.encode3(location.element),
@@ -404,7 +405,7 @@ class LocationData {
/**
* Returns a {@link Location} that is represented by this {@link LocationData}.
*/
- Location getLocation(AnalysisContext context, ElementCodec elementCodec) {
+ LocationImpl getLocation(AnalysisContext context, ElementCodec elementCodec) {
Element element =
elementCodec.decode(context, elementId1, elementId2, elementId3);
if (element == null) {
@@ -412,7 +413,7 @@ class LocationData {
}
bool isQualified = (flags & _FLAG_QUALIFIED) != 0;
bool isResovled = (flags & _FLAG_RESOLVED) != 0;
- return new Location(element, offset, length,
+ return new LocationImpl(element, offset, length,
isQualified: isQualified, isResolved: isResovled);
}
}
@@ -468,7 +469,7 @@ abstract class NodeManager {
}
/**
- * An [Element] to [Location] relation key.
+ * An [Element] to [LocationImpl] relation key.
*/
class RelationKeyData {
final int elementId1;
@@ -481,7 +482,7 @@ class RelationKeyData {
RelationKeyData.forObject(ElementCodec elementCodec,
RelationshipCodec relationshipCodec, Element element,
- Relationship relationship)
+ RelationshipImpl relationship)
: elementId1 = elementCodec.encode1(element),
elementId2 = elementCodec.encode2(element),
elementId3 = elementCodec.encode3(element),
@@ -563,8 +564,8 @@ class SplitIndexStore implements InternalIndexStore {
* A table mapping element names to the node names that may have relations with elements with
* these names.
*/
- Map<Relationship, IntToIntSetMap> _relToNameMap =
- new HashMap<Relationship, IntToIntSetMap>();
+ Map<RelationshipImpl, IntToIntSetMap> _relToNameMap =
+ new HashMap<RelationshipImpl, IntToIntSetMap>();
/**
* The [NodeManager] to get/put [IndexNode]s.
@@ -710,8 +711,8 @@ class SplitIndexStore implements InternalIndexStore {
}
}
- Future<List<Location>> getRelationships(
- Element element, Relationship relationship) {
+ Future<List<LocationImpl>> getRelationships(
+ Element element, RelationshipImpl relationship) {
// prepare node names
List<int> nodeNameIds;
{
@@ -724,23 +725,26 @@ class SplitIndexStore implements InternalIndexStore {
}
}
// prepare Future(s) for reading each IndexNode
- List<Future<List<Location>>> nodeFutures = <Future<List<Location>>>[];
+ List<Future<List<LocationImpl>>> nodeFutures =
+ <Future<List<LocationImpl>>>[];
for (int nodeNameId in nodeNameIds) {
String nodeName = _stringCodec.decode(nodeNameId);
Future<IndexNode> nodeFuture = _nodeManager.getNode(nodeName);
- Future<List<Location>> locationsFuture = nodeFuture.then((node) {
+ Future<List<LocationImpl>> locationsFuture = nodeFuture.then((node) {
if (node == null) {
// TODO(scheglov) remove node
- return Location.EMPTY_ARRAY;
+ return LocationImpl.EMPTY_ARRAY;
}
return node.getRelationships(element, relationship);
});
nodeFutures.add(locationsFuture);
}
// return Future that merges separate IndexNode Location(s)
- return Future.wait(nodeFutures).then((List<List<Location>> locationsList) {
- List<Location> allLocations = <Location>[];
- for (List<Location> locations in locationsList) {
+ return Future
+ .wait(nodeFutures)
+ .then((List<List<LocationImpl>> locationsList) {
+ List<LocationImpl> allLocations = <LocationImpl>[];
+ for (List<LocationImpl> locations in locationsList) {
allLocations.addAll(locations);
}
return allLocations;
@@ -810,7 +814,7 @@ class SplitIndexStore implements InternalIndexStore {
@override
void recordRelationship(
- Element element, Relationship relationship, Location location) {
+ Element element, RelationshipImpl relationship, LocationImpl location) {
if (element == null || element is MultiplyDefinedElement) {
return;
}
@@ -926,7 +930,8 @@ class SplitIndexStore implements InternalIndexStore {
units.add(unit);
}
- void _recordNodeNameForElement(Element element, Relationship relationship) {
+ void _recordNodeNameForElement(
+ Element element, RelationshipImpl relationship) {
IntToIntSetMap nameToNodeNames = _relToNameMap[relationship];
if (nameToNodeNames == null) {
nameToNodeNames = new IntToIntSetMap();

Powered by Google App Engine
This is Rietveld 408576698