Merge pull request swiftlang#74233 from hamishknight/batch-completion

hamishknight · web-flow · commit b07a2aa204d6 · 2024-06-08T17:47:14.000+01:00
[test] Switch to `%batch-code-completion` in a few tests
diff --git a/test/IDE/complete_actorisolation.swift b/test/IDE/complete_actorisolation.swift
@@ -1,5 +1,5 @@
 // REQUIRES: concurrency
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -warn-concurrency
+// RUN: %batch-code-completion -warn-concurrency
 
 class MyNonSendable {}
 struct MySendable {}
diff --git a/test/IDE/complete_after_pattern_in_closure.swift b/test/IDE/complete_after_pattern_in_closure.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -enable-experimental-concurrency
+// RUN: %batch-code-completion -enable-experimental-concurrency
 
 func makeURL(withExtension ext: Int?) -> Int? {
   return nil
diff --git a/test/IDE/complete_annotation.swift b/test/IDE/complete_annotation.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -code-completion-annotate-results -code-completion-sourcetext -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion -code-completion-annotate-results -code-completion-sourcetext
 
 struct MyStruct {
   init(x: Int) {}
diff --git a/test/IDE/complete_annotation_concurrency.swift b/test/IDE/complete_annotation_concurrency.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -code-completion-annotate-results -code-completion-sourcetext -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion -code-completion-annotate-results -code-completion-sourcetext
 
 // REQUIRES: concurrency
 
diff --git a/test/IDE/complete_call_pattern.swift b/test/IDE/complete_call_pattern.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -disable-objc-attr-requires-foundation-module
+// RUN: %batch-code-completion -disable-objc-attr-requires-foundation-module
 
 struct FooStruct {
   init() {}
diff --git a/test/IDE/complete_concurrency_keyword.swift b/test/IDE/complete_concurrency_keyword.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -enable-experimental-concurrency
+// RUN: %batch-code-completion -enable-experimental-concurrency
 
 // REQUIRES: concurrency
 
diff --git a/test/IDE/complete_diagnostics_concurrency.swift b/test/IDE/complete_diagnostics_concurrency.swift
@@ -1,7 +1,6 @@
 // REQUIRES: concurrency 
 
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t/output -warn-concurrency
+// RUN: %batch-code-completion -warn-concurrency
 
 func asyncFunc() async {}
 func syncFunc() {}
diff --git a/test/IDE/complete_globalactorunsafe_strict.swift b/test/IDE/complete_globalactorunsafe_strict.swift
@@ -1,4 +1,4 @@
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t  -warn-concurrency
+// RUN: %batch-code-completion -warn-concurrency
 // REQUIRES: concurrency
 
 // SAFE_NOTREC: Begin completions, 2 items
diff --git a/test/IDE/complete_if_switch_expr.swift b/test/IDE/complete_if_switch_expr.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -debug-forbid-typecheck-prefix FORBIDDEN -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion -debug-forbid-typecheck-prefix FORBIDDEN
 
 enum E {
   case e
diff --git a/test/IDE/complete_implicit_last_expr.swift b/test/IDE/complete_implicit_last_expr.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -enable-experimental-feature ImplicitLastExprResults -debug-forbid-typecheck-prefix FORBIDDEN -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion -enable-experimental-feature ImplicitLastExprResults -debug-forbid-typecheck-prefix FORBIDDEN
 
 // Experimental feature requires asserts
 // REQUIRES: asserts
diff --git a/test/IDE/complete_member_basetypes.swift b/test/IDE/complete_member_basetypes.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -module-name "Mod"
+// RUN: %batch-code-completion -module-name "Mod"
 
 protocol BaseP1 {}
 protocol BaseP2 {}
diff --git a/test/IDE/complete_optionset.swift b/test/IDE/complete_optionset.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -plugin-path %swift-plugin-dir
+// RUN: %batch-code-completion -plugin-path %swift-plugin-dir
 
 // REQUIRES: swift_swift_parser
 
diff --git a/test/IDE/complete_rdar126168123.swift b/test/IDE/complete_rdar126168123.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // rdar://126168123
 
diff --git a/test/IDE/complete_rdar127154780.swift b/test/IDE/complete_rdar127154780.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 // rdar://127154780 - Make sure we provide completions on variables that rely
 // on result builders being solved.
diff --git a/test/IDE/complete_rdar63965160.swift b/test/IDE/complete_rdar63965160.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 protocol View {}
 
diff --git a/test/IDE/complete_rdar94369218.swift b/test/IDE/complete_rdar94369218.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -code-complete-inits-in-postfix-expr -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion -code-complete-inits-in-postfix-expr
 
 protocol MyProto {
   init(value: String)
diff --git a/test/IDE/complete_subtype_overload.swift b/test/IDE/complete_subtype_overload.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion
 
 class C {
   static func cMethod() -> C {}
diff --git a/test/IDE/complete_then_stmt.swift b/test/IDE/complete_then_stmt.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -enable-experimental-feature ThenStatements -debug-forbid-typecheck-prefix FORBIDDEN -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion -enable-experimental-feature ThenStatements -debug-forbid-typecheck-prefix FORBIDDEN
 
 // Experimental feature requires asserts
 // REQUIRES: asserts
diff --git a/test/IDE/complete_type_relation_any_some.swift b/test/IDE/complete_type_relation_any_some.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck --completion-output-dir %t
+// RUN: %batch-code-completion
 
 protocol Shape {}
 
diff --git a/test/IDE/complete_typerelation.swift b/test/IDE/complete_typerelation.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -disable-objc-attr-requires-foundation-module
+// RUN: %batch-code-completion -disable-objc-attr-requires-foundation-module
 
 // SE-0353
 struct ConstraintedExistentialTest {
diff --git a/test/IDE/complete_unresolved_members.swift b/test/IDE/complete_unresolved_members.swift
@@ -1,5 +1,4 @@
-// RUN: %empty-directory(%t)
-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s %S/Inputs/EnumFromOtherFile.swift -filecheck %raw-FileCheck -completion-output-dir %t
+// RUN: %batch-code-completion %S/Inputs/EnumFromOtherFile.swift
 
 // NOCRASH: Token
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-ide-test -batch-code-completion -code-completion-annotate-results -code-completion-sourcetext -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t`
	`1`	`+// RUN: %batch-code-completion -code-completion-annotate-results -code-completion-sourcetext`
`2`	`2`
`3`	`3`	`struct MyStruct {`
`4`	`4`	`init(x: Int) {}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -enable-experimental-concurrency`
	`1`	`+// RUN: %batch-code-completion -enable-experimental-concurrency`
`2`	`2`
`3`	`3`	`// REQUIRES: concurrency`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %target-swift-ide-test -batch-code-completion -source-filename %s -filecheck %raw-FileCheck -completion-output-dir %t -warn-concurrency`
	`1`	`+// RUN: %batch-code-completion -warn-concurrency`
`2`	`2`	`// REQUIRES: concurrency`
`3`	`3`
`4`	`4`	`// SAFE_NOTREC: Begin completions, 2 items`