Skip to content

Commit cb61e89

Browse files
authored
Merge pull request #84569 from hamishknight/ex-fail
[test] Remove some unnecessary completion XFAILs
2 parents 2a9d858 + 3b05603 commit cb61e89

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

test/IDE/complete_call_pattern.swift

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,10 @@ struct AmbiguousInResultBuilder {
8181

8282
func test(myStr: String) {
8383
foo {
84-
Text(#^AMBIGUOUS_IN_RESULT_BUILDER?xfail=TODO^#)
85-
// AMBIGUOUS_IN_RESULT_BUILDER: Begin completions
84+
Text(#^AMBIGUOUS_IN_RESULT_BUILDER^#)
8685
// AMBIGUOUS_IN_RESULT_BUILDER-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['(']{#verbatim: String#}[')'][#Text#]; name=verbatim:
87-
// AMBIGUOUS_IN_RESULT_BUILDER-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['(']{#(content): _#}[')'][#Text#]; name=:
86+
// AMBIGUOUS_IN_RESULT_BUILDER-DAG: Decl[Constructor]/CurrNominal/Flair[ArgLabels]: ['(']{#(content): StringProtocol#}[')'][#Text#]; name=:
8887
// AMBIGUOUS_IN_RESULT_BUILDER-DAG: Decl[LocalVar]/Local/TypeRelation[Convertible]: myStr[#String#]; name=myStr
89-
// AMBIGUOUS_IN_RESULT_BUILDER: End completions
9088
}
9189
}
9290
}

test/IDE/complete_in_result_builder.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,13 +358,12 @@ func testSwitchInResultBuilder() {
358358
Reduce2()
359359
Reduce2 { action in
360360
switch action {
361-
case .#^SWITCH_IN_RESULT_BUILDER?xfail=rdar106720462^# alertDismissed:
361+
case .#^SWITCH_IN_RESULT_BUILDER^# alertDismissed:
362362
return 0
363363
}
364364
}
365365
}
366366
}
367-
// SWITCH_IN_RESULT_BUILDER: Begin completions, 1 item
368367
// SWITCH_IN_RESULT_BUILDER-DAG: Decl[EnumElement]/CurrNominal/Flair[ExprSpecific]/TypeRelation[Convertible]: alertDismissed[#Action#];
369368
}
370369

test/IDE/complete_value_expr.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,10 +913,10 @@ func testChainedCalls2() {
913913

914914
func testChainedCalls3() {
915915
// doBaz() takes a Double. Check that we can recover.
916-
SomeBuilder(42).doFoo().doBaz(SomeBuilder(24))#^CHAINED_CALLS_3?xfail=FIXME^#
916+
SomeBuilder(42).doFoo().doBaz(SomeBuilder(24))#^CHAINED_CALLS_3^#
917917
// CHAINED_CALLS_3-DAG: Decl[InstanceMethod]/CurrNominal: .doFoo()[#SomeBuilder#]{{; name=.+$}}
918918
// CHAINED_CALLS_3-DAG: Decl[InstanceMethod]/CurrNominal: .doBar()[#SomeBuilder#]{{; name=.+$}}
919-
// CHAINED_CALLS_3-DAG: Decl[InstanceMethod]/CurrNominal: .doBaz({#z: Double#})[#SomeBuilder#]{{; name=.+$}}
919+
// CHAINED_CALLS_3-DAG: Decl[InstanceMethod]/CurrNominal: .doBaz({#(z): Double#})[#SomeBuilder#]{{; name=.+$}}
920920
// CHAINED_CALLS_3-DAG: Keyword[self]/CurrNominal: .self[#SomeBuilder#]; name=self
921921
}
922922

0 commit comments

Comments
 (0)