Add new swiftPlayPath setting to make development easier

src/commands/runPlayground.ts

@@ -11,10 +11,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import { dirname } from "path";
 import * as vscode from "vscode";
 import { Location, Range } from "vscode-languageclient";
 
 import { FolderContext } from "../FolderContext";
+import configuration from "../configuration";
 import { createSwiftTask } from "../tasks/SwiftTaskProvider";
 import { TaskManager } from "../tasks/TaskManager";
 import { packageName } from "../utilities/tasks";
@@ -50,7 +52,12 @@ export async function runPlayground(
             packageName: packageName(folderContext),
             presentationOptions: { reveal: vscode.TaskRevealKind.Always },
         },
-        folderContext.toolchain
+        folderContext.toolchain,
+        configuration.swiftPlayPath
+            ? {
+                  PATH: `${dirname(configuration.swiftPlayPath)}${process.platform === "win32" ? ";" : ":"}${process.env["PATH"]}`,
+              }
+            : undefined
     );
 
     await tasks.executeTaskAndWait(task);

src/configuration.ts

@@ -366,6 +366,13 @@ const configuration = {
                 /* Put in worker queue */
             });
     },
+    // TODO Remove when swift-play is in the toolchain
+    /** Only for development purposes for testing a local build of SwiftPM with swift-play */
+    get swiftPlayPath(): string {
+        return substituteVariablesInString(
+            vscode.workspace.getConfiguration("swift").get<string>("swiftPlayPath", "")
+        );
+    },
     /** swift build arguments */
     get buildArguments(): string[] {
         return vscode.workspace

src/playgrounds/PlaygroundProvider.ts

@@ -15,6 +15,7 @@ import * as vscode from "vscode";
 
 import { FolderContext } from "../FolderContext";
 import { FolderOperation, WorkspaceContext } from "../WorkspaceContext";
+import configuration from "../configuration";
 import { SwiftLogger } from "../logging/SwiftLogger";
 import { LSPPlaygroundsDiscovery, Playground } from "./LSPPlaygroundsDiscovery";
 
@@ -120,8 +121,11 @@ export class PlaygroundProvider implements vscode.Disposable {
             await this.fetchPromise;
             return;
         }
-        if (!(await this.lspPlaygroundDiscovery.supportsPlaygrounds())) {
-            this.logger.debug(
+        if (
+            !configuration.swiftPlayPath &&
+            !(await this.lspPlaygroundDiscovery.supportsPlaygrounds())
+        ) {
+            this.logger.warn(
                 `Fetching playgrounds not supported by the language server`,
                 this.folderContext.name
             );