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

Bump tree-sitter-sql #9634

Merged
merged 7 commits into from
Feb 24, 2024
Merged

Bump tree-sitter-sql #9634

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bbf934
bump tree-sitter-sql
ds-cbo Oct 4, 2023
29486a5
update highlights classes to helix flavour
ds-cbo Oct 6, 2023
365e15a
replace lua-match with match
ds-cbo Oct 9, 2023
7e6b50d
Merge remote-tracking branch 'upstream/master' into bump-tree-sitter-sql
ds-cbo Feb 14, 2024
aaab686
fix highlights syntax class
ds-cbo Feb 14, 2024
04dc0b7
fix numeric regexes
ds-cbo Feb 15, 2024
833a642
use gh-pages branch
ds-cbo Feb 15, 2024
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
2 changes: 1 addition & 1 deletion languages.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1813,7 +1813,7 @@ injection-regex = "sql"

[[grammar]]
name = "sql"
source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "25be0b8f17e9189ad9e1b875869d025c5aec1286" }
source = { git = "https://github.com/DerekStride/tree-sitter-sql", rev = "4ffda1fe6841bcb2bfedb4a465c36ef8db0079b3" }
the-mikedavis marked this conversation as resolved.
Show resolved Hide resolved

[[language]]
name = "gdscript"
Expand Down
8 changes: 4 additions & 4 deletions runtime/queries/sql/highlights.scm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@
(term
alias: (identifier) @variable.parameter)

(term
((term
value: (cast
name: (keyword_cast) @function.builtin
parameter: [(literal)]?))
parameter: [(literal)]?)))
Copy link
Contributor Author

@ds-cbo ds-cbo Feb 15, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think these parentheses have any function, but I copied them from upstream to have as little difference as possible, to make diff updates easier

(same for the extra leading space a few lines down)


(literal) @string
(comment) @comment.line
(marginalia) @comment.block

((literal) @constant.numeric.integer
(#match? @constant.numeric.integer "^-?\\d+$"))
(#match? @constant.numeric.integer "^[-+]?\\d+$"))

((literal) @constant.numeric.float
(#match? @constant.numeric.float "^-?\\d*\\.\\d*$"))
(#match? @constant.numeric.float "^[-+]?\\d*\\.\\d*$"))

(parameter) @variable.parameter

Expand Down
Loading