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.

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

Merged
merged 5 commits into from
May 22, 2024
Merged

Tree-sitter: Bump to 0.22.6 #16481

merged 5 commits into from
May 22, 2024

Conversation

hvitved
Copy link
Contributor

@hvitved hvitved commented May 13, 2024

This PR bumps our shared Tree-sitter extractor (and hence our Ruby and QL4QL extractors) to use the latest tree-sitter version.

@hvitved hvitved force-pushed the treesitter/bump2 branch from e4f6781 to a33c28f Compare May 13, 2024 12:33
@hvitved hvitved marked this pull request as ready for review May 13, 2024 13:49
@hvitved hvitved requested review from a team as code owners May 13, 2024 13:49
@hvitved hvitved added the no-change-note-required This PR does not need a change note label May 13, 2024
tausbn
tausbn previously approved these changes May 13, 2024
Copy link
Contributor

@tausbn tausbn left a 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. 👍

@redsun82
Copy link
Contributor

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.

@hvitved hvitved force-pushed the treesitter/bump2 branch from abcaab3 to 158dafa Compare May 21, 2024 09:25
@hvitved
Copy link
Contributor Author

hvitved commented May 21, 2024

Updated cargo.toml to include a Ruby parser fix.

@hvitved hvitved requested a review from tausbn May 21, 2024 12:56
Copy link
Contributor

@tausbn tausbn left a 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"}
Copy link
Contributor

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.

Copy link
Contributor Author

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?

@hvitved hvitved merged commit a006c29 into github:main May 22, 2024
43 checks passed
@hvitved hvitved deleted the treesitter/bump2 branch May 22, 2024 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants