Fix review comments

Author: award999

.github/workflows/nightly.yml

@@ -104,7 +104,7 @@ jobs:
       linux_pre_build_command: . .github/workflows/scripts/setup-linux.sh
       linux_build_command: ./scripts/test.sh
       # Windows
-      windows_exclude_swift_versions: '[{"swift_version": "5.9"}, {"swift_version": "6.0"}, {"swift_version": "6.1"}, {"swift_version": "6.2"}, {"swift_version": "nightly-6.1"}, {"swift_version": "nightly-6.2"}, {"swift_version": "nightly"}]'
+      windows_exclude_swift_versions: '[{"swift_version": "5.9"}, {"swift_version": "6.0"}, {"swift_version": "6.1"}, {"swift_version": "nightly-6.1"}, {"swift_version": "nightly-6.2"}, {"swift_version": "nightly"}]'
       windows_env_vars: |
         CI=1
         VSCODE_VERSION=insiders

src/FolderContext.ts

@@ -288,7 +288,7 @@ export class FolderContext implements vscode.Disposable {
 
     /** Return `true` if package folder has a playground provider */
     hasPlaygroundProvider() {
-        return this.testExplorer !== undefined;
+        return this.playgroundProvider !== undefined;
     }
 
     static uriName(uri: vscode.Uri): string {

src/playgrounds/LSPPlaygroundsDiscovery.ts

@@ -11,6 +11,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 //===----------------------------------------------------------------------===//
+import { FolderContext } from "../FolderContext";
 import { checkExperimentalCapability } from "../sourcekit-lsp/LanguageClientManager";
 import { LanguageClientManager } from "../sourcekit-lsp/LanguageClientManager";
 import { Playground, WorkspacePlaygroundsRequest } from "../sourcekit-lsp/extensions";
@@ -25,10 +26,12 @@ export { Playground };
  * these results.
  */
 export class LSPPlaygroundsDiscovery {
-    constructor(private languageClient: LanguageClientManager) {}
+    private languageClient: LanguageClientManager;
+    private toolchainVersion: Version;
 
-    private get toolchainVersion(): Version {
-        return this.languageClient.folderContext.toolchain.swiftVersion;
+    constructor(folderContext: FolderContext) {
+        this.languageClient = folderContext.languageClientManager;
+        this.toolchainVersion = folderContext.toolchain.swiftVersion;
     }
 
     /**

src/playgrounds/PlaygroundProvider.ts

@@ -32,6 +32,7 @@ export interface PlaygroundChangeEvent {
  * these results.
  */
 export class PlaygroundProvider implements vscode.Disposable {
+    private hasFetched: boolean = false;
     private fetchPromise: Promise<Playground[]> | undefined;
     private documentPlaygrounds: Map<string, Playground[]> = new Map();
     private didChangePlaygroundsEmitter: vscode.EventEmitter<PlaygroundChangeEvent> =
@@ -40,7 +41,7 @@ export class PlaygroundProvider implements vscode.Disposable {
     constructor(private folderContext: FolderContext) {}
 
     private get lspPlaygroundDiscovery(): LSPPlaygroundsDiscovery {
-        return new LSPPlaygroundsDiscovery(this.folderContext.languageClientManager);
+        return new LSPPlaygroundsDiscovery(this.folderContext);
     }
 
     private get logger(): SwiftLogger {
@@ -79,6 +80,8 @@ export class PlaygroundProvider implements vscode.Disposable {
     async getWorkspacePlaygrounds(): Promise<Playground[]> {
         if (this.fetchPromise) {
             return await this.fetchPromise;
+        } else if (!this.hasFetched) {
+            await this.fetch();
         }
         return Array.from(this.documentPlaygrounds.values()).flatMap(v => v);
     }
@@ -112,6 +115,11 @@ export class PlaygroundProvider implements vscode.Disposable {
         this.didChangePlaygroundsEmitter.event;
 
     async fetch() {
+        this.hasFetched = true;
+        if (this.fetchPromise) {
+            await this.fetchPromise;
+            return;
+        }
         if (!(await this.lspPlaygroundDiscovery.supportsPlaygrounds())) {
             this.logger.debug(
                 `Fetching playgrounds not supported by the language server`,