From 803de0f3c408e5b96e60350cecce7edb04425174 Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Mon, 21 Sep 2026 11:16:15 +0200
Subject: [PATCH 1/2] unified: Configure vscode Swift extension

Adds files to make the vscode Swift extension work when editing test cases.
---
 unified/.gitignore              | 1 +
 unified/.vscode/extensions.json | 5 +++++
 unified/.vscode/settings.json   | 9 +++++++++
 unified/Package.swift           | 9 +++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 unified/.vscode/extensions.json
 create mode 100644 unified/.vscode/settings.json
 create mode 100644 unified/Package.swift

diff --git a/unified/.gitignore b/unified/.gitignore
index 5878737805f2..0c99561f41e0 100644
--- a/unified/.gitignore
+++ b/unified/.gitignore
@@ -1,4 +1,5 @@
 target
+/.build
 .vscode/launch.json
 .cache
 ql/test/**/*.testproj
diff --git a/unified/.vscode/extensions.json b/unified/.vscode/extensions.json
new file mode 100644
index 000000000000..c1d687c7ab06
--- /dev/null
+++ b/unified/.vscode/extensions.json
@@ -0,0 +1,5 @@
+{
+  "recommendations": [
+    "swiftlang.swift-vscode"
+  ]
+}
diff --git a/unified/.vscode/settings.json b/unified/.vscode/settings.json
new file mode 100644
index 000000000000..f19460b60d37
--- /dev/null
+++ b/unified/.vscode/settings.json
@@ -0,0 +1,9 @@
+{
+  "swift.autoGenerateLaunchConfigurations": false,
+  "swift.disableAutoResolve": true,
+  "swift.disableSwiftPackageManagerIntegration": false,
+  "[swift]": {
+    "editor.defaultFormatter": "swiftlang.swift-vscode",
+    "editor.formatOnSave": true
+  }
+}
diff --git a/unified/Package.swift b/unified/Package.swift
new file mode 100644
index 000000000000..76de2f4fc3b3
--- /dev/null
+++ b/unified/Package.swift
@@ -0,0 +1,9 @@
+// swift-tools-version: 5.9
+
+import PackageDescription
+
+// This targetless package lets editor tooling discover the standalone Swift test fixtures.
+let package = Package(
+    name: "CodeQLSwiftFixtures",
+    targets: []
+)

From 92dc28376679ee6abe49ec7792eae4da004521d8 Mon Sep 17 00:00:00 2001
From: Asger F <asgerf@github.com>
Date: Mon, 21 Sep 2026 11:34:32 +0200
Subject: [PATCH 2/2] unified: Update swift version comment to match

Sync'ing on a single source of truth would be nice but is too invasive right now
---
 unified/Package.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/unified/Package.swift b/unified/Package.swift
index 76de2f4fc3b3..970f0761b08a 100644
--- a/unified/Package.swift
+++ b/unified/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.9
+// swift-tools-version: 6.3
 
 import PackageDescription