| Index: pkg/analysis_server/test/services/completion/local_computer_test.dart
|
| diff --git a/pkg/analysis_server/test/services/completion/local_computer_test.dart b/pkg/analysis_server/test/services/completion/local_computer_test.dart
|
| index 433ff77b11455a5aba3d501261a92e726277347b..bf5a493905c4148f38e6ab1ff609e544e909c91f 100644
|
| --- a/pkg/analysis_server/test/services/completion/local_computer_test.dart
|
| +++ b/pkg/analysis_server/test/services/completion/local_computer_test.dart
|
| @@ -19,14 +19,11 @@ main() {
|
|
|
| @reflectiveTest
|
| class LocalComputerTest extends AbstractSelectorSuggestionTest {
|
| -
|
| @override
|
| - CompletionSuggestion assertSuggestLocalClass(String name, {int relevance:
|
| - DART_RELEVANCE_DEFAULT, bool isDeprecated: false}) {
|
| - return assertSuggestClass(
|
| - name,
|
| - relevance: relevance,
|
| - isDeprecated: isDeprecated);
|
| + CompletionSuggestion assertSuggestLocalClass(String name,
|
| + {int relevance: DART_RELEVANCE_DEFAULT, bool isDeprecated: false}) {
|
| + return assertSuggestClass(name,
|
| + relevance: relevance, isDeprecated: isDeprecated);
|
| }
|
|
|
| @override
|
| @@ -38,73 +35,60 @@ class LocalComputerTest extends AbstractSelectorSuggestionTest {
|
| @override
|
| CompletionSuggestion assertSuggestLocalField(String name, String type,
|
| {int relevance: DART_RELEVANCE_LOCAL_FIELD, bool deprecated: false}) {
|
| - return assertSuggestField(
|
| - name,
|
| - type,
|
| - relevance: relevance,
|
| - isDeprecated: deprecated);
|
| + return assertSuggestField(name, type,
|
| + relevance: relevance, isDeprecated: deprecated);
|
| }
|
|
|
| @override
|
| - CompletionSuggestion assertSuggestLocalFunction(String name,
|
| - String returnType, {bool deprecated: false, int relevance:
|
| - DART_RELEVANCE_LOCAL_FUNCTION}) {
|
| + CompletionSuggestion assertSuggestLocalFunction(
|
| + String name, String returnType,
|
| + {bool deprecated: false, int relevance: DART_RELEVANCE_LOCAL_FUNCTION}) {
|
| return assertSuggestFunction(name, returnType, deprecated, relevance);
|
| }
|
|
|
| @override
|
| - CompletionSuggestion assertSuggestLocalFunctionTypeAlias(String name,
|
| - String returnType, {bool deprecated: false, int relevance:
|
| - DART_RELEVANCE_DEFAULT}) {
|
| + CompletionSuggestion assertSuggestLocalFunctionTypeAlias(
|
| + String name, String returnType,
|
| + {bool deprecated: false, int relevance: DART_RELEVANCE_DEFAULT}) {
|
| return assertSuggestFunctionTypeAlias(
|
| - name,
|
| - returnType,
|
| - deprecated,
|
| - relevance);
|
| + name, returnType, deprecated, relevance);
|
| }
|
|
|
| @override
|
| CompletionSuggestion assertSuggestLocalGetter(String name, String returnType,
|
| {int relevance: DART_RELEVANCE_LOCAL_ACCESSOR, bool deprecated: false}) {
|
| - return assertSuggestGetter(
|
| - name,
|
| - returnType,
|
| - relevance: relevance,
|
| - isDeprecated: deprecated);
|
| + return assertSuggestGetter(name, returnType,
|
| + relevance: relevance, isDeprecated: deprecated);
|
| }
|
|
|
| @override
|
| - CompletionSuggestion assertSuggestLocalMethod(String name,
|
| - String declaringType, String returnType, {int relevance:
|
| - DART_RELEVANCE_LOCAL_METHOD, bool deprecated: false}) {
|
| - return assertSuggestMethod(
|
| - name,
|
| - declaringType,
|
| - returnType,
|
| - relevance: relevance,
|
| - isDeprecated: deprecated);
|
| + CompletionSuggestion assertSuggestLocalMethod(
|
| + String name, String declaringType, String returnType,
|
| + {int relevance: DART_RELEVANCE_LOCAL_METHOD, bool deprecated: false}) {
|
| + return assertSuggestMethod(name, declaringType, returnType,
|
| + relevance: relevance, isDeprecated: deprecated);
|
| }
|
|
|
| @override
|
| - CompletionSuggestion assertSuggestLocalSetter(String name, {int relevance:
|
| - DART_RELEVANCE_LOCAL_ACCESSOR}) {
|
| + CompletionSuggestion assertSuggestLocalSetter(String name,
|
| + {int relevance: DART_RELEVANCE_LOCAL_ACCESSOR}) {
|
| return assertSuggestSetter(name, relevance);
|
| }
|
|
|
| @override
|
| - CompletionSuggestion assertSuggestLocalTopLevelVar(String name,
|
| - String returnType, {int relevance: DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE}) {
|
| + CompletionSuggestion assertSuggestLocalTopLevelVar(
|
| + String name, String returnType,
|
| + {int relevance: DART_RELEVANCE_LOCAL_TOP_LEVEL_VARIABLE}) {
|
| return assertSuggestTopLevelVar(name, returnType, relevance);
|
| }
|
|
|
| @override
|
| - CompletionSuggestion assertSuggestLocalVariable(String name,
|
| - String returnType, {int relevance: DART_RELEVANCE_LOCAL_VARIABLE}) {
|
| + CompletionSuggestion assertSuggestLocalVariable(
|
| + String name, String returnType,
|
| + {int relevance: DART_RELEVANCE_LOCAL_VARIABLE}) {
|
| // Local variables should only be suggested by LocalComputer
|
| - CompletionSuggestion cs = assertSuggest(
|
| - name,
|
| - csKind: CompletionSuggestionKind.INVOCATION,
|
| - relevance: relevance);
|
| + CompletionSuggestion cs = assertSuggest(name,
|
| + csKind: CompletionSuggestionKind.INVOCATION, relevance: relevance);
|
| expect(cs.returnType, returnType != null ? returnType : 'dynamic');
|
| Element element = cs.element;
|
| expect(element, isNotNull);
|
| @@ -118,18 +102,15 @@ class LocalComputerTest extends AbstractSelectorSuggestionTest {
|
|
|
| CompletionSuggestion assertSuggestParameter(String name, String returnType,
|
| {int relevance: DART_RELEVANCE_PARAMETER}) {
|
| - CompletionSuggestion cs = assertSuggest(
|
| - name,
|
| - csKind: CompletionSuggestionKind.INVOCATION,
|
| - relevance: relevance);
|
| + CompletionSuggestion cs = assertSuggest(name,
|
| + csKind: CompletionSuggestionKind.INVOCATION, relevance: relevance);
|
| expect(cs.returnType, returnType != null ? returnType : 'dynamic');
|
| Element element = cs.element;
|
| expect(element, isNotNull);
|
| expect(element.kind, equals(ElementKind.PARAMETER));
|
| expect(element.name, equals(name));
|
| expect(element.parameters, isNull);
|
| - expect(
|
| - element.returnType,
|
| + expect(element.returnType,
|
| equals(returnType != null ? returnType : 'dynamic'));
|
| return cs;
|
| }
|
|
|