Merge pull request #2110 from swiftlang/main

Merge `main` into `release/6.2`

Author: ahoppen

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version: 6.0
+// swift-tools-version: 6.1
 
 import Foundation
 import PackageDescription

Sources/BuildSystemIntegration/SwiftPMBuildSystem.swift

@@ -20,7 +20,7 @@ package import LanguageServerProtocol
 import LanguageServerProtocolExtensions
 @preconcurrency import PackageGraph
 import PackageLoading
-import PackageModel
+@preconcurrency import PackageModel
 import SKLogging
 package import SKOptions
 @preconcurrency package import SPMBuildCore

Sources/SKLogging/Logging.swift

@@ -19,15 +19,9 @@ package typealias LogLevel = os.OSLogType
 package typealias Logger = os.Logger
 package typealias Signposter = OSSignposter
 
-#if compiler(<5.11)
-extension OSSignposter: @unchecked Sendable {}
-extension OSSignpostID: @unchecked Sendable {}
-extension OSSignpostIntervalState: @unchecked Sendable {}
-#else
 extension OSSignposter: @retroactive @unchecked Sendable {}
 extension OSSignpostID: @retroactive @unchecked Sendable {}
 extension OSSignpostIntervalState: @retroactive @unchecked Sendable {}
-#endif
 
 extension os.Logger {
   package func makeSignposter() -> Signposter {

Sources/SKTestSupport/SkipUnless.swift

@@ -353,30 +353,6 @@ package actor SkipUnless {
       return .featureSupported
     }
   }
-
-  /// Checks that swift-format supports running as `swift-format format -` to indicate that the source file should be
-  /// read from stdin, ie. that swift-format contains https://github.com/swiftlang/swift-format/pull/914.
-  package static func swiftFormatSupportsDashToIndicateReadingFromStdin(
-    file: StaticString = #filePath,
-    line: UInt = #line
-  ) async throws {
-    return try await shared.skipUnlessSupportedByToolchain(swiftVersion: SwiftVersion(6, 1), file: file, line: line) {
-      guard let swiftFormatPath = await ToolchainRegistry.forTesting.default?.swiftFormat else {
-        throw GenericError("Could not find swift-format")
-      }
-      let process = TSCBasic.Process(arguments: [try swiftFormatPath.filePath, "format", "-"])
-      let writeStream = try process.launch()
-      writeStream.send("let x = 1")
-      try writeStream.close()
-      let result = try await process.waitUntilExitStoppingProcessOnTaskCancellation()
-      let output = try result.utf8Output()
-      switch output {
-      case "": return false
-      case "let x = 1\n": return true
-      default: throw GenericError("Received unexpected formatting output: '\(output)'")
-      }
-    }
-  }
 }
 
 // MARK: - Parsing Swift compiler version

Sources/SKTestSupport/TestSourceKitLSPClient.swift

@@ -261,7 +261,7 @@ package final class TestSourceKitLSPClient: MessageHandler, Sendable {
           .failure(ResponseError.unknown("\(R.method) request timed out after \(defaultTimeoutDuration)"))
         )
       }
-      await server.handle(notification: CancelRequestNotification(id: requestID))
+      server.handle(CancelRequestNotification(id: requestID))
     }
     server.handle(request, id: requestID) { result in
       if replyOutstanding.takeValue() ?? false {

Tests/BuildSystemIntegrationTests/SwiftPMBuildSystemTests.swift

@@ -309,46 +309,6 @@ final class SwiftPMBuildSystemTests: XCTestCase {
     }
   }
 
-  func testDefaultSDKs() async throws {
-    try await withTestScratchDir { tempDir in
-      try FileManager.default.createFiles(
-        root: tempDir,
-        files: [
-          "pkg/Sources/lib/a.swift": "",
-          "pkg/Package.swift": """
-          // swift-tools-version:6.0
-          import PackageDescription
-          let package = Package(
-            name: "a",
-            targets: [.target(name: "lib")]
-          )
-          """,
-        ]
-      )
-      let tr = ToolchainRegistry.forTesting
-
-      let options = SourceKitLSPOptions.SwiftPMOptions(
-        swiftSDKsDirectory: "/tmp/non_existent_sdks_dir",
-        triple: "wasm32-unknown-wasi"
-      )
-
-      let packageRoot = tempDir.appendingPathComponent("pkg")
-      let swiftpmBuildSystem = try await SwiftPMBuildSystem(
-        projectRoot: packageRoot,
-        toolchainRegistry: tr,
-        options: SourceKitLSPOptions(swiftPM: options),
-        connectionToSourceKitLSP: LocalConnection(receiverName: "Dummy"),
-        testHooks: SwiftPMTestHooks()
-      )
-      let path = await swiftpmBuildSystem.destinationBuildParameters.toolchain.sdkRootPath
-      XCTAssertEqual(
-        path?.components.suffix(3),
-        ["usr", "share", "wasi-sysroot"],
-        "SwiftPMBuildSystem should share default SDK derivation logic with libSwiftPM"
-      )
-    }
-  }
-
   func testManifestArgs() async throws {
     try await withTestScratchDir { tempDir in
       try FileManager.default.createFiles(

Tests/SourceKitLSPTests/FormattingTests.swift

@@ -22,8 +22,6 @@ import class TSCBasic.Process
 
 final class FormattingTests: XCTestCase {
   func testFormatting() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -57,8 +55,6 @@ final class FormattingTests: XCTestCase {
   }
 
   func testFormattingNoEdits() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -84,8 +80,6 @@ final class FormattingTests: XCTestCase {
   }
 
   func testConfigFileOnDisk() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     // We pick up an invalid swift-format configuration file and thus don't set the user-provided options.
     let project = try await MultiFileTestProject(files: [
       ".swift-format": """
@@ -120,8 +114,6 @@ final class FormattingTests: XCTestCase {
   }
 
   func testConfigFileInParentDirectory() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     // We pick up an invalid swift-format configuration file and thus don't set the user-provided options.
     let project = try await MultiFileTestProject(files: [
       ".swift-format": """
@@ -156,8 +148,6 @@ final class FormattingTests: XCTestCase {
   }
 
   func testConfigFileInNestedDirectory() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     // We pick up an invalid swift-format configuration file and thus don't set the user-provided options.
     let project = try await MultiFileTestProject(files: [
       ".swift-format": """
@@ -200,8 +190,6 @@ final class FormattingTests: XCTestCase {
   }
 
   func testInvalidConfigurationFile() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     // We pick up an invalid swift-format configuration file and thus don't set the user-provided options.
     // The swift-format default is 2 spaces.
     let project = try await MultiFileTestProject(files: [
@@ -226,8 +214,6 @@ final class FormattingTests: XCTestCase {
   }
 
   func testInsertAndRemove() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -259,8 +245,6 @@ final class FormattingTests: XCTestCase {
   }
 
   func testMultiLineStringInsertion() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 

Tests/SourceKitLSPTests/OnTypeFormattingTests.swift

@@ -18,8 +18,6 @@ import XCTest
 
 final class OnTypeFormattingTests: XCTestCase {
   func testOnlyFormatsSpecifiedLine() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -53,8 +51,6 @@ final class OnTypeFormattingTests: XCTestCase {
   }
 
   func testFormatsFullLineAndDoesNotFormatNextLine() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -92,8 +88,6 @@ final class OnTypeFormattingTests: XCTestCase {
   /// Otherwise could mess up writing code. You'd write {} and try to go into the braces to write more code,
   /// only for on-type formatting to immediately close the braces again.
   func testDoesNothingWhenInAnEmptyLine() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 

Tests/SourceKitLSPTests/PullDiagnosticsTests.swift

@@ -329,37 +329,34 @@ final class PullDiagnosticsTests: XCTestCase {
   }
 
   func testDontReturnEmptyDiagnosticsIfDiagnosticRequestIsCancelled() async throws {
-    let diagnosticRequestCancelled = MultiEntrySemaphore(name: "diagnostic request cancelled")
-    let packageLoadingDidFinish = self.expectation(description: "Package loading did finish")
-    var testHooks = Hooks()
-    testHooks.buildSystemHooks.swiftPMTestHooks.reloadPackageDidFinish = {
-      packageLoadingDidFinish.fulfill()
-    }
-    testHooks.indexHooks.preparationTaskDidStart = { _ in
-      await diagnosticRequestCancelled.waitOrXCTFail()
-      // Poll until the `CancelRequestNotification` has been propagated to the request handling.
-      // We can't use `repeatUntilExpectedResult` here because that throws a `CancellationError` when the preparation is
-      // cancelled.
-      for _ in 0..<Int(defaultTimeout * 100) {
-        if Task.isCancelled {
-          break
-        }
-        #if os(Windows)
-        Sleep(10 /*ms*/)
-        #else
-        usleep(10_000 /*µs*/)
-        #endif
-      }
-    }
+    // Use an example that is slow to type check to ensure that we don't get a diagnostic response from sourcekitd
+    // before the request cancellation gets handled.
     let project = try await SwiftPMTestProject(
       files: [
-        "Lib.swift": "let x: String = 1"
+        "Lib.swift": """
+        struct A: ExpressibleByIntegerLiteral { init(integerLiteral value: Int) {} }
+        struct B: ExpressibleByIntegerLiteral { init(integerLiteral value: Int) {} }
+        struct C: ExpressibleByIntegerLiteral { init(integerLiteral value: Int) {} }
+
+        func + (lhs: A, rhs: B) -> A { fatalError() }
+        func + (lhs: B, rhs: C) -> A { fatalError() }
+        func + (lhs: C, rhs: A) -> A { fatalError() }
+
+        func + (lhs: B, rhs: A) -> B { fatalError() }
+        func + (lhs: C, rhs: B) -> B { fatalError() }
+        func + (lhs: A, rhs: C) -> B { fatalError() }
+
+        func + (lhs: C, rhs: B) -> C { fatalError() }
+        func + (lhs: B, rhs: C) -> C { fatalError() }
+        func + (lhs: A, rhs: A) -> C { fatalError() }
+
+        func slow() {
+          let x: C = 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10
+        }
+        """
       ],
-      hooks: testHooks,
-      enableBackgroundIndexing: true,
-      pollIndex: false
+      enableBackgroundIndexing: false
     )
-    try await fulfillmentOfOrThrow(packageLoadingDidFinish)
     let (uri, _) = try project.openDocument("Lib.swift")
 
     let diagnosticResponseReceived = self.expectation(description: "Received diagnostic response")
@@ -370,7 +367,6 @@ final class PullDiagnosticsTests: XCTestCase {
       diagnosticResponseReceived.fulfill()
     }
     project.testClient.send(CancelRequestNotification(id: requestID))
-    diagnosticRequestCancelled.signal()
     try await fulfillmentOfOrThrow(diagnosticResponseReceived)
   }
 

Tests/SourceKitLSPTests/RangeFormattingTests.swift

@@ -18,8 +18,6 @@ import XCTest
 
 final class RangeFormattingTests: XCTestCase {
   func testOnlyFormatsSpecifiedLines() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -52,8 +50,6 @@ final class RangeFormattingTests: XCTestCase {
   }
 
   func testOnlyFormatsSpecifiedColumns() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)
 
@@ -86,8 +82,6 @@ final class RangeFormattingTests: XCTestCase {
   }
 
   func testFormatsMultipleLines() async throws {
-    try await SkipUnless.swiftFormatSupportsDashToIndicateReadingFromStdin()
-
     let testClient = try await TestSourceKitLSPClient()
     let uri = DocumentURI(for: .swift)