Skip to content

Commit ebed8dd

Browse files
FMorschelCommit Queue
FMorschel
authored and
Commit Queue
committed
[DAS] Fixes todo of using computeSuggestions instead of addTestFile
Change-Id: I5acd99d8a6e27d65db77f69d88f2610f3503679e Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/442726 Reviewed-by: Konstantin Shcheglov <[email protected]> Auto-Submit: Felipe Morschel <[email protected]> Reviewed-by: Samuel Rawlins <[email protected]> Commit-Queue: Samuel Rawlins <[email protected]>
1 parent c1c6225 commit ebed8dd

File tree

9 files changed

+45
-45
lines changed

9 files changed

+45
-45
lines changed

‎pkg/analysis_server/test/client/completion_driver_test.dart

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// BSD-style license that can be found in the LICENSE file.
44

55
import 'package:analyzer_plugin/protocol/protocol_common.dart';
6+
import 'package:meta/meta.dart';
67
import 'package:test/test.dart';
78
import 'package:test_reflective_loader/test_reflective_loader.dart';
89

@@ -72,6 +73,7 @@ abstract class AbstractCompletionDriverTest
7273
bool get includeOverrides => true;
7374

7475
@override
76+
@protected
7577
Future<List<CompletionSuggestion>> addTestFile(
7678
String content, {
7779
int? offset,
@@ -162,8 +164,6 @@ To accept the current state change the expectation to
162164
);
163165
}
164166

165-
// TODO(scheglov): Use it everywhere instead of [addTestFile].
166-
// ignore:unreachable_from_main
167167
Future<void> computeSuggestions(String content) async {
168168
// Give the server time to create analysis contexts.
169169
await pumpEventQueue(times: 1000);
@@ -309,7 +309,7 @@ class BasicCompletionTest extends AbstractCompletionDriverTest
309309
mixin BasicCompletionTestCases on AbstractCompletionDriverTest {
310310
/// Duplicates (and potentially replaces) [DeprecatedMemberRelevanceTest].
311311
Future<void> test_deprecated_member_relevance() async {
312-
await addTestFile('''
312+
await computeSuggestions('''
313313
class A {
314314
void a1() { }
315315
@deprecated
@@ -353,7 +353,7 @@ class A {}
353353
export 'a.dart';
354354
''');
355355

356-
await addTestFile('''
356+
await computeSuggestions('''
357357
import 'a.dart';
358358
void f() {
359359
^
@@ -379,7 +379,7 @@ enum E {
379379
export 'a.dart';
380380
''');
381381

382-
await addTestFile('''
382+
await computeSuggestions('''
383383
import 'a.dart';
384384
void f() {
385385
E v = ^
@@ -400,7 +400,7 @@ class A {
400400
export 'a.dart';
401401
''');
402402

403-
await addTestFile('''
403+
await computeSuggestions('''
404404
import 'a.dart';
405405
void f() {
406406
^
@@ -423,7 +423,7 @@ class A {}
423423
export 'a.dart';
424424
''');
425425

426-
await addTestFile('''
426+
await computeSuggestions('''
427427
import 'a.dart';
428428
import 'b.dart';
429429
void f() {
@@ -447,7 +447,7 @@ typedef T2 = double;
447447
var v = 0;
448448
''');
449449

450-
await addTestFile('''
450+
await computeSuggestions('''
451451
void f() {
452452
^
453453
}
@@ -474,7 +474,7 @@ class A {
474474
}
475475
''');
476476

477-
await addTestFile('''
477+
await computeSuggestions('''
478478
void m() {
479479
^
480480
}
@@ -490,7 +490,7 @@ class A {
490490
}
491491
''');
492492

493-
await addTestFile('''
493+
await computeSuggestions('''
494494
void f() {
495495
^
496496
}
@@ -505,7 +505,7 @@ void f() {
505505
int get g => 0;
506506
''');
507507

508-
await addTestFile('''
508+
await computeSuggestions('''
509509
void f() {
510510
^
511511
}
@@ -521,7 +521,7 @@ class A {
521521
}
522522
''');
523523

524-
await addTestFile('''
524+
await computeSuggestions('''
525525
void f() {
526526
^
527527
}
@@ -537,7 +537,7 @@ class A {
537537
}
538538
''');
539539

540-
await addTestFile('''
540+
await computeSuggestions('''
541541
void f() {
542542
^
543543
}
@@ -555,7 +555,7 @@ class A {}
555555
export 'a.dart';
556556
''');
557557

558-
await addTestFile('''
558+
await computeSuggestions('''
559559
void f() {
560560
^
561561
}
@@ -585,7 +585,7 @@ class A {}
585585
export 'a.dart';
586586
''');
587587

588-
await addTestFile('''
588+
await computeSuggestions('''
589589
import 'b.dart';
590590
void f() {
591591
^
@@ -605,7 +605,7 @@ void f() {
605605
class A {}
606606
''');
607607

608-
await addTestFile('''
608+
await computeSuggestions('''
609609
class A {}
610610
void f() {
611611
^
@@ -628,7 +628,7 @@ class A {
628628
}
629629
''');
630630

631-
await addTestFile('''
631+
await computeSuggestions('''
632632
void f() {
633633
^
634634
}
@@ -644,7 +644,7 @@ class A {
644644
}
645645
''');
646646

647-
await addTestFile('''
647+
await computeSuggestions('''
648648
void f() {
649649
^
650650
}
@@ -659,7 +659,7 @@ void f() {
659659
set s(int s) {}
660660
''');
661661

662-
await addTestFile('''
662+
await computeSuggestions('''
663663
void f() {
664664
^
665665
}
@@ -683,7 +683,7 @@ class A {
683683
class O { }
684684
''');
685685

686-
await addTestFile('''
686+
await computeSuggestions('''
687687
import 'a.dart';
688688
689689
void f(List<String> args) {
@@ -712,7 +712,7 @@ void f(List<String> args) {
712712
class A { }
713713
''');
714714

715-
await addTestFile('''
715+
await computeSuggestions('''
716716
import 'a.dart';
717717
718718
void f(List<String> args) {
@@ -738,7 +738,7 @@ mixin M { }
738738
mixin class A { }
739739
''');
740740

741-
await addTestFile('''
741+
await computeSuggestions('''
742742
class C extends Object with ^
743743
''');
744744

@@ -747,7 +747,7 @@ class C extends Object with ^
747747
}
748748

749749
Future<void> test_sdk_lib_future_isNotDuplicated() async {
750-
await addTestFile('''
750+
await computeSuggestions('''
751751
void f() {
752752
^
753753
}
@@ -765,7 +765,7 @@ void f() {
765765
}
766766

767767
Future<void> test_sdk_lib_suggestions() async {
768-
await addTestFile('''
768+
await computeSuggestions('''
769769
void f() {
770770
^
771771
}

‎pkg/analysis_server/test/services/completion/dart/relevance/bool_assignment_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ The actual relevances are:
4040

4141
mixin BoolAssignmentTestCases on CompletionRelevanceTest {
4242
Future<void> test_boolLiterals_imported() async {
43-
await addTestFile('''
43+
await computeSuggestions('''
4444
foo() {
4545
bool b;
4646
b = ^
@@ -67,7 +67,7 @@ foo() {
6767
}
6868

6969
Future<void> test_boolLiterals_local() async {
70-
await addTestFile('''
70+
await computeSuggestions('''
7171
foo() {
7272
bool b;
7373
b = ^

‎pkg/analysis_server/test/services/completion/dart/relevance/deprecated_member_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DeprecatedMemberTest extends CompletionRelevanceTest
1919

2020
mixin DeprecatedMemberTestCases on CompletionRelevanceTest {
2121
Future<void> test_deprecated() async {
22-
await addTestFile('''
22+
await computeSuggestions('''
2323
class A {
2424
void a1() { }
2525
@deprecated

‎pkg/analysis_server/test/services/completion/dart/relevance/instance_member_test.dart

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class InstanceMemberTest extends CompletionRelevanceTest
1818

1919
mixin InstanceMemberTestCases on CompletionRelevanceTest {
2020
Future<void> test_contextType_interfaceType_method() async {
21-
await addTestFile(r'''
21+
await computeSuggestions(r'''
2222
class A {}
2323
class B extends A {}
2424
class C extends B {}
@@ -45,7 +45,7 @@ void g(E e) {
4545
}
4646

4747
Future<void> test_contextType_recordType_named() async {
48-
await addTestFile(r'''
48+
await computeSuggestions(r'''
4949
class A {}
5050
class B extends A {}
5151
class C extends B {}
@@ -66,7 +66,7 @@ void g(({A foo01, B foo02, C foo03, D foo04}) r) {
6666
}
6767

6868
Future<void> test_contextType_recordType_positional() async {
69-
await addTestFile(r'''
69+
await computeSuggestions(r'''
7070
class A {}
7171
class B extends A {}
7272
class C extends B {}
@@ -87,7 +87,7 @@ void g((A, B, C, D) r) {
8787
}
8888

8989
Future<void> test_elementKind() async {
90-
await addTestFile('''
90+
await computeSuggestions('''
9191
class A {
9292
int get g => 0;
9393
void m() { }
@@ -109,7 +109,7 @@ void f(A a) {
109109
}
110110

111111
Future<void> test_hasDeprecated() async {
112-
await addTestFile('''
112+
await computeSuggestions('''
113113
class C {
114114
void a() {}
115115
@deprecated
@@ -127,7 +127,7 @@ void f(C c) {
127127
}
128128

129129
Future<void> test_inheritanceDepth() async {
130-
await addTestFile('''
130+
await computeSuggestions('''
131131
class A {
132132
void a() { }
133133
}
@@ -148,7 +148,7 @@ void f(B b) {
148148
}
149149

150150
Future<void> test_startsWithDollar() async {
151-
await addTestFile(r'''
151+
await computeSuggestions(r'''
152152
class A {
153153
void a() { }
154154
void $b() { }
@@ -165,7 +165,7 @@ void f(A a) {
165165
}
166166

167167
Future<void> test_superMatches() async {
168-
await addTestFile('''
168+
await computeSuggestions('''
169169
class A {
170170
void a() { }
171171
void b() { }

‎pkg/analysis_server/test/services/completion/dart/relevance/is_no_such_method_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class IsNoSuchMethodTest extends CompletionRelevanceTest
1919

2020
mixin IsNoSuchMethodTestCases on CompletionRelevanceTest {
2121
Future<void> test_notSuper() async {
22-
await addTestFile('''
22+
await computeSuggestions('''
2323
void foo(Object o) {
2424
o.^;
2525
}
@@ -41,7 +41,7 @@ void foo(Object o) {
4141
}
4242

4343
Future<void> test_super() async {
44-
await addTestFile('''
44+
await computeSuggestions('''
4545
class C {
4646
dynamic noSuchMethod(Invocation i) => super.^;
4747
}

‎pkg/analysis_server/test/services/completion/dart/relevance/named_argument_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ mixin NamedArgumentTestCases on CompletionRelevanceTest {
2525
}
2626

2727
Future<void> test_required() async {
28-
await addTestFile('''
28+
await computeSuggestions('''
2929
void f({int a = 0, required int b}) {}
3030
3131
void g() => f(^);
@@ -37,7 +37,7 @@ void g() => f(^);
3737
}
3838

3939
Future<void> test_requiredAnnotation() async {
40-
await addTestFile('''
40+
await computeSuggestions('''
4141
import 'package:meta/meta.dart';
4242
4343
void f({int a, @required int b}) {}

‎pkg/analysis_server/test/services/completion/dart/relevance/non_type_member_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class NonTypeMemberTest extends CompletionRelevanceTest
1919

2020
mixin NonTypeMemberTestCases on CompletionRelevanceTest {
2121
Future<void> test_contextType_constructorInvocation_before_type() async {
22-
await addTestFile('''
22+
await computeSuggestions('''
2323
class StrWrap {
2424
String string;
2525
StrWrap(this.string);
@@ -45,7 +45,7 @@ void bar() {
4545

4646
@failingTest
4747
Future<void> test_typeParameters() async {
48-
await addTestFile('''
48+
await computeSuggestions('''
4949
class Foo{}
5050
void foo<T>(List<T> bar) {
5151
List<^> baz;

0 commit comments

Comments
 (0)