-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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.
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
Tree-sitter: Bump to 0.22.6 #16481
Tree-sitter: Bump to 0.22.6 #16481
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me. 👍
I tried rerunning DCA, but it seems it did not pick up https://github.com/github/semmle-code/pull/50012. We will need to retry later, but it won't be possible for me today. |
Updated |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One caveat, otherwise this looks good to me.
tree-sitter-blame = {path = "../buramu/tree-sitter-blame"} | ||
tree-sitter-json = {git = "https://github.com/tausbn/tree-sitter-json.git", rev = "745663ee997f1576fe1e7187e6347e0db36ec7a9"} | ||
tree-sitter-json = {git = "https://github.com/tree-sitter/tree-sitter-json.git", rev = "94f5c527b2965465956c2000ed6134dd24daf2a7"} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that this will break structured log extraction. Some of the commits on my fork added support for things like having multiple JSON objects/arrays in the same file (i.e. JSONC/JSONL), and some added support for trailing commas in objects/arrays. Both of these are still missing on mainline tree-sitter-json
, as far as I know.
This is not to say that this PR should be blocked, however. The structured log parsing is not in active use (and to be honest, it should be replaced with a better solution than (ab)using the tree-sitter interface). I just wanted to point out that this is a breaking change.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks. Perhaps worth submitting an upstream PR to tree-sitter/tree-sitter-json
?
This PR bumps our shared Tree-sitter extractor (and hence our Ruby and QL4QL extractors) to use the latest
tree-sitter
version.