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

Unified Diff: pkg/analysis_server/test/plugin/set_analysis_domain_test.dart

Issue 1337143002: Add OCCURRENCES_CONTRIBUTOR_EXTENSION_POINT_ID. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: Created 5 years, 3 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/test/plugin/set_analysis_domain_test.dart
diff --git a/pkg/analysis_server/test/plugin/set_analysis_domain_test.dart b/pkg/analysis_server/test/plugin/set_analysis_domain_test.dart
index ba2488201af5be58e0c276505644ff96c8cacdb4..a6ee01f9499f2f5a8cfccbfcf10e581f0705603a 100644
--- a/pkg/analysis_server/test/plugin/set_analysis_domain_test.dart
+++ b/pkg/analysis_server/test/plugin/set_analysis_domain_test.dart
@@ -7,8 +7,10 @@ library test.plugin.analysis_contributor;
import 'dart:async';
import 'package:analysis_server/analysis/analysis_domain.dart';
-import 'package:analysis_server/analysis/navigation/navigation_core.dart';
+import 'package:analysis_server/analysis/navigation_core.dart';
+import 'package:analysis_server/analysis/occurrences_core.dart';
import 'package:analysis_server/plugin/navigation.dart';
+import 'package:analysis_server/plugin/occurrences.dart';
import 'package:analysis_server/src/constants.dart';
import 'package:analysis_server/src/protocol.dart';
import 'package:analyzer/src/generated/engine.dart';
@@ -38,9 +40,8 @@ main() {
class SetAnalysisDomainTest extends AbstractAnalysisTest {
final Set<String> parsedUnitFiles = new Set<String>();
- List<NavigationRegion> regions;
- List<NavigationTarget> targets;
- List<String> targetFiles;
+ AnalysisNavigationParams navigationParams;
+ AnalysisOccurrencesParams occurrencesParams;
@override
void addServerPlugins(List<Plugin> plugins) {
@@ -53,9 +54,13 @@ class SetAnalysisDomainTest extends AbstractAnalysisTest {
if (notification.event == ANALYSIS_NAVIGATION) {
var params = new AnalysisNavigationParams.fromNotification(notification);
if (params.file == testFile) {
- regions = params.regions;
- targets = params.targets;
- targetFiles = params.files;
+ navigationParams = params;
+ }
+ }
+ if (notification.event == ANALYSIS_OCCURRENCES) {
+ var params = new AnalysisOccurrencesParams.fromNotification(notification);
+ if (params.file == testFile) {
+ occurrencesParams = params;
}
}
}
@@ -63,27 +68,38 @@ class SetAnalysisDomainTest extends AbstractAnalysisTest {
Future test_contributorIsInvoked() async {
createProject();
addAnalysisSubscription(AnalysisService.NAVIGATION, testFile);
+ addAnalysisSubscription(AnalysisService.OCCURRENCES, testFile);
addTestFile('// usually no navigation');
await server.onAnalysisComplete;
// we have PARSED_UNIT
expect(parsedUnitFiles, contains(testFile));
// we have an additional navigation region/target
- expect(regions, hasLength(1));
{
- NavigationRegion region = regions.single;
- expect(region.offset, 1);
- expect(region.length, 5);
- expect(region.targets.single, 0);
+ expect(navigationParams.regions, hasLength(1));
+ {
+ NavigationRegion region = navigationParams.regions.single;
+ expect(region.offset, 1);
+ expect(region.length, 5);
+ expect(region.targets.single, 0);
+ }
+ {
+ NavigationTarget target = navigationParams.targets.single;
+ expect(target.fileIndex, 0);
+ expect(target.offset, 1);
+ expect(target.length, 2);
+ expect(target.startLine, 3);
+ expect(target.startColumn, 4);
+ }
+ expect(navigationParams.files.single, '/testLocation.dart');
}
+ // we have additional occurrences
{
- NavigationTarget target = targets.single;
- expect(target.fileIndex, 0);
- expect(target.offset, 1);
- expect(target.length, 2);
- expect(target.startLine, 3);
- expect(target.startColumn, 4);
+ expect(occurrencesParams.occurrences, hasLength(1));
+ Occurrences occurrences = occurrencesParams.occurrences.single;
+ expect(occurrences.element.name, 'TestElement');
+ expect(occurrences.length, 5);
+ expect(occurrences.offsets, unorderedEquals([1, 2, 3]));
}
- expect(targetFiles.single, '/testLocation.dart');
}
}
@@ -100,6 +116,19 @@ class TestNavigationContributor implements NavigationContributor {
}
}
+class TestOccurrencesContributor implements OccurrencesContributor {
+ final SetAnalysisDomainTest test;
+
+ TestOccurrencesContributor(this.test);
+
+ @override
+ void computeOccurrences(
+ OccurrencesCollector collector, AnalysisContext context, Source source) {
+ collector.addOccurrences(new Occurrences(
+ new Element(ElementKind.UNKNOWN, 'TestElement', 0), <int>[1, 2, 3], 5));
+ }
+}
+
class TestSetAnalysisDomainPlugin implements Plugin {
final SetAnalysisDomainTest test;
@@ -116,6 +145,8 @@ class TestSetAnalysisDomainPlugin implements Plugin {
register(SET_ANALYSIS_DOMAIN_EXTENSION_POINT_ID, _setAnalysisDomain);
register(NAVIGATION_CONTRIBUTOR_EXTENSION_POINT_ID,
new TestNavigationContributor(test));
+ register(OCCURRENCES_CONTRIBUTOR_EXTENSION_POINT_ID,
+ new TestOccurrencesContributor(test));
}
void _setAnalysisDomain(AnalysisDomain domain) {
@@ -127,6 +158,8 @@ class TestSetAnalysisDomainPlugin implements Plugin {
test.parsedUnitFiles.add(source.fullName);
domain.scheduleNotification(
result.context, source, AnalysisService.NAVIGATION);
+ domain.scheduleNotification(
+ result.context, source, AnalysisService.OCCURRENCES);
});
}
}

Powered by Google App Engine
This is Rietveld 408576698