Apply PR 402 and update tree-sitter 0.26.6

Author: flinteger-code

Package.resolved

@@ -13,7 +13,7 @@ let package = Package(
         .library(name: "Runestone", targets: ["Runestone"])
     ],
     dependencies: [
-        .package(url: "https://github.com/tree-sitter/tree-sitter", .upToNextMinor(from: "0.20.9"))
+        .package(url: "https://github.com/tree-sitter/tree-sitter", .upToNextMinor(from: "0.26.6"))
     ],
     targets: [
         .target(name: "Runestone", dependencies: [

Package.swift

@@ -1,12 +1,12 @@
 import TreeSitter
 
 final class TreeSitterInternalLanguage {
-    let languagePointer: UnsafePointer<TSLanguage>
+    let languagePointer: OpaquePointer
     let highlightsQuery: TreeSitterQuery?
     let injectionsQuery: TreeSitterQuery?
     let indentationScopes: TreeSitterIndentationScopes?
 
-    init(languagePointer: UnsafePointer<TSLanguage>,
+    init(languagePointer: OpaquePointer,
          highlightsQuery: TreeSitterQuery?,
          injectionsQuery: TreeSitterQuery?,
          indentationScopes: TreeSitterIndentationScopes?) {

Sources/Runestone/TextView/SyntaxHighlighting/Internal/TreeSitter/TreeSitterInternalLanguage.swift

@@ -23,7 +23,7 @@ final class TreeSitterInternalLanguageMode: InternalLanguageMode {
         self.lineManager = lineManager
         operationQueue.name = "TreeSitterLanguageMode"
         operationQueue.qualityOfService = .default
-        parser = TreeSitterParser(encoding: TSInputEncodingUTF16)
+        parser = TreeSitterParser(encoding: TSInputEncodingUTF16LE)
         rootLanguageLayer = TreeSitterLanguageLayer(
             language: language,
             languageProvider: languageProvider,

Sources/Runestone/TextView/SyntaxHighlighting/Internal/TreeSitter/TreeSitterInternalLanguageMode.swift

@@ -8,7 +8,7 @@ import TreeSitter
 /// Refer to <doc:AddingATreeSitterLanguage> for more information on adding a Tree-sitter language to your project.
 public final class TreeSitterLanguage {
     /// Reference to the raw Tree-sitter language.
-    public let languagePointer: UnsafePointer<TSLanguage>
+    public let languagePointer: OpaquePointer
     /// Query used for syntax highlighting.
     public let highlightsQuery: TreeSitterLanguage.Query?
     /// Query used for detecting injected languages.
@@ -34,7 +34,7 @@ public final class TreeSitterLanguage {
     ///   - highlightsQuery: Query used for syntax highlighting.
     ///   - injectionsQuery: Query used for detecting injected languages.
     ///   - indentationScopes: Rules used for indenting text.
-    public init(_ language: UnsafePointer<TSLanguage>,
+    public init(_ language: OpaquePointer,
                 highlightsQuery: TreeSitterLanguage.Query? = nil,
                 injectionsQuery: TreeSitterLanguage.Query? = nil,
                 indentationScopes: TreeSitterIndentationScopes? = nil) {
@@ -93,7 +93,7 @@ private extension TreeSitterInternalLanguage {
                   indentationScopes: language.indentationScopes)
     }
 
-    private static func makeInternalQuery(from query: TreeSitterLanguage.Query?, with language: UnsafePointer<TSLanguage>) -> TreeSitterQuery? {
+    private static func makeInternalQuery(from query: TreeSitterLanguage.Query?, with language: OpaquePointer) -> TreeSitterQuery? {
         if let string = query?.string {
             do {
                 return try TreeSitterQuery(source: string, language: language)

Sources/Runestone/TextView/SyntaxHighlighting/TreeSitter/TreeSitterLanguage.swift

@@ -8,7 +8,7 @@ protocol TreeSitterParserDelegate: AnyObject {
 final class TreeSitterParser {
     weak var delegate: TreeSitterParserDelegate?
     let encoding: TSInputEncoding
-    var language: UnsafePointer<TSLanguage>? {
+    var language: OpaquePointer? {
         didSet {
             ts_parser_set_language(pointer, language)
         }
@@ -81,8 +81,10 @@ private extension TSInputEncoding {
         switch self {
         case TSInputEncodingUTF8:
             return .utf8
-        case TSInputEncodingUTF16:
-            return String.preferredUTF16Encoding
+        case TSInputEncodingUTF16LE:
+            return .utf16LittleEndian
+        case TSInputEncodingUTF16BE:
+            return .utf16BigEndian
         default:
             return nil
         }

Sources/Runestone/TreeSitter/TreeSitterParser.swift

@@ -12,12 +12,12 @@ enum TreeSitterQueryError: Error {
 final class TreeSitterQuery {
     let pointer: OpaquePointer
 
-    private let language: UnsafePointer<TSLanguage>
+    private let language: OpaquePointer
     private var patternCount: UInt32 {
         ts_query_pattern_count(pointer)
     }
 
-    init(source: String, language: UnsafePointer<TSLanguage>) throws {
+    init(source: String, language: OpaquePointer) throws {
         let errorOffset = UnsafeMutablePointer<UInt32>.allocate(capacity: 1)
         let errorType = UnsafeMutablePointer<TSQueryError>.allocate(capacity: 1)
         let pointer = source.withCString { cstr in

Sources/Runestone/TreeSitter/TreeSitterQuery.swift

@@ -21,7 +21,7 @@ final class TreeSitterTextInput {
 
     func makeTSInput() -> TSInput {
         let payload = Unmanaged.passUnretained(self).toOpaque()
-        return TSInput(payload: payload, read: read, encoding: encoding)
+        return TSInput(payload: payload, read: read, encoding: encoding, decode: nil)
     }
 
     func deallocate() {

Sources/Runestone/TreeSitter/TreeSitterTextInput.swift

@@ -22,23 +22,23 @@ enum LanguageModeFactory {
                 "}",
                 "]"
             ])
-        let language = TreeSitterLanguage(tree_sitter_javascript(), indentationScopes: indentationScopes)
+        let language = TreeSitterLanguage(OpaquePointer(tree_sitter_javascript()), indentationScopes: indentationScopes)
         let languageMode = languageMode(language: language, text: text)
         languageMode.parse(text as NSString)
         return languageMode
     }
 
     static func jsonLanguageMode(text: String) -> TreeSitterInternalLanguageMode {
         let indentationScopes = TreeSitterIndentationScopes(indent: ["object", "array"], outdent: ["}", "]"])
-        let language = TreeSitterLanguage(tree_sitter_json(), indentationScopes: indentationScopes)
+        let language = TreeSitterLanguage(OpaquePointer(tree_sitter_json()), indentationScopes: indentationScopes)
         let languageMode = languageMode(language: language, text: text)
         languageMode.parse(text as NSString)
         return languageMode
     }
 
     static func htmlLanguageMode(text: String) -> TreeSitterInternalLanguageMode {
         let indentationScopes = TreeSitterIndentationScopes(indent: ["start_tag", "element"], outdent: ["end_tag"])
-        let language = TreeSitterLanguage(tree_sitter_html(), indentationScopes: indentationScopes)
+        let language = TreeSitterLanguage(OpaquePointer(tree_sitter_html()), indentationScopes: indentationScopes)
         let languageMode = languageMode(language: language, text: text)
         languageMode.parse(text as NSString)
         return languageMode
@@ -58,15 +58,15 @@ enum LanguageModeFactory {
                 "try_statement"
             ],
             whitespaceDenotesBlocks: true)
-        let language = TreeSitterLanguage(tree_sitter_python(), indentationScopes: indentationScopes)
+        let language = TreeSitterLanguage(OpaquePointer(tree_sitter_python()), indentationScopes: indentationScopes)
         let languageMode = languageMode(language: language, text: text)
         languageMode.parse(text as NSString)
         return languageMode
     }
 
     static func yamlLanguageMode(text: String) -> TreeSitterInternalLanguageMode {
         let indentationScopes = TreeSitterIndentationScopes(indent: ["block_mapping_pair"], whitespaceDenotesBlocks: true)
-        let language = TreeSitterLanguage(tree_sitter_yaml(), indentationScopes: indentationScopes)
+        let language = TreeSitterLanguage(OpaquePointer(tree_sitter_yaml()), indentationScopes: indentationScopes)
         let languageMode = languageMode(language: language, text: text)
         languageMode.parse(text as NSString)
         return languageMode

Tests/RunestoneTests/Helpers/LanguageModeFactory.swift

@@ -8,19 +8,19 @@ final class TreeSitterParserTests: XCTestCase {
 
     func testParseString() {
         let string: NSString = "let foo = \"Hello world\""
-        let parser = TreeSitterParser(encoding: TSInputEncodingUTF16)
+        let parser = TreeSitterParser(encoding: TSInputEncodingUTF16LE)
         parser.delegate = delegate
-        parser.language = tree_sitter_javascript()
+        parser.language = OpaquePointer(tree_sitter_javascript())
         let tree = parser.parse(string)
         let expressionString = "(program (lexical_declaration (variable_declarator name: (identifier) value: (string))))"
         XCTAssertEqual(tree?.rootNode.expressionString, expressionString)
     }
 
     func testReplaceShortTextWithSameShortText() {
         let string: NSString = "let foo = \"Hello world\""
-        let parser = TreeSitterParser(encoding: TSInputEncodingUTF16)
+        let parser = TreeSitterParser(encoding: TSInputEncodingUTF16LE)
         parser.delegate = delegate
-        parser.language = tree_sitter_javascript()
+        parser.language = OpaquePointer(tree_sitter_javascript())
         let oldTree = parser.parse(string)
         // Replace the entire text but with the same text (Select all and paste: CMD + A, CMD + V)
         let inputEdit = TreeSitterInputEdit(
@@ -55,9 +55,9 @@ final class TreeSitterParserTests: XCTestCase {
         }
 
         """
-        let parser = TreeSitterParser(encoding: TSInputEncodingUTF16)
+        let parser = TreeSitterParser(encoding: TSInputEncodingUTF16LE)
         parser.delegate = delegate
-        parser.language = tree_sitter_javascript()
+        parser.language = OpaquePointer(tree_sitter_javascript())
         let oldTree = parser.parse(string)
         // Replace the entire text but with the same text (Select all and paste: CMD + A, CMD + V)
         let inputEdit = TreeSitterInputEdit(