Fix nightly Swift 5.9 tests (#1861)

Author: matthewbastien

.gitignore

@@ -6,6 +6,9 @@ coverage
 test-results
 userdocs/userdocs.docc/.docc-build
 
+# SwiftPM cache for tests
+.spm-cache
+
 # Generated Assets
 assets/documentation-webview
 assets/icons

assets/test/.vscode/settings.json

@@ -2,7 +2,7 @@
     "swift.disableAutoResolve": true,
     "swift.autoGenerateLaunchConfigurations": false,
     "swift.debugger.debugAdapter": "lldb-dap",
-    "swift.debugger.setupCodeLLDB": "alwaysUpdateGlobal",
+    "swift.debugger.setupCodeLLDB": "never",
     "swift.additionalTestArguments": [
         "-Xswiftc",
         "-DTEST_ARGUMENT_SET_VIA_TEST_BUILD_ARGUMENTS_SETTING"
@@ -13,5 +13,8 @@
     "swift.sourcekit-lsp.backgroundIndexing": "off",
     "swift.excludePathsFromActivation": {
         "**/excluded": true
-    }
+    },
+    "swift.packageArguments": [
+        "--cache-path=${workspaceFolder}/.spm-cache"
+    ]
 }

assets/test/dependencies/Package.swift

@@ -6,7 +6,7 @@ import PackageDescription
 let package = Package(
     name: "dependencies",
     dependencies: [
-        .package(url: "https://github.com/swiftlang/swift-markdown.git", branch: "main"),
+        .package(url: "https://github.com/swiftlang/swift-markdown.git", from: "0.7.1"),
         .package(path: "../defaultPackage"),
     ],
     targets: [

assets/test/targets/Package.swift

@@ -20,7 +20,7 @@ let package = Package(
         ),
     ],
     dependencies: [
-        .package(url: "https://github.com/swiftlang/swift-markdown.git", branch: "main"),
+        .package(url: "https://github.com/swiftlang/swift-markdown.git", from: "0.7.1"),
         .package(path: "../defaultPackage"),
     ],
     targets: [

test/integration-tests/tasks/SwiftPluginTaskProvider.test.ts

@@ -45,7 +45,11 @@ tag("medium").suite("SwiftPluginTaskProvider Test Suite", function () {
             folderContext = await folderInRootWorkspace("command-plugin", workspaceContext);
             const logger = await ctx.loggerFactory.temp("SwiftPluginTaskProvider.tests");
             await folderContext.loadSwiftPlugins(logger);
-            expect(logger.logs.length).to.equal(0, `Expected no output channel logs`);
+            if (logger.logs.length > 0) {
+                expect.fail(
+                    `Expected no output channel logs: ${JSON.stringify(logger.logs, undefined, 2)}`
+                );
+            }
             expect(workspaceContext.folders).to.not.have.lengthOf(0);
         },
     });

test/integration-tests/ui/ProjectPanelProvider.test.ts

@@ -50,7 +50,11 @@ tag("medium").suite("ProjectPanelProvider Test Suite", function () {
             );
             const logger = await ctx.loggerFactory.temp("ProjectPanelProvider.tests");
             await folderContext.loadSwiftPlugins(logger);
-            expect(logger.logs.length).to.equal(0, `Expected no output channel logs`);
+            if (logger.logs.length > 0) {
+                expect.fail(
+                    `Expected no output channel logs: ${JSON.stringify(logger.logs, undefined, 2)}`
+                );
+            }
             treeProvider = new ProjectPanelProvider(workspaceContext);
             await workspaceContext.focusFolder(folderContext);
             const buildAllTask = await createBuildAllTask(folderContext);