Skip to content

Commit b6cafa1

Browse files
akyrtziakyrtzi
authored
Merge pull request #30090 from akyrtzi/turn-on-fast-completion
[SourceKit] Turn-on by default the fast completion mode
2 parents 7ac3338 + 4d337f2 commit b6cafa1

13 files changed

+69
-69
lines changed

‎test/SourceKit/CodeComplete/complete_sequence.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,24 @@ func bar(arg: Bar) {
2020
// Disabled.
2121
// RUN: %sourcekitd-test \
2222
// RUN: -req=track-compiles == \
23-
// RUN: -req=complete -pos=12:11 %s -- %s == \
24-
// RUN: -req=complete -pos=15:11 %s -- %s > %t.response
23+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -- %s == \
24+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -- %s > %t.response
2525
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
2626
// RUN: %FileCheck --check-prefix=TRACE_NORMAL %s < %t.response
2727

2828
// Enabled.
2929
// RUN: %sourcekitd-test \
3030
// RUN: -req=track-compiles == \
31-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -- %s == \
32-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -- %s > %t.response.reuseastcontext
31+
// RUN: -req=complete -pos=12:11 %s -- %s == \
32+
// RUN: -req=complete -pos=15:11 %s -- %s > %t.response.reuseastcontext
3333
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response.reuseastcontext
3434
// RUN: %FileCheck --check-prefix=TRACE_REUSEAST %s < %t.response.reuseastcontext
3535

3636
// Enabled - compiler argument mismatch.
3737
// RUN: %sourcekitd-test \
3838
// RUN: -req=track-compiles == \
39-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -- %s -DNOTUSED == \
40-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -- -DNOTUSED %s > %t.response.reuseastcontext_argmismatch
39+
// RUN: -req=complete -pos=12:11 %s -- %s -DNOTUSED == \
40+
// RUN: -req=complete -pos=15:11 %s -- -DNOTUSED %s > %t.response.reuseastcontext_argmismatch
4141
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response.reuseastcontext_argmismatch
4242
// RUN: %FileCheck --check-prefix=TRACE_NORMAL %s < %t.response.reuseastcontext_argmismatch
4343

‎test/SourceKit/CodeComplete/complete_sequence_accessor.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ enum S {
3939
// Enabled.
4040
// RUN: %sourcekitd-test \
4141
// RUN: -req=track-compiles == \
42-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:9 %s -- %s -parse-as-library == \
43-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:15 %s -- %s -parse-as-library == \
44-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:15 %s -- %s -parse-as-library == \
45-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=23:9 %s -- %s -parse-as-library == \
46-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=26:15 %s -- %s -parse-as-library == \
47-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=27:15 %s -- %s -parse-as-library == \
48-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=30:9 %s -- %s -parse-as-library == \
49-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=33:15 %s -- %s -parse-as-library == \
50-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=34:15 %s -- %s -parse-as-library == \
51-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:1 %s -- %s -parse-as-library == \
52-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=23:1 %s -- %s -parse-as-library == \
53-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:1 %s -- %s -parse-as-library > %t.response
42+
// RUN: -req=complete -pos=12:9 %s -- %s -parse-as-library == \
43+
// RUN: -req=complete -pos=15:15 %s -- %s -parse-as-library == \
44+
// RUN: -req=complete -pos=16:15 %s -- %s -parse-as-library == \
45+
// RUN: -req=complete -pos=23:9 %s -- %s -parse-as-library == \
46+
// RUN: -req=complete -pos=26:15 %s -- %s -parse-as-library == \
47+
// RUN: -req=complete -pos=27:15 %s -- %s -parse-as-library == \
48+
// RUN: -req=complete -pos=30:9 %s -- %s -parse-as-library == \
49+
// RUN: -req=complete -pos=33:15 %s -- %s -parse-as-library == \
50+
// RUN: -req=complete -pos=34:15 %s -- %s -parse-as-library == \
51+
// RUN: -req=complete -pos=12:1 %s -- %s -parse-as-library == \
52+
// RUN: -req=complete -pos=23:1 %s -- %s -parse-as-library == \
53+
// RUN: -req=complete -pos=16:1 %s -- %s -parse-as-library > %t.response
5454
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
5555
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response
5656

‎test/SourceKit/CodeComplete/complete_sequence_bodyrange.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ class TestChain {
2020
// rdar://problem/58098222
2121

2222
// RUN: %sourcekitd-test \
23-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
24-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
25-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
26-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
27-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
28-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
29-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
30-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
31-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
32-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s | %FileCheck %s
23+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
24+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
25+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
26+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
27+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
28+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
29+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
30+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
31+
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
32+
// RUN: -req=complete -pos=16:32 %s -async -- %s | %FileCheck %s
3333

3434
// CHECK-NOT: key.name: "prop1"
3535
// CHECK-NOT: key.name: "prop2"

‎test/SourceKit/CodeComplete/complete_sequence_crossfile.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ extension Bar {
3434

3535
// RUN: %sourcekitd-test \
3636
// RUN: -req=track-compiles == \
37-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=7:11 %t/file1.swift -- %t/file1.swift %t/file2.swift == \
38-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=6:11 %t/file2.swift -- %t/file1.swift %t/file2.swift > %t.response
37+
// RUN: -req=complete -pos=7:11 %t/file1.swift -- %t/file1.swift %t/file2.swift == \
38+
// RUN: -req=complete -pos=6:11 %t/file2.swift -- %t/file1.swift %t/file2.swift > %t.response
3939
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
4040
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response
4141

‎test/SourceKit/CodeComplete/complete_sequence_edit.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ func foo(arg: Foo) {
4545

4646
// RUN: %sourcekitd-test \
4747
// RUN: -req=track-compiles == \
48-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=8:11 -name file.swift -text-input %t/State1.swift -- file.swift == \
49-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=11:13 -name file.swift -text-input %t/State2.swift -- file.swift == \
50-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:13 -name file.swift -text-input %t/State3.swift -- file.swift > %t.response
48+
// RUN: -req=complete -pos=8:11 -name file.swift -text-input %t/State1.swift -- file.swift == \
49+
// RUN: -req=complete -pos=11:13 -name file.swift -text-input %t/State2.swift -- file.swift == \
50+
// RUN: -req=complete -pos=12:13 -name file.swift -text-input %t/State3.swift -- file.swift > %t.response
5151
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
5252
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response
5353

‎test/SourceKit/CodeComplete/complete_sequence_localvar.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ func test() {
55
}
66

77
// RUN: %sourcekitd-test \
8-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s == \
9-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s == \
10-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s == \
11-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s == \
12-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s | %FileCheck %s
8+
// RUN: -req=complete -pos=3:1 %s -- %s == \
9+
// RUN: -req=complete -pos=3:1 %s -- %s == \
10+
// RUN: -req=complete -pos=3:1 %s -- %s == \
11+
// RUN: -req=complete -pos=3:1 %s -- %s == \
12+
// RUN: -req=complete -pos=3:1 %s -- %s | %FileCheck %s
1313

1414
// CHECK-NOT: key.name: "localVar"
1515
// CHECK-NOT: key.name: "afterVar"

‎test/SourceKit/CodeComplete/complete_sequence_nestedtype.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ struct Outer {
1616

1717
// RUN: %sourcekitd-test \
1818
// RUN: -req=track-compiles == \
19-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=8:13 %s -- %s == \
20-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=8:13 %s -- %s == \
21-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=13:11 %s -- %s \
19+
// RUN: -req=complete -pos=8:13 %s -- %s == \
20+
// RUN: -req=complete -pos=8:13 %s -- %s == \
21+
// RUN: -req=complete -pos=13:11 %s -- %s \
2222
// RUN: > %t.response
2323
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
2424
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response

‎test/SourceKit/CodeComplete/complete_sequence_property_wrapper.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct MyStruct {
1919

2020
// RUN: %sourcekitd-test \
2121
// RUN: -req=track-compiles == \
22-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:1 -repeat-request=2 %s -- %s > %t.response
22+
// RUN: -req=complete -pos=16:1 -repeat-request=2 %s -- %s > %t.response
2323
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
2424
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response
2525

‎test/SourceKit/CodeComplete/complete_sequence_race.swift

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@ func bar(arg: Bar) {
1919

2020
// ReuseASTContext disabled.
2121
// RUN: %sourcekitd-test \
22+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
23+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s == \
24+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
25+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s == \
26+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=17:1 %s -async -- %s == \
27+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
28+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s == \
29+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
30+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s == \
31+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=17:1 %s -async -- %s == \
32+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
33+
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s
34+
35+
// ReuseASTContext enabled.
36+
// RUN: %sourcekitd-test \
2237
// RUN: -req=complete -pos=12:11 %s -async -- %s == \
2338
// RUN: -req=complete -pos=15:11 %s -async -- %s == \
2439
// RUN: -req=complete -pos=12:11 %s -async -- %s == \
@@ -31,18 +46,3 @@ func bar(arg: Bar) {
3146
// RUN: -req=complete -pos=17:1 %s -async -- %s == \
3247
// RUN: -req=complete -pos=12:11 %s -async -- %s == \
3348
// RUN: -req=complete -pos=15:11 %s -async -- %s
34-
35-
// ReuseASTContext enabled.
36-
// RUN: %sourcekitd-test \
37-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
38-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s == \
39-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
40-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s == \
41-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=17:1 %s -async -- %s == \
42-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
43-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s == \
44-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
45-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s == \
46-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=17:1 %s -async -- %s == \
47-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
48-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s

‎test/SourceKit/CodeComplete/complete_sequence_toplevel.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ _ = Bar(a: 12, b: 42)
1818
// Enabled.
1919
// RUN: %sourcekitd-test \
2020
// RUN: -req=track-compiles == \
21-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=14:11 %s -- %s == \
22-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=13:15 %s -- %s == \
23-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:22 %s -- %s > %t.response
21+
// RUN: -req=complete -pos=14:11 %s -- %s == \
22+
// RUN: -req=complete -pos=13:15 %s -- %s == \
23+
// RUN: -req=complete -pos=16:22 %s -- %s > %t.response
2424
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
2525
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response
2626

‎test/SourceKit/CodeComplete/complete_sequence_toplevel_edit.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ func dummy(x: ) {
5555

5656
// RUN: %sourcekitd-test \
5757
// RUN: -req=track-compiles == \
58-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=7:21 -name file.swift -text-input %t/State1.swift -- file.swift == \
59-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=9:25 -name file.swift -text-input %t/State2.swift -- file.swift == \
60-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=10:27 -name file.swift -text-input %t/State3.swift -- file.swift == \
61-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=10:15 -name file.swift -text-input %t/State4.swift -- file.swift > %t.response
58+
// RUN: -req=complete -pos=7:21 -name file.swift -text-input %t/State1.swift -- file.swift == \
59+
// RUN: -req=complete -pos=9:25 -name file.swift -text-input %t/State2.swift -- file.swift == \
60+
// RUN: -req=complete -pos=10:27 -name file.swift -text-input %t/State3.swift -- file.swift == \
61+
// RUN: -req=complete -pos=10:15 -name file.swift -text-input %t/State4.swift -- file.swift > %t.response
6262
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
6363
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response
6464

‎test/SourceKit/CodeComplete/complete_sequence_toplevel_edit_import.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import Bar
2323

2424
// RUN: %sourcekitd-test \
2525
// RUN: -req=track-compiles == \
26-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 -name main.swift -text-input %t/State1.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
27-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 -name main.swift -text-input %t/State2.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
28-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 -name main.swift -text-input %t/State3.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
29-
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 -name main.swift -text-input %t/State4.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk > %t.response
26+
// RUN: -req=complete -pos=3:1 -name main.swift -text-input %t/State1.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
27+
// RUN: -req=complete -pos=3:1 -name main.swift -text-input %t/State2.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
28+
// RUN: -req=complete -pos=3:1 -name main.swift -text-input %t/State3.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
29+
// RUN: -req=complete -pos=3:1 -name main.swift -text-input %t/State4.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk > %t.response
3030
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
3131
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response
3232

‎tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ struct Options {
4242
bool hideLowPriority = true;
4343
bool hideByNameStyle = true;
4444
bool fuzzyMatching = true;
45-
bool reuseASTContextIfPossible = false;
45+
bool reuseASTContextIfPossible = true;
4646
unsigned minFuzzyLength = 2;
4747
unsigned showTopNonLiteralResults = 3;
4848

0 commit comments

Comments
 (0)