Merge pull request #1747 from ahoppen/default-timeout-sourcekitd

ahoppen · web-flow · commit b8aca0c6b4b8 · 2024-10-09T18:00:55.000-07:00
Use the test’s default timeout duration for sourcekitd timeouts
diff --git a/Sources/SKTestSupport/TestSourceKitLSPClient.swift b/Sources/SKTestSupport/TestSourceKitLSPClient.swift
@@ -130,6 +130,9 @@ package final class TestSourceKitLSPClient: MessageHandler, Sendable {
         (options.swiftPMOrDefault.swiftCompilerFlags ?? []) + ["-module-cache-path", globalModuleCache.path]
     }
     options.backgroundIndexing = enableBackgroundIndexing
+    if options.sourcekitdRequestTimeout == nil {
+      options.sourcekitdRequestTimeout = defaultTimeout
+    }
 
     var notificationYielder: AsyncStream<any NotificationType>.Continuation!
     self.notifications = AsyncStream { continuation in

Original file line number	Diff line number	Diff line change
`@@ -130,6 +130,9 @@ package final class TestSourceKitLSPClient: MessageHandler, Sendable {`
`130`	`130`	`(options.swiftPMOrDefault.swiftCompilerFlags ?? []) + ["-module-cache-path", globalModuleCache.path]`
`131`	`131`	`}`
`132`	`132`	`options.backgroundIndexing = enableBackgroundIndexing`
	`133`	`+ if options.sourcekitdRequestTimeout == nil {`
	`134`	`+ options.sourcekitdRequestTimeout = defaultTimeout`
	`135`	`+ }`
`133`	`136`
`134`	`137`	`var notificationYielder: AsyncStream<any NotificationType>.Continuation!`
`135`	`138`	`self.notifications = AsyncStream { continuation in`