Adjust Tests

Author: thecoolwinter

CodeEdit/Features/LSP/Features/SemanticTokens/SemanticTokenHighlightProvider.swift

@@ -34,7 +34,7 @@ final class SemanticTokenHighlightProvider<
 
     private var tokenMap: SemanticTokenMap?
     private var documentURI: String?
-    private weak var languageServer: LanguageServer<DocumentType>?
+    weak var languageServer: LanguageServer<DocumentType>?
     private weak var textView: TextView?
 
     private var lastEditCallback: EditCallback?

CodeEditTests/Features/LSP/LanguageServer+CodeFileDocument.swift

@@ -71,7 +71,8 @@ final class LanguageServerCodeFileDocumentTests: XCTestCase {
             ),
             lspPid: -1,
             serverCapabilities: capabilities,
-            rootPath: tempTestDir
+            rootPath: tempTestDir,
+            logContainer: LanguageServerLogContainer(language: .swift)
         )
         _ = try await server.lspInstance.initializeIfNeeded()
         return (connection: bufferingConnection, server: server)
@@ -231,13 +232,13 @@ final class LanguageServerCodeFileDocumentTests: XCTestCase {
             let (connection, server) = try await makeTestServer()
             // Create a CodeFileDocument to test with, attach it to the workspace and file
             let codeFile = try await openCodeFile(for: server, connection: connection, file: file, syncOption: option)
-            XCTAssertNotNil(server.openFiles.contentCoordinator(for: codeFile))
-            server.openFiles.contentCoordinator(for: codeFile)?.setUpUpdatesTask()
+            XCTAssertNotNil(codeFile.languageServerObjects.textCoordinator.languageServer)
+            codeFile.languageServerObjects.textCoordinator.setUpUpdatesTask()
             codeFile.content?.replaceString(in: .zero, with: #"func testFunction() -> String { "Hello " }"#)
 
             let textView = TextView(string: "")
             textView.setTextStorage(codeFile.content!)
-            textView.delegate = server.openFiles.contentCoordinator(for: codeFile)
+            textView.delegate = codeFile.languageServerObjects.textCoordinator
 
             textView.replaceCharacters(in: NSRange(location: 39, length: 0), with: "Worlld")
             textView.replaceCharacters(in: NSRange(location: 39, length: 6), with: "")
@@ -289,13 +290,13 @@ final class LanguageServerCodeFileDocumentTests: XCTestCase {
             let (connection, server) = try await makeTestServer()
             let codeFile = try await openCodeFile(for: server, connection: connection, file: file, syncOption: option)
 
-            XCTAssertNotNil(server.openFiles.contentCoordinator(for: codeFile))
-            server.openFiles.contentCoordinator(for: codeFile)?.setUpUpdatesTask()
+            XCTAssertNotNil(codeFile.languageServerObjects.textCoordinator.languageServer)
+            codeFile.languageServerObjects.textCoordinator.setUpUpdatesTask()
             codeFile.content?.replaceString(in: .zero, with: #"func testFunction() -> String { "Hello " }"#)
 
             let textView = TextView(string: "")
             textView.setTextStorage(codeFile.content!)
-            textView.delegate = server.openFiles.contentCoordinator(for: codeFile)
+            textView.delegate =  codeFile.languageServerObjects.textCoordinator
             textView.replaceCharacters(in: NSRange(location: 39, length: 0), with: "Worlld")
             textView.replaceCharacters(in: NSRange(location: 39, length: 6), with: "")
             textView.replaceCharacters(in: NSRange(location: 39, length: 0), with: "World")

CodeEditTests/Features/LSP/LanguageServer+DocumentObjects.swift

@@ -51,7 +51,8 @@ final class LanguageServerDocumentObjectsTests: XCTestCase {
             ),
             lspPid: -1,
             serverCapabilities: capabilities,
-            rootPath: URL(fileURLWithPath: "")
+            rootPath: URL(fileURLWithPath: ""),
+            logContainer: LanguageServerLogContainer(language: .swift)
         )
         _ = try await server.lspInstance.initializeIfNeeded()
         document = MockDocumentType()
@@ -75,7 +76,7 @@ final class LanguageServerDocumentObjectsTests: XCTestCase {
         XCTAssertNotNil(server.openFiles.document(for: languageServerURI))
 
         try await server.closeDocument(languageServerURI)
-        XCTAssertNil(document.languageServerObjects.highlightProvider)
-        XCTAssertNil(document.languageServerObjects.textCoordinator)
+        XCTAssertNil(document.languageServerObjects.highlightProvider.languageServer)
+        XCTAssertNil(document.languageServerObjects.textCoordinator.languageServer)
     }
 }