Introduce defaultTimeoutDuration to get the default timeout as a Duration

Author: ahoppen

Sources/Diagnose/TraceFromSignpostsCommand.swift

@@ -15,8 +15,6 @@ import Foundation
 import RegexBuilder
 import SwiftExtensions
 
-import class TSCBasic.Process
-
 /// Shared instance of the regex that is used to extract Signpost lines from `log stream --signpost`.
 fileprivate struct LogParseRegex {
   @MainActor static let shared = LogParseRegex()

Sources/SKTestSupport/RepeatUntilExpectedResult.swift

@@ -21,7 +21,7 @@ import XCTest
 ///
 /// `sleepInterval` is the duration to wait before re-executing the body.
 package func repeatUntilExpectedResult(
-  timeout: Duration = .seconds(defaultTimeout),
+  timeout: Duration = defaultTimeoutDuration,
   sleepInterval: Duration = .seconds(1),
   _ body: () async throws -> Bool,
   file: StaticString = #filePath,

Sources/SKTestSupport/SkipUnless.swift

@@ -266,7 +266,7 @@ package actor SkipUnless {
               sourcekitd.keys.useNewAPI: 1
             ],
           ]),
-          timeout: .seconds(defaultTimeout),
+          timeout: defaultTimeoutDuration,
           fileContents: nil
         )
         return response[sourcekitd.keys.useNewAPI] == 1

Sources/SKTestSupport/TestSourceKitLSPClient.swift

@@ -197,7 +197,7 @@ package final class TestSourceKitLSPClient: MessageHandler, Sendable {
     preInitialization?(self)
     if initialize {
       let capabilities = capabilities
-      try await withTimeout(.seconds(defaultTimeout)) {
+      try await withTimeout(defaultTimeoutDuration) {
         _ = try await self.send(
           InitializeRequest(
             processId: nil,
@@ -270,7 +270,7 @@ package final class TestSourceKitLSPClient: MessageHandler, Sendable {
   ///
   /// - Note: This also returns any notifications sent before the call to
   ///   `nextNotification`.
-  package func nextNotification(timeout: Duration = .seconds(defaultTimeout)) async throws -> any NotificationType {
+  package func nextNotification(timeout: Duration = defaultTimeoutDuration) async throws -> any NotificationType {
     return try await notifications.next(timeout: timeout)
   }
 
@@ -279,7 +279,7 @@ package final class TestSourceKitLSPClient: MessageHandler, Sendable {
   /// If the next notification is not a `PublishDiagnosticsNotification`, this
   /// methods throws.
   package func nextDiagnosticsNotification(
-    timeout: Duration = .seconds(defaultTimeout)
+    timeout: Duration = defaultTimeoutDuration
   ) async throws -> PublishDiagnosticsNotification {
     guard !usePullDiagnostics else {
       struct PushDiagnosticsError: Error, CustomStringConvertible {
@@ -295,7 +295,7 @@ package final class TestSourceKitLSPClient: MessageHandler, Sendable {
   package func nextNotification<ExpectedNotificationType: NotificationType>(
     ofType: ExpectedNotificationType.Type,
     satisfying predicate: (ExpectedNotificationType) throws -> Bool = { _ in true },
-    timeout: Duration = .seconds(defaultTimeout)
+    timeout: Duration = defaultTimeoutDuration
   ) async throws -> ExpectedNotificationType {
     while true {
       let nextNotification = try await nextNotification(timeout: timeout)

Sources/SKTestSupport/Timeouts.swift

@@ -22,3 +22,5 @@ package let defaultTimeout: TimeInterval = {
   }
   return 180
 }()
+
+package var defaultTimeoutDuration: Duration { .seconds(defaultTimeout) }

Tests/SourceKitDTests/SourceKitDTests.swift

@@ -84,15 +84,15 @@ final class SourceKitDTests: XCTestCase {
       keys.compilerArgs: args,
     ])
 
-    _ = try await sourcekitd.send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    _ = try await sourcekitd.send(req, timeout: defaultTimeoutDuration, fileContents: nil)
 
     try await fulfillmentOfOrThrow([expectation1, expectation2])
 
     let close = sourcekitd.dictionary([
       keys.request: sourcekitd.requests.editorClose,
       keys.name: path,
     ])
-    _ = try await sourcekitd.send(close, timeout: .seconds(defaultTimeout), fileContents: nil)
+    _ = try await sourcekitd.send(close, timeout: defaultTimeoutDuration, fileContents: nil)
   }
 }
 

Tests/SwiftSourceKitPluginTests/SwiftSourceKitPluginTests.swift

@@ -1826,7 +1826,7 @@ fileprivate extension SourceKitD {
       keys.syntacticOnly: 1,
       keys.compilerArgs: compilerArguments as [SKDRequestValue],
     ])
-    _ = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    _ = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
     return DocumentPositions(markers: markers, textWithoutMarkers: textWithoutMarkers)
   }
 
@@ -1840,7 +1840,7 @@ fileprivate extension SourceKitD {
       keys.syntacticOnly: 1,
     ])
 
-    _ = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    _ = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
   }
 
   func closeDocument(_ name: String) async throws {
@@ -1849,7 +1849,7 @@ fileprivate extension SourceKitD {
       keys.name: name,
     ])
 
-    _ = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    _ = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
   }
 
   func completeImpl(
@@ -1884,7 +1884,7 @@ fileprivate extension SourceKitD {
       keys.compilerArgs: compilerArguments as [SKDRequestValue]?,
     ])
 
-    let res = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    let res = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
     return try CompletionResultSet(res)
   }
 
@@ -1942,7 +1942,7 @@ fileprivate extension SourceKitD {
       keys.codeCompleteOptions: dictionary([keys.useNewAPI: 1]),
     ])
 
-    _ = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    _ = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
   }
 
   func completeDocumentation(id: Int) async throws -> CompletionDocumentation {
@@ -1951,7 +1951,7 @@ fileprivate extension SourceKitD {
       keys.identifier: id,
     ])
 
-    let resp = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    let resp = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
     return CompletionDocumentation(resp)
   }
 
@@ -1960,7 +1960,7 @@ fileprivate extension SourceKitD {
       keys.request: requests.codeCompleteDiagnostic,
       keys.identifier: id,
     ])
-    let resp = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    let resp = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
 
     return CompletionDiagnostic(resp)
   }
@@ -1969,7 +1969,7 @@ fileprivate extension SourceKitD {
     let req = dictionary([
       keys.request: requests.dependencyUpdated
     ])
-    _ = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    _ = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
   }
 
   func setPopularAPI(popular: [String], unpopular: [String]) async throws {
@@ -1980,7 +1980,7 @@ fileprivate extension SourceKitD {
       keys.unpopular: unpopular as [SKDRequestValue],
     ])
 
-    let resp = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    let resp = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
     XCTAssertEqual(resp[keys.useNewAPI], 1)
   }
 
@@ -1997,7 +1997,7 @@ fileprivate extension SourceKitD {
       keys.notoriousModules: notoriousModules as [SKDRequestValue],
     ])
 
-    let resp = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    let resp = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
     XCTAssertEqual(resp[keys.useNewAPI], 1)
   }
 
@@ -2021,7 +2021,7 @@ fileprivate extension SourceKitD {
       keys.modulePopularity: modulePopularity as [SKDRequestValue],
     ])
 
-    let resp = try await send(req, timeout: .seconds(defaultTimeout), fileContents: nil)
+    let resp = try await send(req, timeout: defaultTimeoutDuration, fileContents: nil)
     XCTAssertEqual(resp[keys.useNewAPI], 1)
   }