Index: pkg/analysis_server/test/domain_completion_test.dart |
diff --git a/pkg/analysis_server/test/domain_completion_test.dart b/pkg/analysis_server/test/domain_completion_test.dart |
index e042afabb901778c2ec82e9f5f64046528e99a4a..83dd415b308b4a4d862c681f8f0e52ba2bf2ac11 100644 |
--- a/pkg/analysis_server/test/domain_completion_test.dart |
+++ b/pkg/analysis_server/test/domain_completion_test.dart |
@@ -46,14 +46,9 @@ class CompletionManagerTest extends AbstractAnalysisTest { |
String testFile2 = '/project/bin/test2.dart'; |
AnalysisServer createAnalysisServer(Index index) { |
- return new Test_AnalysisServer( |
- super.serverChannel, |
- super.resourceProvider, |
- super.packageMapProvider, |
- index, |
- new AnalysisServerOptions(), |
- new MockSdk(), |
- InstrumentationService.NULL_SERVICE); |
+ return new Test_AnalysisServer(super.serverChannel, super.resourceProvider, |
+ super.packageMapProvider, index, new AnalysisServerOptions(), |
+ new MockSdk(), InstrumentationService.NULL_SERVICE); |
} |
@override |
@@ -262,9 +257,8 @@ class CompletionTest extends AbstractAnalysisTest { |
expect(completionOffset, isNot(equals(-1)), reason: 'missing ^'); |
int nextOffset = content.indexOf('^', completionOffset + 1); |
expect(nextOffset, equals(-1), reason: 'too many ^'); |
- return super.addTestFile( |
- content.substring(0, completionOffset) + |
- content.substring(completionOffset + 1)); |
+ return super.addTestFile(content.substring(0, completionOffset) + |
+ content.substring(completionOffset + 1)); |
} |
void assertHasResult(CompletionSuggestionKind kind, String completion, |
@@ -310,8 +304,8 @@ class CompletionTest extends AbstractAnalysisTest { |
Future getSuggestions() { |
return waitForTasksFinished().then((_) { |
- Request request = |
- new CompletionGetSuggestionsParams(testFile, completionOffset).toRequest('0'); |
+ Request request = new CompletionGetSuggestionsParams( |
+ testFile, completionOffset).toRequest('0'); |
Response response = handleSuccessfulRequest(request); |
completionId = response.id; |
assertValidId(completionId); |
@@ -409,13 +403,9 @@ class CompletionTest extends AbstractAnalysisTest { |
expect(replacementOffset, equals(completionOffset - 2)); |
expect(replacementLength, equals(2)); |
assertHasResult( |
- CompletionSuggestionKind.KEYWORD, |
- 'import', |
- DART_RELEVANCE_HIGH); |
+ CompletionSuggestionKind.KEYWORD, 'import', DART_RELEVANCE_HIGH); |
assertHasResult( |
- CompletionSuggestionKind.KEYWORD, |
- 'class', |
- DART_RELEVANCE_HIGH); |
+ CompletionSuggestionKind.KEYWORD, 'class', DART_RELEVANCE_HIGH); |
}); |
} |
@@ -436,16 +426,10 @@ class CompletionTest extends AbstractAnalysisTest { |
expect(replacementLength, equals(0)); |
assertHasResult(CompletionSuggestionKind.INVOCATION, 'A'); |
assertHasResult( |
- CompletionSuggestionKind.INVOCATION, |
- 'a', |
- DART_RELEVANCE_LOCAL_FIELD); |
- assertHasResult( |
- CompletionSuggestionKind.INVOCATION, |
- 'b', |
+ CompletionSuggestionKind.INVOCATION, 'a', DART_RELEVANCE_LOCAL_FIELD); |
+ assertHasResult(CompletionSuggestionKind.INVOCATION, 'b', |
DART_RELEVANCE_LOCAL_VARIABLE); |
- assertHasResult( |
- CompletionSuggestionKind.INVOCATION, |
- 'x', |
+ assertHasResult(CompletionSuggestionKind.INVOCATION, 'x', |
DART_RELEVANCE_LOCAL_METHOD); |
}); |
} |
@@ -516,9 +500,7 @@ class CompletionTest extends AbstractAnalysisTest { |
expect(replacementLength, equals(4)); |
// Suggestions based upon imported elements are partially filtered |
//assertHasResult(CompletionSuggestionKind.INVOCATION, 'Object'); |
- assertHasResult( |
- CompletionSuggestionKind.INVOCATION, |
- 'test', |
+ assertHasResult(CompletionSuggestionKind.INVOCATION, 'test', |
DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE); |
assertNoResult('HtmlElement'); |
}); |
@@ -602,8 +584,8 @@ class MockStream<E> implements Stream<E> { |
int get cancelCount => mockSubscription.cancelCount; |
@override |
- StreamSubscription<E> listen(void onData(E event), {Function onError, void |
- onDone(), bool cancelOnError}) { |
+ StreamSubscription<E> listen(void onData(E event), |
+ {Function onError, void onDone(), bool cancelOnError}) { |
++listenCount; |
return mockSubscription; |
} |
@@ -630,16 +612,10 @@ class Test_AnalysisServer extends AnalysisServer { |
Test_AnalysisServer(ServerCommunicationChannel channel, |
ResourceProvider resourceProvider, PackageMapProvider packageMapProvider, |
- Index index, AnalysisServerOptions analysisServerOptions, DartSdk defaultSdk, |
- InstrumentationService instrumentationService) |
- : super( |
- channel, |
- resourceProvider, |
- packageMapProvider, |
- index, |
- analysisServerOptions, |
- defaultSdk, |
- instrumentationService); |
+ Index index, AnalysisServerOptions analysisServerOptions, |
+ DartSdk defaultSdk, InstrumentationService instrumentationService) |
+ : super(channel, resourceProvider, packageMapProvider, index, |
+ analysisServerOptions, defaultSdk, instrumentationService); |
AnalysisContext getAnalysisContext(String path) { |
return mockContext; |
@@ -651,7 +627,6 @@ class Test_AnalysisServer extends AnalysisServer { |
* so that the domain handler cache management can be tested. |
*/ |
class Test_CompletionDomainHandler extends CompletionDomainHandler { |
- |
Test_CompletionDomainHandler(Test_AnalysisServer server) : super(server); |
MockContext get mockContext => (server as Test_AnalysisServer).mockContext; |
@@ -659,19 +634,18 @@ class Test_CompletionDomainHandler extends CompletionDomainHandler { |
MockCompletionManager get mockManager => manager; |
void contextsChanged(ContextsChangedEvent event) { |
- contextsChangedRaw( |
- new ContextsChangedEvent( |
- added: event.added.length > 0 ? [mockContext] : [], |
- changed: event.changed.length > 0 ? [mockContext] : [], |
- removed: event.removed.length > 0 ? [mockContext] : [])); |
+ contextsChangedRaw(new ContextsChangedEvent( |
+ added: event.added.length > 0 ? [mockContext] : [], |
+ changed: event.changed.length > 0 ? [mockContext] : [], |
+ removed: event.removed.length > 0 ? [mockContext] : [])); |
} |
void contextsChangedRaw(ContextsChangedEvent newEvent) { |
super.contextsChanged(newEvent); |
} |
- CompletionManager createCompletionManager(AnalysisContext context, |
- Source source, SearchEngine searchEngine) { |
+ CompletionManager createCompletionManager( |
+ AnalysisContext context, Source source, SearchEngine searchEngine) { |
return new MockCompletionManager(mockContext, source, searchEngine); |
} |
} |