Fix TreeSitterClient Not Being Set (#280)

CodeEditApp · Nov 21, 2024 · bfcde1f · bfcde1f
1 parent 23fa1bf
commit bfcde1f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/Sources/CodeEditSourceEditor/Controller/TextViewController.swift b/Sources/CodeEditSourceEditor/Controller/TextViewController.swift
@@ -254,6 +254,11 @@ public class TextViewController: NSViewController {
             platformGuardedSystemCursor = false
         }
 
+        if let idx = highlightProviders.firstIndex(where: { $0 is TreeSitterClient }),
+           let client = highlightProviders[idx] as? TreeSitterClient {
+            self.treeSitterClient = client
+        }
+
         self.textView = TextView(
             string: string,
             font: font,

diff --git a/Tests/CodeEditSourceEditorTests/TextViewControllerTests.swift b/Tests/CodeEditSourceEditorTests/TextViewControllerTests.swift
@@ -418,5 +418,14 @@ final class TextViewControllerTests: XCTestCase {
         XCTAssertEqual(controller.cursorPositions[1].line, 3)
         XCTAssertEqual(controller.cursorPositions[1].column, 1)
     }
+
+    // MARK: - TreeSitterClient
+
+    func test_treeSitterSetUp() {
+        // Set up with a user-initiated `TreeSitterClient` should still use that client for things like tag
+        // completion.
+        let controller = Mock.textViewController(theme: Mock.theme())
+        XCTAssertNotNil(controller.treeSitterClient)
+    }
 }
 // swiftlint:enable all