Skip to content

[SourceKit] Turn-on by default the fast completion mode #30090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2020
Merged

[SourceKit] Turn-on by default the fast completion mode #30090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions test/SourceKit/CodeComplete/complete_sequence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,24 @@ func bar(arg: Bar) {
// Disabled.
// RUN: %sourcekitd-test \
// RUN: -req=track-compiles == \
// RUN: -req=complete -pos=12:11 %s -- %s == \
// RUN: -req=complete -pos=15:11 %s -- %s > %t.response
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -- %s > %t.response
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
// RUN: %FileCheck --check-prefix=TRACE_NORMAL %s < %t.response

// Enabled.
// RUN: %sourcekitd-test \
// RUN: -req=track-compiles == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -- %s > %t.response.reuseastcontext
// RUN: -req=complete -pos=12:11 %s -- %s == \
// RUN: -req=complete -pos=15:11 %s -- %s > %t.response.reuseastcontext
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response.reuseastcontext
// RUN: %FileCheck --check-prefix=TRACE_REUSEAST %s < %t.response.reuseastcontext

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

Expand Down
24 changes: 12 additions & 12 deletions test/SourceKit/CodeComplete/complete_sequence_accessor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,18 @@ enum S {
// Enabled.
// RUN: %sourcekitd-test \
// RUN: -req=track-compiles == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:9 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=23:9 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=26:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=27:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=30:9 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=33:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=34:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:1 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=23:1 %s -- %s -parse-as-library == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:1 %s -- %s -parse-as-library > %t.response
// RUN: -req=complete -pos=12:9 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=15:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=16:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=23:9 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=26:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=27:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=30:9 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=33:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=34:15 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=12:1 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=23:1 %s -- %s -parse-as-library == \
// RUN: -req=complete -pos=16:1 %s -- %s -parse-as-library > %t.response
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response

Expand Down
20 changes: 10 additions & 10 deletions test/SourceKit/CodeComplete/complete_sequence_bodyrange.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ class TestChain {
// rdar://problem/58098222

// RUN: %sourcekitd-test \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:32 %s -async -- %s | %FileCheck %s
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s == \
// RUN: -req=complete -pos=16:32 %s -async -- %s | %FileCheck %s

// CHECK-NOT: key.name: "prop1"
// CHECK-NOT: key.name: "prop2"
Expand Down
4 changes: 2 additions & 2 deletions test/SourceKit/CodeComplete/complete_sequence_crossfile.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ extension Bar {

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

Expand Down
6 changes: 3 additions & 3 deletions test/SourceKit/CodeComplete/complete_sequence_edit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ func foo(arg: Foo) {

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

Expand Down
10 changes: 5 additions & 5 deletions test/SourceKit/CodeComplete/complete_sequence_localvar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ func test() {
}

// RUN: %sourcekitd-test \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=3:1 %s -- %s | %FileCheck %s
// RUN: -req=complete -pos=3:1 %s -- %s == \
// RUN: -req=complete -pos=3:1 %s -- %s == \
// RUN: -req=complete -pos=3:1 %s -- %s == \
// RUN: -req=complete -pos=3:1 %s -- %s == \
// RUN: -req=complete -pos=3:1 %s -- %s | %FileCheck %s

// CHECK-NOT: key.name: "localVar"
// CHECK-NOT: key.name: "afterVar"
Expand Down
6 changes: 3 additions & 3 deletions test/SourceKit/CodeComplete/complete_sequence_nestedtype.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ struct Outer {

// RUN: %sourcekitd-test \
// RUN: -req=track-compiles == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=8:13 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=8:13 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=13:11 %s -- %s \
// RUN: -req=complete -pos=8:13 %s -- %s == \
// RUN: -req=complete -pos=8:13 %s -- %s == \
// RUN: -req=complete -pos=13:11 %s -- %s \
// RUN: > %t.response
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response
Expand Down
2 changes: 1 addition & 1 deletion test/SourceKit/CodeComplete/complete_sequence_property_wrapper.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ struct MyStruct {

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

Expand Down
30 changes: 15 additions & 15 deletions test/SourceKit/CodeComplete/complete_sequence_race.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,21 @@ func bar(arg: Bar) {

// ReuseASTContext disabled.
// RUN: %sourcekitd-test \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=17:1 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=17:1 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=0 -pos=15:11 %s -async -- %s

// ReuseASTContext enabled.
// RUN: %sourcekitd-test \
// RUN: -req=complete -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -pos=12:11 %s -async -- %s == \
Expand All @@ -31,18 +46,3 @@ func bar(arg: Bar) {
// RUN: -req=complete -pos=17:1 %s -async -- %s == \
// RUN: -req=complete -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -pos=15:11 %s -async -- %s

// ReuseASTContext enabled.
// RUN: %sourcekitd-test \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=17:1 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=17:1 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=12:11 %s -async -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=15:11 %s -async -- %s
6 changes: 3 additions & 3 deletions test/SourceKit/CodeComplete/complete_sequence_toplevel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ _ = Bar(a: 12, b: 42)
// Enabled.
// RUN: %sourcekitd-test \
// RUN: -req=track-compiles == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=14:11 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=13:15 %s -- %s == \
// RUN: -req=complete -req-opts=reuseastcontext=1 -pos=16:22 %s -- %s > %t.response
// RUN: -req=complete -pos=14:11 %s -- %s == \
// RUN: -req=complete -pos=13:15 %s -- %s == \
// RUN: -req=complete -pos=16:22 %s -- %s > %t.response
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response

Expand Down
8 changes: 4 additions & 4 deletions test/SourceKit/CodeComplete/complete_sequence_toplevel_edit.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ func dummy(x: ) {

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

Expand Down
8 changes: 4 additions & 4 deletions test/SourceKit/CodeComplete/complete_sequence_toplevel_edit_import.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import Bar

// RUN: %sourcekitd-test \
// RUN: -req=track-compiles == \
// 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 == \
// 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 == \
// 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 == \
// 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
// RUN: -req=complete -pos=3:1 -name main.swift -text-input %t/State1.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
// RUN: -req=complete -pos=3:1 -name main.swift -text-input %t/State2.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
// RUN: -req=complete -pos=3:1 -name main.swift -text-input %t/State3.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk == \
// RUN: -req=complete -pos=3:1 -name main.swift -text-input %t/State4.swift -- main.swift -F %S/../Inputs/libIDE-mock-sdk > %t.response
// RUN: %FileCheck --check-prefix=RESULT %s < %t.response
// RUN: %FileCheck --check-prefix=TRACE %s < %t.response

Expand Down
2 changes: 1 addition & 1 deletion tools/SourceKit/lib/SwiftLang/CodeCompletionOrganizer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ struct Options {
bool hideLowPriority = true;
bool hideByNameStyle = true;
bool fuzzyMatching = true;
bool reuseASTContextIfPossible = false;
bool reuseASTContextIfPossible = true;
unsigned minFuzzyLength = 2;
unsigned showTopNonLiteralResults = 3;

Expand Down