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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 791553007: suggest fields rather than synthetic getters (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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
« pkg/analysis_server/lib/src/services/completion/suggestion_builder.dart ('K') | « pkg/analysis_server/test/protocol_server_test.dart ('k') | pkg/analysis_server/test/services/completion/imported_computer_test.dart » ('j') | pkg/analysis_server/tool/spec/spec_input.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/analysis_server/test/services/completion/completion_test_util.dart
diff --git a/pkg/analysis_server/test/services/completion/completion_test_util.dart b/pkg/analysis_server/test/services/completion/completion_test_util.dart
index 39277112a35bdebcdd60a7973ce803b3e29e7116..5cc2f7617a8a5372d104e340f4fabd69fe8f57b8 100644
--- a/pkg/analysis_server/test/services/completion/completion_test_util.dart
+++ b/pkg/analysis_server/test/services/completion/completion_test_util.dart
@@ -98,13 +98,14 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
CompletionSuggestion assertSuggest(String completion,
{CompletionSuggestionKind csKind: CompletionSuggestionKind.INVOCATION,
- int relevance: COMPLETION_RELEVANCE_DEFAULT,
- protocol.ElementKind elemKind: null, bool isDeprecated: false, bool isPotential:
- false}) {
+ int relevance: COMPLETION_RELEVANCE_DEFAULT, protocol.ElementKind elemKind:
+ null, bool isDeprecated: false, bool isPotential: false}) {
CompletionSuggestion cs =
getSuggest(completion: completion, csKind: csKind, elemKind: elemKind);
if (cs == null) {
- failedCompletion('expected $completion $csKind', request.suggestions);
+ failedCompletion(
+ 'expected $completion $csKind $elemKind',
+ request.suggestions);
}
expect(cs.kind, equals(csKind));
if (isDeprecated) {
@@ -162,9 +163,9 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
fail(msg.toString());
}
- CompletionSuggestion assertSuggestClass(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
+ CompletionSuggestion assertSuggestClass(String name, [int relevance =
+ COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind =
+ CompletionSuggestionKind.INVOCATION]) {
CompletionSuggestion cs =
assertSuggest(name, csKind: kind, relevance: relevance);
protocol.Element element = cs.element;
@@ -176,9 +177,9 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
return cs;
}
- CompletionSuggestion assertSuggestClassTypeAlias(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
+ CompletionSuggestion assertSuggestClassTypeAlias(String name, [int relevance =
+ COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind =
+ CompletionSuggestionKind.INVOCATION]) {
CompletionSuggestion cs =
assertSuggest(name, csKind: kind, relevance: relevance);
protocol.Element element = cs.element;
@@ -190,27 +191,24 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
return cs;
}
- CompletionSuggestion assertSuggestField(String name,
- {int relevance: COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind: CompletionSuggestionKind.INVOCATION,
- bool isDeprecated: false}) {
+ CompletionSuggestion assertSuggestField(String name, String type,
+ {int relevance: COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind:
+ CompletionSuggestionKind.INVOCATION, bool isDeprecated: false}) {
CompletionSuggestion cs = assertSuggest(
name,
csKind: kind,
relevance: relevance,
elemKind: protocol.ElementKind.FIELD,
isDeprecated: isDeprecated);
- expect(cs.returnType, isNull);
+ // The returnType represents the type of a field
+ expect(cs.returnType, type != null ? type : 'dynamic');
protocol.Element element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(protocol.ElementKind.FIELD));
expect(element.name, equals(name));
expect(element.parameters, isNull);
- // TODO (danrubel) return type should be null and there should be
- // something that represents the type of the field
- if (element.returnType != null) {
- expect(element.returnType, 'dynamic');
- }
+ // The returnType represents the type of a field
+ expect(element.returnType, type != null ? type : 'dynamic');
return cs;
}
@@ -222,7 +220,7 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated);
- expect(cs.returnType, equals(returnType));
+ expect(cs.returnType, returnType != null ? returnType : 'dynamic');
protocol.Element element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(protocol.ElementKind.FUNCTION));
@@ -247,7 +245,7 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
csKind: kind,
relevance: relevance,
isDeprecated: isDeprecated);
- expect(cs.returnType, equals(returnType));
+ expect(cs.returnType, returnType != null ? returnType : 'dynamic');
protocol.Element element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(protocol.ElementKind.FUNCTION_TYPE_ALIAS));
@@ -266,16 +264,15 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
}
CompletionSuggestion assertSuggestGetter(String name, String returnType,
- {int relevance: COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind: CompletionSuggestionKind.INVOCATION,
- bool isDeprecated: false}) {
+ {int relevance: COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind:
+ CompletionSuggestionKind.INVOCATION, bool isDeprecated: false}) {
CompletionSuggestion cs = assertSuggest(
name,
csKind: kind,
relevance: relevance,
elemKind: protocol.ElementKind.GETTER,
isDeprecated: isDeprecated);
- expect(cs.returnType, equals(returnType));
+ expect(cs.returnType, returnType != null ? returnType : 'dynamic');
protocol.Element element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(protocol.ElementKind.GETTER));
@@ -289,9 +286,9 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
return cs;
}
- CompletionSuggestion assertSuggestLibraryPrefix(String prefix,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
+ CompletionSuggestion assertSuggestLibraryPrefix(String prefix, [int relevance
+ = COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind =
+ CompletionSuggestionKind.INVOCATION]) {
// Library prefix should only be suggested by ImportedComputer
if (computer is ImportedComputer) {
CompletionSuggestion cs =
@@ -314,15 +311,13 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
if (computer is LocalComputer) {
CompletionSuggestion cs =
assertSuggest(name, csKind: kind, relevance: relevance);
- expect(cs.returnType, equals(returnType));
+ expect(cs.returnType, returnType != null ? returnType : 'dynamic');
protocol.Element element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(protocol.ElementKind.LOCAL_VARIABLE));
expect(element.name, equals(name));
expect(element.parameters, isNull);
- expect(
- element.returnType,
- equals(returnType != null ? returnType : 'dynamic'));
+ expect(element.returnType, returnType != null ? returnType : 'dynamic');
return cs;
} else {
return assertNotSuggested(name);
@@ -335,7 +330,7 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
CompletionSuggestion cs =
assertSuggest(name, csKind: kind, relevance: relevance);
expect(cs.declaringType, equals(declaringType));
- expect(cs.returnType, equals(returnType));
+ expect(cs.returnType, returnType != null ? returnType : 'dynamic');
protocol.Element element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(protocol.ElementKind.METHOD));
@@ -344,9 +339,7 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
expect(param, isNotNull);
expect(param[0], equals('('));
expect(param[param.length - 1], equals(')'));
- expect(
- element.returnType,
- equals(returnType != null ? returnType : 'dynamic'));
+ expect(element.returnType, returnType != null ? returnType : 'dynamic');
return cs;
}
@@ -372,13 +365,13 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
}
CompletionSuggestion assertSuggestParameter(String name, String returnType,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
+ [int relevance = COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind =
+ CompletionSuggestionKind.INVOCATION]) {
// Parameters should only be suggested by LocalComputer
if (computer is LocalComputer) {
CompletionSuggestion cs =
assertSuggest(name, csKind: kind, relevance: relevance);
- expect(cs.returnType, equals(returnType));
+ expect(cs.returnType, returnType != null ? returnType : 'dynamic');
protocol.Element element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(protocol.ElementKind.PARAMETER));
@@ -393,9 +386,9 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
}
}
- CompletionSuggestion assertSuggestSetter(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
+ CompletionSuggestion assertSuggestSetter(String name, [int relevance =
+ COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind =
+ CompletionSuggestionKind.INVOCATION]) {
CompletionSuggestion cs = assertSuggest(
name,
csKind: kind,
@@ -415,20 +408,17 @@ abstract class AbstractCompletionTest extends AbstractContextTest {
}
CompletionSuggestion assertSuggestTopLevelVar(String name, String returnType,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
+ [int relevance = COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind =
+ CompletionSuggestionKind.INVOCATION]) {
CompletionSuggestion cs =
assertSuggest(name, csKind: kind, relevance: relevance);
- expect(cs.returnType, equals(returnType));
+ expect(cs.returnType, returnType != null ? returnType : 'dynamic');
protocol.Element element = cs.element;
expect(element, isNotNull);
expect(element.kind, equals(protocol.ElementKind.TOP_LEVEL_VARIABLE));
expect(element.name, equals(name));
expect(element.parameters, isNull);
- //TODO (danrubel) return type level variable 'type' but not as 'returnType'
-// expect(
-// element.returnType,
-// equals(returnType != null ? returnType : 'dynamic'));
+ expect(element.returnType, returnType != null ? returnType : 'dynamic');
return cs;
}
@@ -600,9 +590,9 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestImportedClass(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
+ CompletionSuggestion assertSuggestImportedClass(String name, [int relevance =
+ COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind =
+ CompletionSuggestionKind.INVOCATION]) {
if (computer is ImportedComputer) {
return assertSuggestClass(name, relevance, kind);
} else {
@@ -610,13 +600,9 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestImportedField(String name,
+ CompletionSuggestion assertSuggestImportedField(String name, String type,
[int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
- if (computer is ImportedComputer) {
- return assertSuggestField(name, relevance: relevance);
- } else {
- return assertNotSuggested(name);
- }
+ return assertNotSuggested(name);
}
CompletionSuggestion assertSuggestImportedFunction(String name,
@@ -652,8 +638,7 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
CompletionSuggestion assertSuggestImportedGetter(String name,
- String returnType, [int relevance =
- COMPLETION_RELEVANCE_DEFAULT]) {
+ String returnType, [int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
if (computer is ImportedComputer) {
return assertSuggestGetter(name, returnType, relevance: relevance);
} else {
@@ -671,8 +656,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestImportedSetter(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
+ CompletionSuggestion assertSuggestImportedSetter(String name, [int relevance =
+ COMPLETION_RELEVANCE_DEFAULT]) {
if (computer is ImportedComputer) {
return assertSuggestSetter(name, relevance);
} else {
@@ -690,8 +675,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestInvocationClass(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
+ CompletionSuggestion assertSuggestInvocationClass(String name, [int relevance
+ = COMPLETION_RELEVANCE_DEFAULT]) {
if (computer is InvocationComputer) {
return assertSuggestClass(name, relevance);
} else {
@@ -699,6 +684,11 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
+ CompletionSuggestion assertSuggestInvocationField(String name, String type,
+ {int relevance: COMPLETION_RELEVANCE_DEFAULT, bool isDeprecated: false}) {
+ return assertNotSuggested(name);
+ }
+
CompletionSuggestion assertSuggestInvocationGetter(String name,
String returnType, {int relevance: COMPLETION_RELEVANCE_DEFAULT,
bool isDeprecated: false}) {
@@ -723,8 +713,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestInvocationSetter(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
+ CompletionSuggestion assertSuggestInvocationSetter(String name, [int relevance
+ = COMPLETION_RELEVANCE_DEFAULT]) {
if (computer is InvocationComputer) {
return assertSuggestSetter(name);
} else {
@@ -733,8 +723,7 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
CompletionSuggestion assertSuggestInvocationTopLevelVar(String name,
- String returnType, [int relevance =
- COMPLETION_RELEVANCE_DEFAULT]) {
+ String returnType, [int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
if (computer is InvocationComputer) {
return assertSuggestTopLevelVar(name, returnType, relevance);
} else {
@@ -742,8 +731,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestLocalClass(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
+ CompletionSuggestion assertSuggestLocalClass(String name, [int relevance =
+ COMPLETION_RELEVANCE_DEFAULT]) {
if (computer is LocalComputer) {
return assertSuggestClass(name, relevance);
} else {
@@ -760,13 +749,9 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestLocalField(String name,
+ CompletionSuggestion assertSuggestLocalField(String name, String type,
[int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
- if (computer is LocalComputer) {
- return assertSuggestField(name, relevance: relevance);
- } else {
- return assertNotSuggested(name);
- }
+ return assertNotSuggested(name);
}
CompletionSuggestion assertSuggestLocalFunction(String name,
@@ -812,8 +797,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestLocalSetter(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
+ CompletionSuggestion assertSuggestLocalSetter(String name, [int relevance =
+ COMPLETION_RELEVANCE_DEFAULT]) {
if (computer is LocalComputer) {
return assertSuggestSetter(name, relevance);
} else {
@@ -822,8 +807,7 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
CompletionSuggestion assertSuggestLocalTopLevelVar(String name,
- String returnType, [int relevance =
- COMPLETION_RELEVANCE_DEFAULT]) {
+ String returnType, [int relevance = COMPLETION_RELEVANCE_DEFAULT]) {
if (computer is LocalComputer) {
return assertSuggestTopLevelVar(name, returnType, relevance);
} else {
@@ -831,9 +815,9 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
}
}
- CompletionSuggestion assertSuggestNonLocalClass(String name,
- [int relevance = COMPLETION_RELEVANCE_DEFAULT,
- CompletionSuggestionKind kind = CompletionSuggestionKind.INVOCATION]) {
+ CompletionSuggestion assertSuggestNonLocalClass(String name, [int relevance =
+ COMPLETION_RELEVANCE_DEFAULT, CompletionSuggestionKind kind =
+ CompletionSuggestionKind.INVOCATION]) {
return assertSuggestImportedClass(name, relevance, kind);
}
@@ -1305,10 +1289,10 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
class A extends E implements I with M {a() {^}}''');
computeFast();
return computeFull((bool result) {
- assertSuggestImportedField('e1');
- assertSuggestImportedField('f1');
- assertSuggestImportedField('i1');
- assertSuggestImportedField('m1');
+ assertSuggestImportedField('e1', null);
+ assertSuggestImportedField('f1', null);
+ assertSuggestImportedField('i1', 'int');
+ assertSuggestImportedField('m1', null);
assertSuggestImportedGetter('f3', null);
assertSuggestImportedSetter('f4');
//TODO (danrubel) include declared type in suggestion
@@ -1330,10 +1314,10 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
class A extends E implements I with M {a() {^}}''');
computeFast();
return computeFull((bool result) {
- assertSuggestLocalField('e1');
- assertSuggestLocalField('f1');
- assertSuggestLocalField('i1');
- assertSuggestLocalField('m1');
+ assertSuggestLocalField('e1', null);
+ assertSuggestLocalField('f1', null);
+ assertSuggestLocalField('i1', 'int');
+ assertSuggestLocalField('m1', null);
assertSuggestLocalGetter('f3', null);
assertSuggestLocalSetter('f4');
assertSuggestLocalMethod('e2', 'E', null);
@@ -1356,8 +1340,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
main() {A a; a.^.z}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('b', null);
- assertSuggestInvocationGetter('_c', 'X');
+ assertSuggestInvocationField('b', null);
+ assertSuggestInvocationField('_c', 'X');
assertNotSuggested('Object');
assertNotSuggested('A');
assertNotSuggested('B');
@@ -1378,8 +1362,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
main() {A a; a..^z}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('b', null);
- assertSuggestInvocationGetter('_c', 'X');
+ assertSuggestInvocationField('b', null);
+ assertSuggestInvocationField('_c', 'X');
assertNotSuggested('Object');
assertNotSuggested('A');
assertNotSuggested('B');
@@ -1400,8 +1384,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
main() {A a; a..^ return}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('b', null);
- assertSuggestInvocationGetter('_c', 'X');
+ assertSuggestInvocationField('b', null);
+ assertSuggestInvocationField('_c', 'X');
assertNotSuggested('Object');
assertNotSuggested('A');
assertNotSuggested('B');
@@ -1545,8 +1529,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
class A {var b; X _c; foo() {A a; if (^) something}}''');
computeFast();
return computeFull((bool result) {
- assertSuggestLocalField('b');
- assertSuggestLocalField('_c');
+ assertSuggestLocalField('b', null);
+ assertSuggestLocalField('_c', 'X');
assertSuggestImportedClass('Object');
assertSuggestLocalClass('A');
assertNotSuggested('==');
@@ -2048,13 +2032,13 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
expect(methodA.element.isPrivate, isTrue);
}
CompletionSuggestion getterF =
- assertSuggestLocalField('f', COMPLETION_RELEVANCE_LOW);
+ assertSuggestLocalField('f', 'X', COMPLETION_RELEVANCE_LOW);
if (getterF != null) {
expect(getterF.element.isDeprecated, isTrue);
expect(getterF.element.isPrivate, isFalse);
expect(getterF.element.parameters, isNull);
}
- CompletionSuggestion getterG = assertSuggestLocalField('_g');
+ CompletionSuggestion getterG = assertSuggestLocalField('_g', null);
if (getterG != null) {
expect(getterG.element.isDeprecated, isFalse);
expect(getterG.element.isPrivate, isTrue);
@@ -2217,9 +2201,9 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
main() {A.^}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('scA', 'String');
- assertSuggestInvocationGetter('scB', 'int');
- assertSuggestInvocationGetter('scI', null);
+ assertSuggestInvocationField('scA', 'String');
+ assertSuggestInvocationField('scB', 'int');
+ assertSuggestInvocationField('scI', null);
assertNotSuggested('b');
assertNotSuggested('_c');
assertNotSuggested('d');
@@ -2256,8 +2240,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
main() {A a; a.^}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('sc', 'int');
- assertSuggestInvocationGetter('b', null, isDeprecated: true);
+ assertSuggestInvocationField('sc', 'int');
+ assertSuggestInvocationField('b', null, isDeprecated: true);
assertNotSuggested('_c');
assertSuggestInvocationGetter('d', 'X');
assertNotSuggested('_e');
@@ -2289,9 +2273,9 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
class X{}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('sc', 'int');
- assertSuggestInvocationGetter('b', null);
- assertSuggestInvocationGetter('_c', 'X');
+ assertSuggestInvocationField('sc', 'int');
+ assertSuggestInvocationField('b', null);
+ assertSuggestInvocationField('_c', 'X');
assertSuggestInvocationGetter('d', 'X');
assertSuggestInvocationGetter('_e', null);
assertSuggestInvocationGetter('f', 'X');
@@ -2345,7 +2329,7 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
foo(X x) {x.^}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('y', 'M');
+ assertSuggestInvocationField('y', 'M');
assertNotSuggested('_z');
assertNotSuggested('==');
});
@@ -2431,8 +2415,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
class X{}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('b', null);
- assertSuggestInvocationGetter('_c', 'X');
+ assertSuggestInvocationField('b', null);
+ assertSuggestInvocationField('_c', 'X');
assertSuggestInvocationGetter('d', 'X');
assertSuggestInvocationGetter('_e', null);
assertSuggestInvocationGetter('f', 'X');
@@ -2466,8 +2450,8 @@ abstract class AbstractSelectorSuggestionTest extends AbstractCompletionTest {
class X{}''');
computeFast();
return computeFull((bool result) {
- assertSuggestInvocationGetter('b', null);
- assertSuggestInvocationGetter('_c', 'X');
+ assertSuggestInvocationField('b', null);
+ assertSuggestInvocationField('_c', 'X');
assertSuggestInvocationGetter('d', 'X');
assertSuggestInvocationGetter('_e', null);
assertSuggestInvocationGetter('f', 'X');
« pkg/analysis_server/lib/src/services/completion/suggestion_builder.dart ('K') | « pkg/analysis_server/test/protocol_server_test.dart ('k') | pkg/analysis_server/test/services/completion/imported_computer_test.dart » ('j') | pkg/analysis_server/tool/spec/spec_input.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698