Skip to content
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

Push pknxqpplusqm #17

Merged
merged 4 commits into from
Jan 2, 2025
Merged

Push pknxqpplusqm #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d918ce3
bump reference grammar to 0033e3f7f1f6e413e107f9060f236f3696b1d3f5 (n…
yuja Jan 2, 2025
0ce216d
bump tree-sitter-typescript to 0.23.2
yuja Jan 2, 2025
67d7816
bump rust dependencies
yuja Jan 2, 2025
b36d23e
bump version to 0.2.0 (includes breaking API changes in tree-sitter)
yuja Jan 2, 2025
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 Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "tree-sitter-qmljs"
description = "QML grammar for the tree-sitter parsing library"
version = "0.1.2"
version = "0.2.0"
keywords = ["incremental", "parsing", "qml"]
categories = ["parsing", "text-editors"]
repository = "https://github.com/yuja/tree-sitter-qmljs"
Expand All @@ -20,7 +20,7 @@ include = [
path = "bindings/rust/lib.rs"

[dependencies]
tree-sitter = "0.21.0"
tree-sitter = "0.24.0"

[build-dependencies]
cc = "1.0.96"
2 changes: 1 addition & 1 deletion examples/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
GIT = git
GIT_LOG_FLAGS = -p --reverse
QTDECLARATIVE_GIT_ID = 21d5d5b7d7f45cf3123c6418a3d9381887c6c109
QTDECLARATIVE_GIT_ID = 0033e3f7f1f6e413e107f9060f236f3696b1d3f5

.PHONY: all
all: qtdeclarative
Expand Down
2 changes: 1 addition & 1 deletion grammar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// https://code.qt.io/cgit/qt/qtdeclarative.git/tree/src/qml/
// compiler/qqmlirbuilder.cpp
// parser/{qqmljs.g,qqmljsast_p.h,qqmljslexer.cpp}
// 21d5d5b7d7f45cf3123c6418a3d9381887c6c109
// 0033e3f7f1f6e413e107f9060f236f3696b1d3f5

module.exports = grammar(require('tree-sitter-typescript/typescript/grammar'), {
name: 'qmljs',
Expand Down
55 changes: 28 additions & 27 deletions package-lock.json
View file
Open in desktop

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

10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tree-sitter-qmljs",
"version": "0.1.2",
"version": "0.2.0",
"description": "QML grammar for the tree-sitter parsing library",
"main": "bindings/node",
"types": "bindings/node",
Expand Down Expand Up @@ -45,9 +45,9 @@
}
},
"devDependencies": {
"tree-sitter-cli": "^0.24.3",
"tree-sitter-javascript": "^0.23.0",
"tree-sitter-typescript": "^0.23.0",
"tree-sitter-cli": "^0.24.4",
"tree-sitter-javascript": "^0.23.1",
"tree-sitter-typescript": "^0.23.2",
"prebuildify": "^6.0.1"
}
}
}
4 changes: 2 additions & 2 deletions tree-sitter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}
],
"metadata": {
"version": "0.1.2",
"version": "0.2.0",
"license": "MIT",
"description": "QML grammar for the tree-sitter parsing library",
"authors": [
Expand All @@ -45,4 +45,4 @@
"rust": true,
"swift": true
}
}
}
Loading