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

Jump to bottom

feat: Update tree-sitter-sql and migrate highlights.scm to match grammar #5772

Merged
merged 3 commits into from
Feb 2, 2023
Merged

feat: Update tree-sitter-sql and migrate highlights.scm to match grammar #5772

merged 3 commits into from
Feb 2, 2023

Conversation

LeoniePhiline
Copy link
Contributor

@LeoniePhiline LeoniePhiline commented Feb 1, 2023 •
edited
Loading

Upstream changes

Diff: DerekStride/tree-sitter-sql@4fe05b2...286e10c

PR changes

  • Update to current tree-sitter-sql main HEAD.
  • Migrate grammar to match https://github.com/DerekStride/tree-sitter-sql/blob/286e10c5bc5d1703ee8f9afb351165a9a6182be1/grammar.js
    • Add keywords which were newly added in upstream diff
    • Add new CAST() builtin fn
    • Query GROUP_CONCAT() properly
    • Remove unnecessary explicit parameter query in count and invocation
    • Sort builtin fns alphabetically
    • Sort keywords like in source grammar, for easier future comparison and updates
    • Add lots of previously missing keywords (which had been added to upstream grammar already before the current upstream diff)
    • Some whitespace changes to match upstream grammar

@the-mikedavis the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. A-language-support Area: Support for programming/text languages labels Feb 1, 2023
@the-mikedavis the-mikedavis self-requested a review February 1, 2023 20:08
@the-mikedavis the-mikedavis merged commit 3041236 into helix-editor:master Feb 2, 2023
@LeoniePhiline LeoniePhiline mentioned this pull request Feb 19, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@the-mikedavis the-mikedavis the-mikedavis approved these changes

Assignees
No one assigned
Labels
A-language-support Area: Support for programming/text languages S-waiting-on-review Status: Awaiting review from a maintainer.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@LeoniePhiline @the-mikedavis