Enable cross-PR testing

Author: ahoppen

.github/workflows/pull_request.yml

@@ -8,9 +8,20 @@ jobs:
   tests:
     name: Test
     uses: swiftlang/github-workflows/.github/workflows/swift_package_test.yml@main
-  soundness:
-    name: Soundness
-    uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
     with:
-      license_header_check_enabled: false
-      license_header_check_project_name: "Swift.org"
+      enable_windows_checks: false
+      linux_pre_build_command: |
+        python3 cross-pr-checkout.py
+        git clone https://github.com/swiftlang/swift-syntax.git ../swift-syntax
+        git -C ../swift-syntax fetch origin pull/2859/merge:pr_merge
+        git -C ../swift-syntax checkout main
+        git -C ../swift-syntax reset --hard pr_merge
+        git -C ../swift-syntax show
+        git -C ../swift-syntax show main
+        swift package config set-mirror --package-url https://github.com/swiftlang/swift-syntax.git --mirror-url "$(realpath ../swift-syntax)"
+  # soundness:
+  #   name: Soundness
+  #   uses: swiftlang/github-workflows/.github/workflows/soundness.yml@main
+  #   with:
+  #     license_header_check_enabled: false
+  #     license_header_check_project_name: "Swift.org"

Sources/SwiftFormat/Rules/UseShorthandTypeNames.swift

@@ -48,7 +48,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
     switch node.name.text {
     case "Array":
       guard let argument = genericArgumentList.firstAndOnly,
-            case .type(let typeArgument) = argument else {
+            case .type(let typeArgument) = argument.argument else {
         newNode = nil
         break
       }
@@ -62,7 +62,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
     case "Dictionary":
       guard let arguments = exactlyTwoChildren(of: genericArgumentList),
             case .type(let type0Argument) = arguments.0.argument,
-            caes .type(let type1Argument) = arguments.1.argument else {
+            case .type(let type1Argument) = arguments.1.argument else {
         newNode = nil
         break
       }
@@ -79,7 +79,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
         break
       }
       guard let argument = genericArgumentList.firstAndOnly,
-            case .type(let typeArgument) = argument else {
+            case .type(let typeArgument) = argument.argument else {
         newNode = nil
         break
       }
@@ -143,7 +143,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
     switch expression.baseName.text {
     case "Array":
       guard let argument = genericArgumentList.firstAndOnly,
-            case .type(let typeArgument) = argument else {
+            case .type(let typeArgument) = argument.argument else {
         newNode = nil
         break
       }
@@ -172,7 +172,7 @@ public final class UseShorthandTypeNames: SyntaxFormatRule {
 
     case "Optional":
       guard let argument = genericArgumentList.firstAndOnly,
-            case .type(let typeArgument) = argument else {
+            case .type(let typeArgument) = argument.argument else {
         newNode = nil
         break
       }

cross-pr-checkout.py

@@ -0,0 +1,11 @@
+import subprocess
+
+def main():
+  subprocess.check_call(["git", "clone", "https://github.com/swiftlang/swift-syntax.git", "swift-syntax"], cwd="..")
+  subprocess.check_call(["git", "fetch", "origin", "pull/2859/merge:pr_merge"], cwd="../swift-syntax")
+  subprocess.check_call(["git", "checkout", "main"])
+  subprocess.check_call(["git", "reset", "--hard", "pr_merge"])
+  subprocess.check_call(["swift", "package", "config", "set-mirror", "--package-url", "https://github.com/swiftlang/swift-syntax.git", "--mirror-url", "../swift-syntax"])
+
+if __name__ == "__main__":
+  main()