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

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

Issue 1378843003: Remove the 'name' and 'length' getters from IndexableObject. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 2 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/codec.dart
diff --git a/pkg/analysis_server/lib/src/services/index/store/codec.dart b/pkg/analysis_server/lib/src/services/index/store/codec.dart
index 07925f3ed70286d90b214a8563bf89f5133c05c4..c865aa41bd727c6a28c89801839994e74644c4c0 100644
--- a/pkg/analysis_server/lib/src/services/index/store/codec.dart
+++ b/pkg/analysis_server/lib/src/services/index/store/codec.dart
@@ -8,11 +8,8 @@ import 'dart:collection';
import 'package:analysis_server/analysis/index_core.dart';
import 'package:analysis_server/src/services/index/index.dart';
-import 'package:analysis_server/src/services/index/indexable_element.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 helper that encodes/decodes [AnalysisContext]s from/to integers.
@@ -79,7 +76,6 @@ class ElementCodec {
*/
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;
@@ -87,6 +83,7 @@ class ElementCodec {
String name = _stringCodec.decode(offset);
return new IndexableName(name);
}
+ String filePath = _stringCodec.decode(fileId);
return kind.decode(context, filePath, offset);
}
@@ -113,11 +110,7 @@ class ElementCodec {
String name = indexable.name;
return _stringCodec.encode(name);
}
- int offset = indexable.offset;
- if (offset < 0) {
- return _stringCodec.encode(indexable.name);
- }
- return offset;
+ return indexable.offset;
}
/**
@@ -132,19 +125,7 @@ class ElementCodec {
* 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;
- int libraryPathId = _stringCodec.encode(libraryPath);
- return JenkinsSmiHash.combine(libraryPathId, elementNameId);
- }
- }
- return elementNameId;
+ return indexable.kind.encodeHash(_stringCodec.encode, indexable);
}
}

Powered by Google App Engine
This is Rietveld 408576698