Skip to content

Update tree-sitter dependency to 0.23.0-0.25.x #428

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
msnabiel wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update tree-sitter dependency to 0.23.0-0.25.x #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0994c2
Update tree-sitter dependency to 0.23.0-0.25.x
msnabiel Jul 21, 2026
6e43d9e
Fix Tree-sitter 0.25 opaque language pointers
msnabiel Aug 8, 2026
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", "0.23.0"..<"0.26.0")
],
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
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
2 changes: 1 addition & 1 deletion 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
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