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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/analysis_server/test/services/completion/arglist_contributor_test.dart

Issue 1078943003: add suggestions for named param (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: merge Created 5 years, 8 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
« no previous file with comments | « pkg/analysis_server/lib/src/services/completion/arglist_contributor.dart ('k') | pkg/analysis_server/test/services/completion/completion_test_util.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/test/services/completion/arglist_contributor_test.dart
diff --git a/pkg/analysis_server/test/services/completion/arglist_contributor_test.dart b/pkg/analysis_server/test/services/completion/arglist_contributor_test.dart
index bc8153f2a13d540c6a8780735c3b0b6484a1b2d7..64979d69050dab4dc424ad2c82f56408826d4007 100644
--- a/pkg/analysis_server/test/services/completion/arglist_contributor_test.dart
+++ b/pkg/analysis_server/test/services/completion/arglist_contributor_test.dart
@@ -6,6 +6,7 @@ library test.services.completion.dart.arglist;
import 'package:analysis_server/src/protocol.dart';
import 'package:analysis_server/src/services/completion/arglist_contributor.dart';
+import 'package:analysis_server/src/services/completion/dart_completion_manager.dart';
import 'package:unittest/unittest.dart';
import '../../reflective_tests.dart';
@@ -18,6 +19,69 @@ main() {
@reflectiveTest
class ArgListContributorTest extends AbstractCompletionTest {
+ void assertNoOtherSuggestions(Iterable<CompletionSuggestion> expected) {
+ for (CompletionSuggestion suggestion in request.suggestions) {
+ if (!expected.contains(suggestion)) {
+ failedCompletion('did not expect completion: '
+ '${suggestion.completion}\n $suggestion');
+ }
+ }
+ }
+
+ void assertSuggestArgumentList(
+ List<String> paramNames, List<String> paramTypes) {
+ CompletionSuggestionKind csKind = CompletionSuggestionKind.ARGUMENT_LIST;
+ CompletionSuggestion cs = getSuggest(csKind: csKind);
+ if (cs == null) {
+ failedCompletion('expected completion $csKind', request.suggestions);
+ }
+ assertSuggestArgumentList_params(
+ paramNames, paramTypes, cs.parameterNames, cs.parameterTypes);
+ expect(cs.relevance, DART_RELEVANCE_HIGH);
+ assertNoOtherSuggestions([cs]);
+ }
+
+ void assertSuggestArgumentList_params(List<String> expectedNames,
+ List<String> expectedTypes, List<String> actualNames,
+ List<String> actualTypes) {
+ if (actualNames != null &&
+ actualNames.length == expectedNames.length &&
+ actualTypes != null &&
+ actualTypes.length == expectedTypes.length) {
+ int index = 0;
+ while (index < expectedNames.length) {
+ if (actualNames[index] != expectedNames[index] ||
+ actualTypes[index] != expectedTypes[index]) {
+ break;
+ }
+ ++index;
+ }
+ if (index == expectedNames.length) {
+ return;
+ }
+ }
+ StringBuffer msg = new StringBuffer();
+ msg.writeln('Argument list not the same');
+ msg.writeln(' Expected names: $expectedNames');
+ msg.writeln(' found: $actualNames');
+ msg.writeln(' Expected types: $expectedTypes');
+ msg.writeln(' found: $actualTypes');
+ fail(msg.toString());
+ }
+
+ /**
+ * Assert that the specified suggestions are the only suggestions.
+ */
+ void assertSuggestArguments({List<String> namedArguments}) {
+ List<CompletionSuggestion> expected = new List<CompletionSuggestion>();
+ for (String name in namedArguments) {
+ expected.add(assertSuggest('$name: ',
+ csKind: CompletionSuggestionKind.NAMED_ARGUMENT,
+ relevance: DART_RELEVANCE_PARAMETER));
+ }
+ assertNoOtherSuggestions(expected);
+ }
+
@override
void setUpContributor() {
contributor = new ArgListContributor();
@@ -27,7 +91,7 @@ class ArgListContributorTest extends AbstractCompletionTest {
addTestSource('class A {int get foo => 7; main() {foo(^)}');
computeFast();
return computeFull((bool result) {
- assertNoSuggestions(kind: CompletionSuggestionKind.ARGUMENT_LIST);
+ assertNoSuggestions();
});
}
@@ -42,39 +106,179 @@ class ArgListContributorTest extends AbstractCompletionTest {
import '/libA.dart'
class B { }
String bar() => true;
+ void main() {expect(a^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_imported_function_1() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addSource('/libA.dart', '''
+ library A;
+ bool hasLength(int expected) { }
+ expect(String arg) { }
+ void baz() { }''');
+ addTestSource('''
+ import '/libA.dart'
+ class B { }
+ String bar() => true;
void main() {expect(^)}''');
computeFast();
return computeFull((bool result) {
- assertNoSuggestions(kind: CompletionSuggestionKind.ARGUMENT_LIST);
+ assertSuggestArgumentList(['arg'], ['String']);
});
}
-// test_ArgumentList_imported_function_1() {
-// // ArgumentList MethodInvocation ExpressionStatement Block
-// addSource('/libA.dart', '''
-// library A;
-// bool hasLength(int expected) { }
-// expect(String arg) { }
-// void baz() { }''');
-// addTestSource('''
-// import '/libA.dart'
-// class B { }
-// String bar() => true;
-// void main() {expect(^)}''');
-// computeFast();
-// return computeFull((bool result) {
-// assertSuggestArgumentList(['arg'], ['String']);
-// });
-// }
+ test_ArgumentList_imported_function_2() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addSource('/libA.dart', '''
+ library A;
+ bool hasLength(int expected) { }
+ expect(String arg1, int arg2) { }
+ void baz() { }''');
+ addTestSource('''
+ import '/libA.dart'
+ class B { }
+ String bar() => true;
+ void main() {expect(^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArgumentList(['arg1', 'arg2'], ['String', 'int']);
+ });
+ }
- test_ArgumentList_local_function_1() {
+ test_ArgumentList_imported_function_3() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addSource('/libA.dart', '''
+ library A;
+ bool hasLength(int expected) { }
+ expect(String arg1, int arg2, {bool arg3}) { }
+ void baz() { }''');
+ addTestSource('''
+ import '/libA.dart'
+ class B { }
+ String bar() => true;
+ void main() {expect(^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArgumentList(['arg1', 'arg2'], ['String', 'int']);
+ });
+ }
+
+ test_ArgumentList_imported_function_3a() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addSource('/libA.dart', '''
+ library A;
+ bool hasLength(int expected) { }
+ expect(String arg1, int arg2, {bool arg3}) { }
+ void baz() { }''');
+ addTestSource('''
+ import '/libA.dart'
+ class B { }
+ String bar() => true;
+ void main() {expect('hello', ^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_imported_function_3b() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addSource('/libA.dart', '''
+ library A;
+ bool hasLength(int expected) { }
+ expect(String arg1, int arg2, {bool arg3}) { }
+ void baz() { }''');
+ addTestSource('''
+ import '/libA.dart'
+ class B { }
+ String bar() => true;
+ void main() {expect('hello', ^x)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_imported_function_3c() {
// ArgumentList MethodInvocation ExpressionStatement Block
addSource('/libA.dart', '''
library A;
bool hasLength(int expected) { }
+ expect(String arg1, int arg2, {bool arg3}) { }
void baz() { }''');
addTestSource('''
import '/libA.dart'
+ class B { }
+ String bar() => true;
+ void main() {expect('hello', x^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_imported_function_3d() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addSource('/libA.dart', '''
+ library A;
+ bool hasLength(int expected) { }
+ expect(String arg1, int arg2, {bool arg3}) { }
+ void baz() { }''');
+ addTestSource('''
+ import '/libA.dart'
+ class B { }
+ String bar() => true;
+ void main() {expect('hello', x ^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_imported_function_named_param() {
+ //
+ addTestSource('main() { int.parse("16", ^);}');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArguments(namedArguments: ['radix', 'onError']);
+ });
+ }
+
+ test_ArgumentList_imported_function_named_param1() {
+ //
+ addTestSource('main() { int.parse("16", r^);}');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArguments(namedArguments: ['radix', 'onError']);
+ });
+ }
+
+ test_ArgumentList_imported_function_named_param2() {
+ //
+ addTestSource('main() { int.parse("16", radix: 7, ^);}');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArguments(namedArguments: ['onError']);
+ });
+ }
+
+ test_ArgumentList_imported_function_named_param2a() {
+ //
+ addTestSource('main() { int.parse("16", radix: ^);}');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_local_function_1() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addTestSource('''
+ import '/libA.dart'
expect(arg) { }
class B { }
String bar() => true;
@@ -85,6 +289,134 @@ class ArgListContributorTest extends AbstractCompletionTest {
});
}
+ test_ArgumentList_local_function_2() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addTestSource('''
+ import '/libA.dart'
+ expect(arg1, int arg2) { }
+ class B { }
+ String bar() => true;
+ void main() {expect(^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArgumentList(['arg1', 'arg2'], ['dynamic', 'int']);
+ });
+ }
+
+ test_ArgumentList_local_function_3() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addTestSource('''
+ import '/libA.dart'
+ expect(arg1, int arg2) { }
+ class B { }
+ String bar() => true;
+ void main() {expect(^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArgumentList(['arg1', 'arg2'], ['dynamic', 'int']);
+ });
+ }
+
+ test_ArgumentList_local_function_3a() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addTestSource('''
+ import '/libA.dart'
+ expect(arg1, int arg2, {bool arg3}) { }
+ class B { }
+ String bar() => true;
+ void main() {expect('hello', ^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_local_function_3b() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addTestSource('''
+ import '/libA.dart'
+ expect(arg1, int arg2, {bool arg3}) { }
+ class B { }
+ String bar() => true;
+ void main() {expect('hello', ^x)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_local_function_3c() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addTestSource('''
+ import '/libA.dart'
+ expect(arg1, int arg2, {bool arg3}) { }
+ class B { }
+ String bar() => true;
+ void main() {expect('hello', x^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_local_function_3d() {
+ // ArgumentList MethodInvocation ExpressionStatement Block
+ addTestSource('''
+ import '/libA.dart'
+ expect(arg1, int arg2, {bool arg3}) { }
+ class B { }
+ String bar() => true;
+ void main() {expect('hello', x ^)}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
+ test_ArgumentList_local_function_named_param() {
+ //
+ addTestSource('''
+f(v,{int radix, int onError(String s)}){}
+main() { f("16", ^);}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArguments(namedArguments: ['radix', 'onError']);
+ });
+ }
+
+ test_ArgumentList_local_function_named_param1() {
+ //
+ addTestSource('''
+f(v,{int radix, int onError(String s)}){}
+main() { f("16", r^);}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArguments(namedArguments: ['radix', 'onError']);
+ });
+ }
+
+ test_ArgumentList_local_function_named_param2() {
+ //
+ addTestSource('''
+f(v,{int radix, int onError(String s)}){}
+main() { f("16", radix: 7, ^);}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertSuggestArguments(namedArguments: ['onError']);
+ });
+ }
+
+ test_ArgumentList_local_function_named_param2a() {
+ //
+ addTestSource('''
+f(v,{int radix, int onError(String s)}){}
+main() { f("16", radix: ^);}''');
+ computeFast();
+ return computeFull((bool result) {
+ assertNoSuggestions();
+ });
+ }
+
test_ArgumentList_local_method_0() {
// ArgumentList MethodInvocation ExpressionStatement Block
addSource('/libA.dart', '''
@@ -99,7 +431,7 @@ class ArgListContributorTest extends AbstractCompletionTest {
String bar() => true;''');
computeFast();
return computeFull((bool result) {
- assertNoSuggestions(kind: CompletionSuggestionKind.ARGUMENT_LIST);
+ assertNoSuggestions();
});
}
« no previous file with comments | « pkg/analysis_server/lib/src/services/completion/arglist_contributor.dart ('k') | pkg/analysis_server/test/services/completion/completion_test_util.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698