Define sources of ClangCrashRecovery inline

Author: ahoppen

Sources/SKTestSupport/INPUTS/ClangCrashRecovery/main.cpp

@@ -135,15 +135,11 @@ final class CrashRecoveryTests: XCTestCase {
     }
   }
 
-  /// Crashes clangd and waits for it to restart
-  /// - Parameters:
-  ///   - ws: The workspace for which the clangd server shall be crashed
-  ///   - document: The URI of a C/C++/... document in the workspace
-  private func crashClangd(for ws: SKTibsTestWorkspace, document docUri: DocumentURI) async throws {
-    let clangdServer = await ws.testClient.server._languageService(
+  private func crashClangd(for testClient: TestSourceKitLSPClient, document docUri: DocumentURI) async throws {
+    let clangdServer = await testClient.server._languageService(
       for: docUri,
       .cpp,
-      in: ws.testClient.server.workspaceForDocument(uri: docUri)!
+      in: testClient.server.workspaceForDocument(uri: docUri)!
     )!
 
     let clangdCrashed = self.expectation(description: "clangd crashed")
@@ -169,25 +165,26 @@ final class CrashRecoveryTests: XCTestCase {
   func testClangdCrashRecovery() async throws {
     try XCTSkipIf(longTestsDisabled)
 
-    let ws = try await staticSourceKitTibsWorkspace(name: "ClangCrashRecovery")!
-    let loc = ws.testLoc("loc")
+    let testClient = try await TestSourceKitLSPClient()
+    let uri = DocumentURI.for(.cpp)
 
-    try ws.openDocument(loc.url, language: .cpp)
+    let positions = testClient.openDocument("1️⃣", uri: uri)
 
     // Make a change to the file that's not saved to disk. This way we can check that we re-open the correct in-memory state.
 
     let addFuncChange = TextDocumentContentChangeEvent(
-      range: loc.position..<loc.position,
+      range: Range(positions["1️⃣"]),
       rangeLength: 0,
       text: """
 
         void main() {
         }
         """
     )
-    ws.testClient.send(
+
+    testClient.send(
       DidChangeTextDocumentNotification(
-        textDocument: VersionedTextDocumentIdentifier(loc.docUri, version: 2),
+        textDocument: VersionedTextDocumentIdentifier(uri, version: 2),
         contentChanges: [addFuncChange]
       )
     )
@@ -196,21 +193,24 @@ final class CrashRecoveryTests: XCTestCase {
 
     let expectedHoverRange = Position(line: 1, utf16index: 5)..<Position(line: 1, utf16index: 9)
 
-    let hoverRequest = HoverRequest(textDocument: loc.docIdentifier, position: Position(line: 1, utf16index: 6))
-    let preCrashHoverResponse = try await ws.testClient.send(hoverRequest)
+    let hoverRequest = HoverRequest(
+      textDocument: TextDocumentIdentifier(uri),
+      position: Position(line: 1, utf16index: 6)
+    )
+    let preCrashHoverResponse = try await testClient.send(hoverRequest)
     precondition(
       preCrashHoverResponse?.range == expectedHoverRange,
       "Sanity check failed. The Hover response was not what we expected, even before crashing sourcekitd"
     )
 
     // Crash clangd
 
-    try await crashClangd(for: ws, document: loc.docUri)
+    try await crashClangd(for: testClient, document: uri)
 
     // Check that we have re-opened the document with the correct in-memory state
 
     await assertNoThrow {
-      let postCrashHoverResponse = try await ws.testClient.send(hoverRequest)
+      let postCrashHoverResponse = try await testClient.send(hoverRequest)
       XCTAssertEqual(postCrashHoverResponse?.range, expectedHoverRange)
     }
   }
@@ -242,7 +242,7 @@ final class CrashRecoveryTests: XCTestCase {
 
     // Crash clangd
 
-    try await crashClangd(for: ws, document: loc.docUri)
+    try await crashClangd(for: ws.testClient, document: loc.docUri)
 
     // Check that we have re-opened the document with the correct build settings
     // If we did not recover the correct build settings, document highlight would
@@ -257,22 +257,22 @@ final class CrashRecoveryTests: XCTestCase {
   func testPreventClangdCrashLoop() async throws {
     try XCTSkipIf(longTestsDisabled)
 
-    let ws = try await staticSourceKitTibsWorkspace(name: "ClangCrashRecovery")!
-    let loc = ws.testLoc("loc")
+    let testClient = try await TestSourceKitLSPClient()
+    let uri = DocumentURI.for(.cpp)
 
-    try ws.openDocument(loc.url, language: .cpp)
+    let positions = testClient.openDocument("1️⃣", uri: uri)
 
     // Send a nonsensical request to wait for clangd to start up
 
-    let hoverRequest = HoverRequest(textDocument: loc.docIdentifier, position: Position(line: 1, utf16index: 6))
-    _ = try await ws.testClient.send(hoverRequest)
+    let hoverRequest = HoverRequest(textDocument: TextDocumentIdentifier(uri), position: positions["1️⃣"])
+    _ = try await testClient.send(hoverRequest)
 
     // Keep track of clangd crashes
 
-    let clangdServer = await ws.testClient.server._languageService(
-      for: loc.docUri,
+    let clangdServer = await testClient.server._languageService(
+      for: uri,
       .cpp,
-      in: ws.testClient.server.workspaceForDocument(uri: loc.docUri)!
+      in: testClient.server.workspaceForDocument(uri: uri)!
     )!
 
     let clangdCrashed = self.expectation(description: "clangd crashed")