[CodeCompletion] Migrate some tests to batch completion test #1 #36714
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@swift-ci Please smoke test |
|
cc: @davezarzycki |
rintaro
commented
Apr 2, 2021
There was a problem hiding this comment.
Most migration are done by a script. Otherwise...
// CHECK: found code completion token
// CHECK-NOT: Begin completions
is rewritten to
// NORESULT: Token
// NORESULT-NOT: Begin completions
Also // NOCRASH: Token is for tokens previously not FileChecked at all.
Comment on lines
-2134
to
+1934
| let _ = self.child.value.value.#^COMPLEX_CHAIN_1^# | ||
| let _ = child.value.value.#^COMPLEX_CHAIN_2^# | ||
| // COMPLEX_CHAIN_1: Begin completions, 3 items | ||
| // COMPLEX_CHAIN_1-DAG: Keyword[self]/CurrNominal: self[#Container.Struct2#] | ||
| // COMPLEX_CHAIN_1-DAG: Decl[InstanceVar]/CurrNominal: prop1[#Int#] | ||
| // COMPLEX_CHAIN_1-DAG: Decl[InstanceVar]/CurrNominal: prop2[#Int#] | ||
| // COMPLEX_CHAIN_1: End completions | ||
| let _ = self.child.value.value.#^COMPLEX_CHAIN_1?check=COMPLEX_CHAIN^# | ||
| let _ = child.value.value.#^COMPLEX_CHAIN_2?check=COMPLEX_CHAIN^# | ||
| // COMPLEX_CHAIN: Begin completions, 3 items | ||
| // COMPLEX_CHAIN-DAG: Keyword[self]/CurrNominal: self[#Struct2#] | ||
| // COMPLEX_CHAIN-DAG: Decl[InstanceVar]/CurrNominal: prop1[#Int#] | ||
| // COMPLEX_CHAIN-DAG: Decl[InstanceVar]/CurrNominal: prop2[#Int#] | ||
| // COMPLEX_CHAIN: End completions |
There was a problem hiding this comment.
There was no check for COMPLEX_CHAIN_1 and COMPLEX_CHAIN_2
Comment on lines
-84
to
+37
| // SKIP_DUPLICATES_PROPERTY: Decl[InstanceVar]/CurrNominal/IsSystem: count[#Int#]{{; name=.+$}} | ||
| // SKIP_DUPLICATES_PROPERTY-NOT: count[#Int#] | ||
| // SKIP_DUPLICATES_METHOD: Decl[InstanceMethod]/Super/IsSystem: formIndex({#(i): &Int#}, {#offsetBy: Int#})[#Void#]{{; name=.+$}} | ||
| // SKIP_DUPLICATES_METHOD-NOT: formIndex({#(i): &Int#}, {#offsetBy: Int#})[#Void#] | ||
| // SKIP_DUPLICATES-NOT: count[#Int#] | ||
| // SKIP_DUPLICATES-NOT: formIndex({#(i): &Int#}, {#offsetBy: Int#})[#Void#] | ||
| // SKIP_DUPLICATES: Decl[InstanceVar]/CurrNominal/IsSystem: count[#Int#]{{; name=.+$}} | ||
| // SKIP_DUPLICATES: Decl[InstanceMethod]/Super/IsSystem: formIndex({#(i): &Int#}, {#offsetBy: Int#})[#Void#]{{; name=.+$}} | ||
| // SKIP_DUPLICATES-NOT: count[#Int#] | ||
| // SKIP_DUPLICATES-NOT: formIndex({#(i): &Int#}, {#offsetBy: Int#})[#Void#] |
There was a problem hiding this comment.
Previously
// RUN: %swift-ide-test -code-completion -source-filename %s -code-completion-token=SKIP_DUPLICATES > %t
// RUN: %FileCheck %s --input-file %t --check-prefixes=SKIP_DUPLICATES,SKIP_DUPLICATES_PROPERTY
// RUN: %FileCheck %s --input-file %t --check-prefixes=SKIP_DUPLICATES,SKIP_DUPLICATES_METHOD
We can do this by #^SKIP_DUPLICATES?check=SKIP_DUPLICATES,SKIP_DUPLICATES_PROPERTY;check=SKIP_DUPLICATES,SKIP_DUPLICATES_METHOD^# But it's not worth it.
rintaro
commented
Apr 2, 2021
| @@ -1198,7 +994,7 @@ func testChainedCalls2() { | |||
|
|
|||
| func testChainedCalls3() { | |||
| // doBaz() takes a Double. Check that we can recover. | |||
| SomeBuilder(42).doFoo().doBaz(SomeBuilder(24))#^CHAINED_CALLS_3^# | |||
| SomeBuilder(42).doFoo().doBaz(SomeBuilder(24))#^CHAINED_CALLS_3?xfail=FIXME^# | |||
There was a problem hiding this comment.
This is unfortunate. Previously
// Disabled because we aren't handling failures well.
// FIXME: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=CHAINED_CALLS_3 | %FileCheck %s -check-prefix=CHAINED_CALLS_3
There was a problem hiding this comment.
Much better as an fail now though :)
bnbarham
approved these changes
Apr 2, 2021
rintaro
changed the title
|
On my machine, this PR causes the IDE tests to drop out of the top 10 slowest tests for |
|
Windows failures are unrelated and this PR is test only changes. Merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Before:
After: