Merge pull request #1044 from ahoppen/ahoppen/fix-warnings

Fix warnings when building sourcekit-lsp

Author: ahoppen

Sources/LSPTestSupport/Assertions.swift

@@ -135,7 +135,11 @@ extension XCTestCase {
     // At the same time that XCTWaiter.fulfillment was introduced `XCTWaiter.wait` was deprecated in async contexts.
     // This means that we can't write code that compiles without warnings with both the macOS 13.3 and any previous SDK.
     // Accepting the warning here when compiling with macOS 13.3 or later is the only thing that I know of that we can do here.
-    let started = XCTWaiter.wait(for: expectations, timeout: timeout, enforceOrder: enforceOrderOfFulfillment)
+    let started = await XCTWaiter.fulfillment(
+      of: expectations,
+      timeout: timeout,
+      enforceOrder: enforceOrderOfFulfillment
+    )
     if started != .completed {
       throw ExpectationNotFulfilledError(expecatations: expectations)
     }

Sources/SKSwiftPMWorkspace/SwiftPMWorkspace.swift

@@ -217,7 +217,8 @@ extension SwiftPMWorkspace {
     )
 
     let plan = try BuildPlan(
-      buildParameters: buildParameters,
+      productsBuildParameters: buildParameters,
+      toolsBuildParameters: buildParameters,
       graph: packageGraph,
       fileSystem: fileSystem,
       observabilityScope: observabilitySystem.topScope

Sources/SKTestSupport/SwiftPMTestWorkspace.swift

@@ -83,10 +83,10 @@ public class SwiftPMTestWorkspace: MultiFileTestWorkspace {
       "-Xswiftc", "-index-ignore-system-modules",
       "-Xcc", "-index-ignore-system-symbols",
     ]
-    var environment = ProcessEnv.vars
+    var environment = ProcessEnv.block
     // FIXME: SwiftPM does not index-while-building on non-Darwin platforms for C-family files (rdar://117744039).
     // Force-enable index-while-building with the environment variable.
     environment["SWIFTPM_ENABLE_CLANG_INDEX_STORE"] = "1"
-    try await Process.checkNonZeroExit(arguments: arguments, environment: environment)
+    try await Process.checkNonZeroExit(arguments: arguments, environmentBlock: environment)
   }
 }

Sources/SourceKitLSP/Swift/SwiftLanguageServer.swift

@@ -790,14 +790,14 @@ extension SwiftLanguageServer {
   }
 
   public func documentDiagnostic(_ req: DocumentDiagnosticsRequest) async throws -> DocumentDiagnosticReport {
-    let snapshot = try documentManager.latestSnapshot(req.textDocument.uri)
-    let buildSettings = await self.buildSettings(for: req.textDocument.uri)
-    let diagnosticReport = try await self.diagnosticReportManager.diagnosticReport(
-      for: snapshot,
-      buildSettings: buildSettings
-    )
     do {
-      return try await .full(diagnosticReport)
+      let snapshot = try documentManager.latestSnapshot(req.textDocument.uri)
+      let buildSettings = await self.buildSettings(for: req.textDocument.uri)
+      let diagnosticReport = try await self.diagnosticReportManager.diagnosticReport(
+        for: snapshot,
+        buildSettings: buildSettings
+      )
+      return .full(diagnosticReport)
     } catch {
       // VS Code does not request diagnostics again for a document if the diagnostics request failed.
       // Since sourcekit-lsp usually recovers from failures (e.g. after sourcekitd crashes), this is undesirable.

Tests/SKSwiftPMWorkspaceTests/SwiftPMWorkspaceTests.swift

@@ -130,7 +130,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
       )
 
       let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
-      let hostTriple = await ws.buildParameters.targetTriple
+      let hostTriple = await ws.buildParameters.triple
       let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent)
 
       assertEqual(await ws.buildPath, build)
@@ -198,7 +198,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
       )
 
       let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
-      let hostTriple = await ws.buildParameters.targetTriple
+      let hostTriple = await ws.buildParameters.triple
       let build = buildPath(root: packageRoot, config: config, platform: hostTriple.platformBuildPathComponent)
 
       assertEqual(await ws.buildPath, build)
@@ -409,7 +409,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
       let acxx = packageRoot.appending(components: "Sources", "lib", "a.cpp")
       let bcxx = packageRoot.appending(components: "Sources", "lib", "b.cpp")
       let header = packageRoot.appending(components: "Sources", "lib", "include", "a.h")
-      let hostTriple = await ws.buildParameters.targetTriple
+      let hostTriple = await ws.buildParameters.triple
       let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent)
 
       assertEqual(await ws.buildPath, build)
@@ -488,7 +488,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
       let aswift = packageRoot.appending(components: "Sources", "lib", "a.swift")
       let arguments = try await ws.buildSettings(for: aswift.asURI, language: .swift)!.compilerArguments
       assertArgumentsContain("-target", arguments: arguments)  // Only one!
-      let hostTriple = await ws.buildParameters.targetTriple
+      let hostTriple = await ws.buildParameters.triple
 
       #if os(macOS)
       assertArgumentsContain(
@@ -697,7 +697,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
         ]
       )
       let packageRoot = tempDir.appending(component: "pkg")
-      let tr = await ToolchainRegistry.forTesting
+      let tr = ToolchainRegistry.forTesting
       let ws = try await SwiftPMWorkspace(
         workspacePath: packageRoot,
         toolchainRegistry: tr,
@@ -706,7 +706,7 @@ final class SwiftPMWorkspaceTests: XCTestCase {
       )
 
       let aswift = packageRoot.appending(components: "Plugins", "MyPlugin", "a.swift")
-      let hostTriple = await ws.buildParameters.targetTriple
+      let hostTriple = await ws.buildParameters.triple
       let build = buildPath(root: packageRoot, platform: hostTriple.platformBuildPathComponent)
 
       assertEqual(await ws.buildPath, build)