Update tree-sitter to 0.22.1 #379
Draft
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eed3si9n
force-pushed
the
wip/tree-sitter-bump
branch
3 times, most recently
from
8fd353c
to
6464591
Compare
eed3si9n
force-pushed
the
wip/tree-sitter-bump
branch
6 times, most recently
from
54c3fde
to
c018e38
Compare
eed3si9n
commented
Mar 11, 2024
Cargo.toml
Outdated
There was a problem hiding this comment.
Actual file I changed.
eed3si9n
commented
Mar 11, 2024
| }, | ||
| "devDependencies": { | ||
| "tree-sitter-cli": "0.20.7", | ||
| "prettier": "3.0.0-alpha.6" | ||
| "tree-sitter-cli": "0.22.1", |
There was a problem hiding this comment.
I think I changed this, and the rest of the change was made automatically.
eed3si9n
commented
Mar 11, 2024
| @@ -6,7 +6,7 @@ | |||
| //! ``` | |||
| //! let code = ""; | |||
| //! let mut parser = tree_sitter::Parser::new(); | |||
| //! parser.set_language(tree_sitter_scala::language()).expect("Error loading scala grammar"); | |||
| //! parser.set_language(&tree_sitter_scala::language()).expect("Error loading scala grammar"); | |||
There was a problem hiding this comment.
Minor Rust update.
eed3si9n
commented
Mar 11, 2024
Comment on lines
+3
to
+7
| (field_expression field: (identifier) @property) | ||
| (field_expression value: (identifier) @type | ||
| (#match? @type "^[A-Z]")) | ||
|
|
||
| (type_identifier) @type |
There was a problem hiding this comment.
These are now moved up front to deprioritize the match.
See the tree-sitter release notes for details - https://github.com/tree-sitter/tree-sitter/releases/tag/v0.22.0 - tree-sitter/tree-sitter@v0.21.0...v0.22.0 - https://github.com/tree-sitter/tree-sitter/releases/tag/v0.21.0
eed3si9n
force-pushed
the
wip/tree-sitter-bump
branch
from
c018e38
to
8a06ec5
Compare
tree-sitter now uses last-wins rules for highlighting. This moves the rules around to match the older highlighting. Except operator, which I've now let it take precedence over `function.call`.
eed3si9n
force-pushed
the
wip/tree-sitter-bump
branch
from
5054884
to
084232d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #384
See the tree-sitter release notes for details
tree-sitter now uses last-wins rules for highlighting. This PR updates the highlight queries around to match the older highlighting semantics. Except
operator, which I've now let it take precedence overfunction.call.