Fix more review comments

Author: award999

Sources/SwiftLanguageService/SwiftPlaygroundsScanner.swift

@@ -10,13 +10,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+internal import BuildServerIntegration
 import Foundation
 import LanguageServerProtocol
 import SKLogging
 import SourceKitLSP
-import SwiftSyntax
 import SwiftParser
-internal import BuildServerIntegration
+import SwiftSyntax
 
 // MARK: - SwiftPlaygroundsScanner
 
@@ -47,7 +47,7 @@ final class SwiftPlaygroundsScanner: SyntaxVisitor {
   ) async -> [TextDocumentPlayground] {
     guard let canonicalTarget = await workspace.buildServerManager.canonicalTarget(for: snapshot.uri),
       let moduleName = await workspace.buildServerManager.moduleName(for: snapshot.uri, in: canonicalTarget),
-      let baseName = snapshot.uri.fileURL?.lastPathComponent 
+      let baseName = snapshot.uri.fileURL?.lastPathComponent
     else {
       return []
     }
@@ -63,7 +63,7 @@ final class SwiftPlaygroundsScanner: SyntaxVisitor {
     range: Range<AbsolutePosition>
   ) {
     let positionRange = snapshot.absolutePositionRange(of: range)
-  
+
     result.append(
       TextDocumentPlayground(
         id: id,
@@ -91,7 +91,7 @@ final class SwiftPlaygroundsScanner: SyntaxVisitor {
     let playgroundID = "\(baseID):\(startPosition.line + 1):\(startPosition.utf16index + 1)"
 
     record(
-      id: playgroundID, 
+      id: playgroundID,
       label: playgroundLabel,
       range: node.trimmedRange
     )

Sources/ToolchainRegistry/Toolchain.swift

@@ -245,7 +245,9 @@ public final class Toolchain: Sendable {
       }
     }
     return isSuperset(for: \.clang) && isSuperset(for: \.swift) && isSuperset(for: \.swiftc)
-      && isSuperset(for: \.clangd) && isSuperset(for: \.sourcekitd) && isSuperset(for: \.libIndexStore)
+      && isSuperset(for: \.swiftPlay) && isSuperset(for: \.swiftFormat) && isSuperset(for: \.sourceKitClientPlugin)
+      && isSuperset(for: \.sourceKitServicePlugin) && isSuperset(for: \.clangd) && isSuperset(for: \.sourcekitd)
+      && isSuperset(for: \.libIndexStore)
   }
 
   /// Same as `isSuperset` but returns `false` if both toolchains have the same set of tools.

Tests/SourceKitLSPTests/CodeLensTests.swift

@@ -15,28 +15,54 @@ import SKTestSupport
 import ToolchainRegistry
 import XCTest
 
-final class CodeLensTests: XCTestCase {
+fileprivate extension Toolchain {
+  #if compiler(>=6.4)
+  #warning(
+    "Once we require swift-play in the toolchain that's used to test SourceKit-LSP, we can just use `forTesting`"
+  )
+  #endif
+  static var forTestingWithSwiftPlay: Toolchain {
+    get async throws {
+      let toolchain = try await unwrap(ToolchainRegistry.forTesting.default)
+      return Toolchain(
+        identifier: "\(toolchain.identifier)-swift-swift",
+        displayName: "\(toolchain.identifier) with swift-play",
+        path: toolchain.path,
+        clang: toolchain.clang,
+        swift: toolchain.swift,
+        swiftc: toolchain.swiftc,
+        swiftPlay: URL(fileURLWithPath: "/dummy/usr/bin/swift-play"),
+        clangd: toolchain.clangd,
+        sourcekitd: toolchain.sourcekitd,
+        sourceKitClientPlugin: toolchain.sourceKitClientPlugin,
+        sourceKitServicePlugin: toolchain.sourceKitServicePlugin,
+        libIndexStore: toolchain.libIndexStore
+      )
+    }
+  }
 
-  var toolchain: Toolchain!
-  var toolchainWithSwiftPlay: Toolchain!
-
-  override func setUp() async throws {
-    toolchain = try await unwrap(ToolchainRegistry.forTesting.default)
-    toolchainWithSwiftPlay = Toolchain(
-      identifier: "\(toolchain.identifier)-swift-swift",
-      displayName: "\(toolchain.identifier) with swift-play",
-      path: toolchain.path,
-      clang: toolchain.clang,
-      swift: toolchain.swift,
-      swiftc: toolchain.swiftc,
-      swiftPlay: URL(fileURLWithPath: "/dummy/usr/bin/swift-play"),
-      clangd: toolchain.clangd,
-      sourcekitd: toolchain.sourcekitd,
-      sourceKitClientPlugin: toolchain.sourceKitClientPlugin,
-      sourceKitServicePlugin: toolchain.sourceKitServicePlugin,
-      libIndexStore: toolchain.libIndexStore
-    )
+  static var forTestingWithoutSwiftPlay: Toolchain {
+    get async throws {
+      let toolchain = try await unwrap(ToolchainRegistry.forTesting.default)
+      return Toolchain(
+        identifier: "\(toolchain.identifier)-no-swift-swift",
+        displayName: "\(toolchain.identifier) without swift-play",
+        path: toolchain.path,
+        clang: toolchain.clang,
+        swift: toolchain.swift,
+        swiftc: toolchain.swiftc,
+        swiftPlay: nil,
+        clangd: toolchain.clangd,
+        sourcekitd: toolchain.sourcekitd,
+        sourceKitClientPlugin: toolchain.sourceKitClientPlugin,
+        sourceKitServicePlugin: toolchain.sourceKitServicePlugin,
+        libIndexStore: toolchain.libIndexStore
+      )
+    }
   }
+}
+
+final class CodeLensTests: XCTestCase {
 
   func testNoLenses() async throws {
     var codeLensCapabilities = TextDocumentClientCapabilities.CodeLens()
@@ -66,7 +92,7 @@ final class CodeLensTests: XCTestCase {
   }
 
   func testNoClientCodeLenses() async throws {
-    let toolchainRegistry = ToolchainRegistry(toolchains: [toolchainWithSwiftPlay])
+    let toolchainRegistry = ToolchainRegistry(toolchains: [try await Toolchain.forTestingWithSwiftPlay])
     let project = try await SwiftPMTestProject(
       files: [
         "Test.swift": """
@@ -105,7 +131,7 @@ final class CodeLensTests: XCTestCase {
       SupportedCodeLensCommand.play: "swift.play",
     ]
     let capabilities = ClientCapabilities(textDocument: TextDocumentClientCapabilities(codeLens: codeLensCapabilities))
-    let toolchainRegistry = ToolchainRegistry(toolchains: [toolchainWithSwiftPlay])
+    let toolchainRegistry = ToolchainRegistry(toolchains: [try await Toolchain.forTestingWithSwiftPlay])
 
     let project = try await SwiftPMTestProject(
       files: [
@@ -194,7 +220,7 @@ final class CodeLensTests: XCTestCase {
       SupportedCodeLensCommand.play: "swift.play"
     ]
     let capabilities = ClientCapabilities(textDocument: TextDocumentClientCapabilities(codeLens: codeLensCapabilities))
-    let toolchainRegistry = ToolchainRegistry(toolchains: [toolchainWithSwiftPlay])
+    let toolchainRegistry = ToolchainRegistry(toolchains: [try await Toolchain.forTestingWithSwiftPlay])
 
     let project = try await SwiftPMTestProject(
       files: [
@@ -256,21 +282,7 @@ final class CodeLensTests: XCTestCase {
       SupportedCodeLensCommand.play: "swift.play",
     ]
     let capabilities = ClientCapabilities(textDocument: TextDocumentClientCapabilities(codeLens: codeLensCapabilities))
-    let toolchainWithoutSwiftPlay = Toolchain(
-      identifier: "\(toolchain.identifier)-swift-swift",
-      displayName: "\(toolchain.identifier) with swift-play",
-      path: toolchain.path,
-      clang: toolchain.clang,
-      swift: toolchain.swift,
-      swiftc: toolchain.swiftc,
-      swiftPlay: nil,
-      clangd: toolchain.clangd,
-      sourcekitd: toolchain.sourcekitd,
-      sourceKitClientPlugin: toolchain.sourceKitClientPlugin,
-      sourceKitServicePlugin: toolchain.sourceKitServicePlugin,
-      libIndexStore: toolchain.libIndexStore
-    )
-    let toolchainRegistry = ToolchainRegistry(toolchains: [toolchainWithoutSwiftPlay])
+    let toolchainRegistry = ToolchainRegistry(toolchains: [try await Toolchain.forTestingWithoutSwiftPlay])
 
     let project = try await SwiftPMTestProject(
       files: [
@@ -331,7 +343,7 @@ final class CodeLensTests: XCTestCase {
       SupportedCodeLensCommand.play: "swift.play"
     ]
     let capabilities = ClientCapabilities(textDocument: TextDocumentClientCapabilities(codeLens: codeLensCapabilities))
-    let toolchainRegistry = ToolchainRegistry(toolchains: [toolchainWithSwiftPlay])
+    let toolchainRegistry = ToolchainRegistry(toolchains: [try await Toolchain.forTestingWithSwiftPlay])
     let project = try await SwiftPMTestProject(
       files: [
         "Sources/MyLibrary/Test.swift": """
@@ -375,7 +387,7 @@ final class CodeLensTests: XCTestCase {
       SupportedCodeLensCommand.play: "swift.play"
     ]
     let capabilities = ClientCapabilities(textDocument: TextDocumentClientCapabilities(codeLens: codeLensCapabilities))
-    let toolchainRegistry = ToolchainRegistry(toolchains: [toolchainWithSwiftPlay])
+    let toolchainRegistry = ToolchainRegistry(toolchains: [try await Toolchain.forTestingWithSwiftPlay])
     let project = try await SwiftPMTestProject(
       files: [
         "Sources/MyLibrary/Test.swift": """