Skip to content

Bump TreeSitter version to 0.25.6 #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ewilken wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump TreeSitter version to 0.25.6 #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.25.6"))
],
targets: [
.target(name: "Runestone", dependencies: [
Expand Down
4 changes: 2 additions & 2 deletions ...unestone/TextView/SyntaxHighlighting/Internal/TreeSitter/TreeSitterInternalLanguage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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?) {
Expand Down
2 changes: 1 addition & 1 deletion ...tone/TextView/SyntaxHighlighting/Internal/TreeSitter/TreeSitterInternalLanguageMode.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions Sources/Runestone/TextView/SyntaxHighlighting/TreeSitter/TreeSitterLanguage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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) {
Expand Down Expand Up @@ -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)
Expand Down
8 changes: 5 additions & 3 deletions Sources/Runestone/TreeSitter/TreeSitterParser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -81,8 +81,10 @@ private extension TSInputEncoding {
switch self {
case TSInputEncodingUTF8:
return .utf8
case TSInputEncodingUTF16:
return String.preferredUTF16Encoding
case TSInputEncodingUTF16LE:
Copy link

Copilot AI Jun 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The original TSInputEncodingUTF16 case was removed from stringEncoding, so any code still using TSInputEncodingUTF16 will fall through and return nil, causing silent parse failures. Consider explicitly handling or deprecating UTF16, or adding a mapping for it.

Copilot uses AI. Check for mistakes.
return .utf16LittleEndian
case TSInputEncodingUTF16BE:
return .utf16BigEndian
default:
return nil
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/Runestone/TreeSitter/TreeSitterQuery.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Sources/Runestone/TreeSitter/TreeSitterTextInput.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions Tests/RunestoneTests/Helpers/LanguageModeFactory.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Tests/RunestoneTests/TreeSitterParserTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down