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

Unified Diff: pkg/analysis_server/lib/src/services/search/search_engine_internal.dart

Issue 2949823002: Remove unused implementation of SearchEngine and rename the driver-based implementation (Closed)
Patch Set: Created 3 years, 6 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/search/search_engine_internal.dart
diff --git a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
index 2389353cad0bd7ca02ac4e177b736282107f47af..2cd5cc4708bf1ceb2ab571b4616368507310f04b 100644
--- a/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
+++ b/pkg/analysis_server/lib/src/services/search/search_engine_internal.dart
@@ -4,414 +4,141 @@
import 'dart:async';
-import 'package:analysis_server/src/services/index/index.dart';
import 'package:analysis_server/src/services/search/search_engine.dart';
-import 'package:analyzer/dart/ast/ast.dart';
-import 'package:analyzer/dart/ast/visitor.dart';
import 'package:analyzer/dart/element/element.dart';
-import 'package:analyzer/dart/element/visitor.dart';
-import 'package:analyzer/src/dart/element/ast_provider.dart';
-import 'package:analyzer/src/dart/element/element.dart';
-import 'package:analyzer/src/dart/element/member.dart';
-import 'package:analyzer/src/generated/engine.dart' show AnalysisContext;
-import 'package:analyzer/src/generated/resolver.dart' show NamespaceBuilder;
+import 'package:analyzer/src/dart/analysis/driver.dart';
+import 'package:analyzer/src/dart/analysis/search.dart';
import 'package:analyzer/src/generated/source.dart' show Source, SourceRange;
-import 'package:analyzer/src/generated/utilities_general.dart';
-import 'package:analyzer/src/summary/idl.dart';
-import 'package:analyzer_plugin/utilities/range_factory.dart';
-
-/**
- * The type of a function that returns the [AstProvider] managing the [file].
- */
-typedef AstProvider GetAstProvider(String file);
+import 'package:meta/meta.dart';
/**
* A [SearchEngine] implementation.
*/
class SearchEngineImpl implements SearchEngine {
- final Index _index;
- final GetAstProvider _getAstProvider;
+ final Iterable<AnalysisDriver> _drivers;
- SearchEngineImpl(this._index, this._getAstProvider);
+ SearchEngineImpl(this._drivers);
@override
Future<Set<ClassElement>> searchAllSubtypes(ClassElement type) async {
- List<SearchMatch> matches = <SearchMatch>[];
- await _addMatches(
- matches, type, IndexRelationKind.IS_ANCESTOR_OF, MatchKind.DECLARATION);
- return matches.map((match) => match.element as ClassElement).toSet();
+ Set<ClassElement> allSubtypes = new Set<ClassElement>();
+
+ Future<Null> addSubtypes(ClassElement type) async {
+ List<SearchResult> directResults = await _searchDirectSubtypes(type);
+ for (SearchResult directResult in directResults) {
+ var directSubtype = directResult.enclosingElement as ClassElement;
+ if (allSubtypes.add(directSubtype)) {
+ await addSubtypes(directSubtype);
+ }
+ }
+ }
+
+ await addSubtypes(type);
+ return allSubtypes;
}
@override
- Future<List<SearchMatch>> searchMemberDeclarations(String name) {
- String pattern = '^$name\$';
- return _searchDefinedNames(pattern, IndexNameKind.classMember);
+ Future<List<SearchMatch>> searchMemberDeclarations(String name) async {
+ List<SearchMatch> allDeclarations = [];
+ List<AnalysisDriver> drivers = _drivers.toList();
+ for (AnalysisDriver driver in drivers) {
+ List<Element> elements = await driver.search.classMembers(name);
+ allDeclarations.addAll(elements.map(SearchMatchImpl.forElement));
+ }
+ return allDeclarations;
}
@override
Future<List<SearchMatch>> searchMemberReferences(String name) async {
- List<Location> locations = await _index.getUnresolvedMemberReferences(name);
- return locations.map((location) {
- return _newMatchForLocation(location, null);
- }).toList();
+ List<SearchResult> allResults = [];
+ List<AnalysisDriver> drivers = _drivers.toList();
+ for (AnalysisDriver driver in drivers) {
+ List<SearchResult> results =
+ await driver.search.unresolvedMemberReferences(name);
+ allResults.addAll(results);
+ }
+ return allResults.map(SearchMatchImpl.forSearchResult).toList();
}
@override
- Future<List<SearchMatch>> searchReferences(Element element) {
- ElementKind kind = element.kind;
- if (kind == ElementKind.CLASS ||
- kind == ElementKind.COMPILATION_UNIT ||
- kind == ElementKind.CONSTRUCTOR ||
- kind == ElementKind.FUNCTION_TYPE_ALIAS ||
- kind == ElementKind.SETTER) {
- return _searchReferences(element);
- } else if (kind == ElementKind.GETTER) {
- return _searchReferences_Getter(element);
- } else if (kind == ElementKind.FIELD ||
- kind == ElementKind.TOP_LEVEL_VARIABLE) {
- return _searchReferences_Field(element);
- } else if (kind == ElementKind.FUNCTION || kind == ElementKind.METHOD) {
- if (element.enclosingElement is ExecutableElement) {
- return _searchReferences_Local(element, (n) => n is Block);
- }
- return _searchReferences_Function(element);
- } else if (kind == ElementKind.IMPORT) {
- return _searchReferences_Import(element);
- } else if (kind == ElementKind.LABEL ||
- kind == ElementKind.LOCAL_VARIABLE) {
- return _searchReferences_Local(element, (n) => n is Block);
- } else if (kind == ElementKind.LIBRARY) {
- return _searchReferences_Library(element);
- } else if (kind == ElementKind.PARAMETER) {
- return _searchReferences_Parameter(element);
- } else if (kind == ElementKind.PREFIX) {
- return _searchReferences_Prefix(element);
- } else if (kind == ElementKind.TYPE_PARAMETER) {
- return _searchReferences_Local(element, (n) => n is ClassDeclaration);
+ Future<List<SearchMatch>> searchReferences(Element element) async {
+ List<SearchResult> allResults = [];
+ List<AnalysisDriver> drivers = _drivers.toList();
+ for (AnalysisDriver driver in drivers) {
+ List<SearchResult> results = await driver.search.references(element);
+ allResults.addAll(results);
}
- return new Future.value(<SearchMatch>[]);
+ return allResults.map(SearchMatchImpl.forSearchResult).toList();
}
@override
Future<List<SearchMatch>> searchSubtypes(ClassElement type) async {
- List<SearchMatch> matches = <SearchMatch>[];
- await _addMatches(
- matches, type, IndexRelationKind.IS_EXTENDED_BY, MatchKind.REFERENCE);
- await _addMatches(
- matches, type, IndexRelationKind.IS_MIXED_IN_BY, MatchKind.REFERENCE);
- await _addMatches(matches, type, IndexRelationKind.IS_IMPLEMENTED_BY,
- MatchKind.REFERENCE);
- return matches;
+ List<SearchResult> results = await _searchDirectSubtypes(type);
+ return results.map(SearchMatchImpl.forSearchResult).toList();
}
@override
- Future<List<SearchMatch>> searchTopLevelDeclarations(String pattern) {
- return _searchDefinedNames(pattern, IndexNameKind.topLevel);
- }
-
- _addMatches(List<SearchMatch> matches, Element element,
- IndexRelationKind relationKind, MatchKind kind) async {
- List<Location> locations = await _index.getRelations(element, relationKind);
- for (Location location in locations) {
- SearchMatch match = _newMatchForLocation(location, kind);
- matches.add(match);
- }
- }
-
- SearchMatch _newMatchForLocation(Location location, MatchKind kind) {
- if (kind == null) {
- IndexRelationKind relationKind = location.kind;
- if (relationKind == IndexRelationKind.IS_INVOKED_BY) {
- kind = MatchKind.INVOCATION;
- } else if (relationKind == IndexRelationKind.IS_REFERENCED_BY) {
- kind = MatchKind.REFERENCE;
- } else if (relationKind == IndexRelationKind.IS_READ_BY) {
- kind = MatchKind.READ;
- } else if (relationKind == IndexRelationKind.IS_READ_WRITTEN_BY) {
- kind = MatchKind.READ_WRITE;
- } else if (relationKind == IndexRelationKind.IS_WRITTEN_BY) {
- kind = MatchKind.WRITE;
- } else {
- throw new ArgumentError('Unsupported relation kind $relationKind');
- }
- }
- return new SearchMatchImpl(
- location.context,
- location.libraryUri,
- location.unitUri,
- kind,
- new SourceRange(location.offset, location.length),
- location.isResolved,
- location.isQualified);
- }
-
- Future<List<SearchMatch>> _searchDefinedNames(
- String pattern, IndexNameKind nameKind) async {
+ Future<List<SearchMatch>> searchTopLevelDeclarations(String pattern) async {
+ List<SearchMatch> allDeclarations = [];
RegExp regExp = new RegExp(pattern);
- List<Location> locations = await _index.getDefinedNames(regExp, nameKind);
- return locations.map((location) {
- return _newMatchForLocation(location, MatchKind.DECLARATION);
- }).toList();
- }
-
- Future<List<SearchMatch>> _searchReferences(Element element) async {
- List<SearchMatch> matches = <SearchMatch>[];
- await _addMatches(matches, element, IndexRelationKind.IS_REFERENCED_BY,
- MatchKind.REFERENCE);
- return matches;
- }
-
- Future<List<SearchMatch>> _searchReferences_Field(
- PropertyInducingElement field) async {
- List<SearchMatch> matches = <SearchMatch>[];
- PropertyAccessorElement getter = field.getter;
- PropertyAccessorElement setter = field.setter;
- // field itself
- if (!field.isSynthetic) {
- await _addMatches(
- matches, field, IndexRelationKind.IS_WRITTEN_BY, MatchKind.WRITE);
- await _addMatches(matches, field, IndexRelationKind.IS_REFERENCED_BY,
- MatchKind.REFERENCE);
+ List<AnalysisDriver> drivers = _drivers.toList();
+ for (AnalysisDriver driver in drivers) {
+ List<Element> elements = await driver.search.topLevelElements(regExp);
+ allDeclarations.addAll(elements.map(SearchMatchImpl.forElement));
}
- // getter
- if (getter != null) {
- await _addMatches(
- matches, getter, IndexRelationKind.IS_REFERENCED_BY, MatchKind.READ);
- await _addMatches(matches, getter, IndexRelationKind.IS_INVOKED_BY,
- MatchKind.INVOCATION);
- }
- // setter
- if (setter != null) {
- await _addMatches(
- matches, setter, IndexRelationKind.IS_REFERENCED_BY, MatchKind.WRITE);
- }
- // done
- return matches;
- }
-
- Future<List<SearchMatch>> _searchReferences_Function(Element element) async {
- if (element is Member) {
- element = (element as Member).baseElement;
- }
- List<SearchMatch> matches = <SearchMatch>[];
- await _addMatches(matches, element, IndexRelationKind.IS_REFERENCED_BY,
- MatchKind.REFERENCE);
- await _addMatches(matches, element, IndexRelationKind.IS_INVOKED_BY,
- MatchKind.INVOCATION);
- return matches;
- }
-
- Future<List<SearchMatch>> _searchReferences_Getter(
- PropertyAccessorElement getter) async {
- List<SearchMatch> matches = <SearchMatch>[];
- await _addMatches(matches, getter, IndexRelationKind.IS_REFERENCED_BY,
- MatchKind.REFERENCE);
- await _addMatches(
- matches, getter, IndexRelationKind.IS_INVOKED_BY, MatchKind.INVOCATION);
- return matches;
+ return allDeclarations;
}
- Future<List<SearchMatch>> _searchReferences_Import(
- ImportElement element) async {
- List<SearchMatch> matches = <SearchMatch>[];
- LibraryElement libraryElement = element.library;
- Source librarySource = libraryElement.source;
- AnalysisContext context = libraryElement.context;
- for (CompilationUnitElement unitElement in libraryElement.units) {
- Source unitSource = unitElement.source;
- CompilationUnit unit =
- context.resolveCompilationUnit2(unitSource, librarySource);
- _ImportElementReferencesVisitor visitor =
- new _ImportElementReferencesVisitor(
- element, unitSource.uri.toString());
- unit.accept(visitor);
- matches.addAll(visitor.matches);
+ Future<List<SearchResult>> _searchDirectSubtypes(ClassElement type) async {
+ List<SearchResult> allResults = [];
+ List<AnalysisDriver> drivers = _drivers.toList();
+ for (AnalysisDriver driver in drivers) {
+ List<SearchResult> results = await driver.search.subTypes(type);
+ allResults.addAll(results);
}
- return matches;
- }
-
- Future<List<SearchMatch>> _searchReferences_Library(Element element) async {
- List<SearchMatch> matches = <SearchMatch>[];
- LibraryElement libraryElement = element.library;
- Source librarySource = libraryElement.source;
- AnalysisContext context = libraryElement.context;
- for (CompilationUnitElement unitElement in libraryElement.parts) {
- Source unitSource = unitElement.source;
- CompilationUnit unit =
- context.resolveCompilationUnit2(unitSource, librarySource);
- for (Directive directive in unit.directives) {
- if (directive is PartOfDirective &&
- directive.element == libraryElement) {
- matches.add(new SearchMatchImpl(
- context,
- librarySource.uri.toString(),
- unitSource.uri.toString(),
- MatchKind.REFERENCE,
- range.node(directive.libraryName),
- true,
- false));
- }
- }
- }
- return matches;
- }
-
- Future<List<SearchMatch>> _searchReferences_Local(
- Element element, bool isRootNode(AstNode n)) async {
- _LocalReferencesVisitor visitor = new _LocalReferencesVisitor(element);
- AstProvider astProvider = _getAstProvider(element.source.fullName);
- AstNode name = await astProvider.getResolvedNameForElement(element);
- AstNode enclosingNode = name?.getAncestor(isRootNode);
- enclosingNode?.accept(visitor);
- return visitor.matches;
- }
-
- Future<List<SearchMatch>> _searchReferences_Parameter(
- ParameterElement parameter) async {
- List<SearchMatch> matches = <SearchMatch>[];
- matches.addAll(await _searchReferences(parameter));
- matches.addAll(await _searchReferences_Local(parameter, (AstNode node) {
- AstNode parent = node.parent;
- return parent is ClassDeclaration || parent is CompilationUnit;
- }));
- return matches;
- }
-
- Future<List<SearchMatch>> _searchReferences_Prefix(
- PrefixElement element) async {
- List<SearchMatch> matches = <SearchMatch>[];
- LibraryElement libraryElement = element.library;
- Source librarySource = libraryElement.source;
- AnalysisContext context = libraryElement.context;
- for (CompilationUnitElement unitElement in libraryElement.units) {
- Source unitSource = unitElement.source;
- CompilationUnit unit =
- context.resolveCompilationUnit2(unitSource, librarySource);
- _LocalReferencesVisitor visitor =
- new _LocalReferencesVisitor(element, unitSource.uri.toString());
- unit.accept(visitor);
- matches.addAll(visitor.matches);
- }
- return matches;
+ return allResults;
}
}
-/**
- * Implementation of [SearchMatch].
- */
+@visibleForTesting
class SearchMatchImpl implements SearchMatch {
- /**
- * The [AnalysisContext] containing the match.
- */
- final AnalysisContext _context;
+ @override
+ final String file;
- /**
- * The URI of the source of the library containing the match.
- */
- final String libraryUri;
+ @override
+ final Source librarySource;
- /**
- * The URI of the source of the unit containing the match.
- */
- final String unitUri;
+ @override
+ final Source unitSource;
- /**
- * The kind of the match.
- */
- final MatchKind kind;
+ @override
+ final LibraryElement libraryElement;
- /**
- * The source range that was matched.
- */
- final SourceRange sourceRange;
+ @override
+ final Element element;
- /**
- * Is `true` if the match is a resolved reference to some [Element].
- */
+ @override
final bool isResolved;
- /**
- * Is `true` if field or method access is done using qualifier.
- */
+ @override
final bool isQualified;
- Source _librarySource;
- Source _unitSource;
- LibraryElement _libraryElement;
- Element _element;
-
- SearchMatchImpl(this._context, this.libraryUri, this.unitUri, this.kind,
- this.sourceRange, this.isResolved, this.isQualified);
-
- /**
- * Return the [Element] containing the match. Can return `null` if the unit
- * does not exist, or its element was invalidated, or the element cannot be
- * found, etc.
- */
- Element get element {
- if (_element == null) {
- CompilationUnitElement unitElement =
- _context.getCompilationUnitElement(unitSource, librarySource);
- if (unitElement != null) {
- _ContainingElementFinder finder =
- new _ContainingElementFinder(sourceRange.offset);
- unitElement.accept(finder);
- _element = finder.containingElement;
- }
- }
- return _element;
- }
-
- /**
- * The absolute path of the file containing the match.
- */
- String get file => unitSource.fullName;
-
@override
- int get hashCode {
- return JenkinsSmiHash.hash4(libraryUri.hashCode, unitUri.hashCode,
- kind.hashCode, sourceRange.hashCode);
- }
-
- /**
- * Return the [LibraryElement] for the [libraryUri] in the [context].
- */
- LibraryElement get libraryElement {
- _libraryElement ??= _context.getLibraryElement(librarySource);
- return _libraryElement;
- }
-
- /**
- * The library [Source] of the reference.
- */
- Source get librarySource {
- _librarySource ??= _context.sourceFactory.forUri(libraryUri);
- return _librarySource;
- }
-
- /**
- * The unit [Source] of the reference.
- */
- Source get unitSource {
- _unitSource ??= _context.sourceFactory.forUri(unitUri);
- return _unitSource;
- }
+ final MatchKind kind;
@override
- bool operator ==(Object object) {
- if (identical(object, this)) {
- return true;
- }
- if (object is SearchMatchImpl) {
- return kind == object.kind &&
- libraryUri == object.libraryUri &&
- unitUri == object.unitUri &&
- isResolved == object.isResolved &&
- isQualified == object.isQualified &&
- sourceRange == object.sourceRange;
- }
- return false;
- }
+ final SourceRange sourceRange;
+
+ SearchMatchImpl(
+ this.file,
+ this.librarySource,
+ this.unitSource,
+ this.libraryElement,
+ this.element,
+ this.isResolved,
+ this.isQualified,
+ this.kind,
+ this.sourceRange);
@override
String toString() {
@@ -419,9 +146,9 @@ class SearchMatchImpl implements SearchMatch {
buffer.write("SearchMatch(kind=");
buffer.write(kind);
buffer.write(", libraryUri=");
- buffer.write(libraryUri);
+ buffer.write(librarySource.uri);
buffer.write(", unitUri=");
- buffer.write(unitUri);
+ buffer.write(unitSource.uri);
buffer.write(", range=");
buffer.write(sourceRange);
buffer.write(", isResolved=");
@@ -432,157 +159,46 @@ class SearchMatchImpl implements SearchMatch {
return buffer.toString();
}
- /**
- * Return elements of [matches] which has not-null elements.
- *
- * When [SearchMatch.element] is not `null` we cache its value, so it cannot
- * become `null` later.
- */
- static List<SearchMatch> withNotNullElement(List<SearchMatch> matches) {
- return matches.where((match) => match.element != null).toList();
- }
-}
-
-/**
- * A visitor that finds the deep-most [Element] that contains the [offset].
- */
-class _ContainingElementFinder extends GeneralizingElementVisitor {
- final int offset;
- Element containingElement;
-
- _ContainingElementFinder(this.offset);
-
- visitElement(Element element) {
- if (element is ElementImpl) {
- if (element.codeOffset != null &&
- element.codeOffset <= offset &&
- offset <= element.codeOffset + element.codeLength) {
- containingElement = element;
- super.visitElement(element);
- }
- }
- }
-}
-
-/**
- * Visitor that adds [SearchMatch]es for [importElement], both with an explicit
- * prefix or an implicit one.
- */
-class _ImportElementReferencesVisitor extends RecursiveAstVisitor {
- final List<SearchMatch> matches = <SearchMatch>[];
-
- final ImportElement importElement;
- final AnalysisContext context;
- final String libraryUri;
- final String unitUri;
- Set<Element> importedElements;
-
- _ImportElementReferencesVisitor(ImportElement element, this.unitUri)
- : importElement = element,
- context = element.context,
- libraryUri = element.library.source.uri.toString() {
- importedElements = new NamespaceBuilder()
- .createImportNamespaceForDirective(element)
- .definedNames
- .values
- .toSet();
+ static SearchMatchImpl forElement(Element element) {
+ return new SearchMatchImpl(
+ element.source.fullName,
+ element.librarySource,
+ element.source,
+ element.library,
+ element,
+ true,
+ true,
+ MatchKind.DECLARATION,
+ new SourceRange(element.nameOffset, element.nameLength));
+ }
+
+ static SearchMatchImpl forSearchResult(SearchResult result) {
+ Element enclosingElement = result.enclosingElement;
+ return new SearchMatchImpl(
+ enclosingElement.source.fullName,
+ enclosingElement.librarySource,
+ enclosingElement.source,
+ enclosingElement.library,
+ enclosingElement,
+ result.isResolved,
+ result.isQualified,
+ toMatchKind(result.kind),
+ new SourceRange(result.offset, result.length));
}
- @override
- visitExportDirective(ExportDirective node) {}
-
- @override
- visitImportDirective(ImportDirective node) {}
-
- @override
- visitSimpleIdentifier(SimpleIdentifier node) {
- if (node.inDeclarationContext()) {
- return;
+ static MatchKind toMatchKind(SearchResultKind kind) {
+ if (kind == SearchResultKind.READ) {
+ return MatchKind.READ;
}
- if (importElement.prefix != null) {
- if (node.staticElement == importElement.prefix) {
- AstNode parent = node.parent;
- if (parent is PrefixedIdentifier && parent.prefix == node) {
- if (importedElements.contains(parent.staticElement)) {
- _addMatchForPrefix(node, parent.identifier);
- }
- }
- if (parent is MethodInvocation && parent.target == node) {
- if (importedElements.contains(parent.methodName.staticElement)) {
- _addMatchForPrefix(node, parent.methodName);
- }
- }
- }
- } else {
- if (importedElements.contains(node.staticElement)) {
- _addMatchForRange(range.startLength(node, 0));
- }
+ if (kind == SearchResultKind.READ_WRITE) {
+ return MatchKind.READ_WRITE;
}
- }
-
- void _addMatchForPrefix(SimpleIdentifier prefixNode, AstNode nextNode) {
- _addMatchForRange(range.startStart(prefixNode, nextNode));
- }
-
- void _addMatchForRange(SourceRange range) {
- matches.add(new SearchMatchImpl(
- context, libraryUri, unitUri, MatchKind.REFERENCE, range, true, false));
- }
-}
-
-/**
- * Visitor that adds [SearchMatch]es for local elements of a block, method,
- * class or a library - labels, local functions, local variables and parameters,
- * type parameters, import prefixes.
- */
-class _LocalReferencesVisitor extends RecursiveAstVisitor {
- final List<SearchMatch> matches = <SearchMatch>[];
-
- final Element element;
- final AnalysisContext context;
- final String libraryUri;
- final String unitUri;
-
- _LocalReferencesVisitor(Element element, [String unitUri])
- : element = element,
- context = element.context,
- libraryUri = element.library.source.uri.toString(),
- unitUri = unitUri ?? element.source.uri.toString();
-
- @override
- visitSimpleIdentifier(SimpleIdentifier node) {
- if (node.inDeclarationContext()) {
- return;
+ if (kind == SearchResultKind.WRITE) {
+ return MatchKind.WRITE;
}
- if (node.bestElement == element) {
- AstNode parent = node.parent;
- MatchKind kind = MatchKind.REFERENCE;
- if (element is FunctionElement) {
- if (parent is MethodInvocation && parent.methodName == node) {
- kind = MatchKind.INVOCATION;
- }
- } else if (element is VariableElement) {
- bool isGet = node.inGetterContext();
- bool isSet = node.inSetterContext();
- if (isGet && isSet) {
- kind = MatchKind.READ_WRITE;
- } else if (isGet) {
- if (parent is MethodInvocation && parent.methodName == node) {
- kind = MatchKind.INVOCATION;
- } else {
- kind = MatchKind.READ;
- }
- } else if (isSet) {
- kind = MatchKind.WRITE;
- }
- }
- _addMatch(node, kind);
+ if (kind == SearchResultKind.INVOCATION) {
+ return MatchKind.INVOCATION;
}
- }
-
- void _addMatch(AstNode node, MatchKind kind) {
- bool isQualified = node.parent is Label;
- matches.add(new SearchMatchImpl(context, libraryUri, unitUri, kind,
- range.node(node), true, isQualified));
+ return MatchKind.REFERENCE;
}
}

Powered by Google App Engine
This is Rietveld 408576698