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

feat(prql): add prql support #6126

Merged
merged 4 commits into from
Mar 3, 2023

Conversation

matthias-Q
Copy link
Contributor

Adds support for PRQL languange.

I hope I added everything thats necessary to add language support.

Closes #6050

@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 27, 2023
@matthias-Q
Copy link
Contributor Author

matthias-Q commented Feb 27, 2023

Sorry, I have not run cargo xtasks docgen I will do that and update the PR

[EDIT] I had modified that md file by hand. Only difference is, that prql should be a few lines lower. Should push these changes?

@erasin
Copy link
Contributor

erasin commented Feb 28, 2023

The only difference is that prql should be a few lines lower. should these changes be pushed?

Since book/src/generated is an automatically generated file, use cargo xtasks docgen to handle it to avoid conflicts.

I think a normal commit will do the trick.

Alternatively Git provides some rebase and commit merge methods, so you can use git commit --amend to merge some changes directly into the last commit, and then push with --force to overwrite remote branch.

languages.toml Outdated Show resolved Hide resolved
runtime/queries/prql/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/prql/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/prql/injections.scm Outdated Show resolved Hide resolved
Copy link
Member

@the-mikedavis the-mikedavis left a comment

Choose a reason for hiding this comment

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

Otherwise this looks good

(Also see #4892 which talks about separating the highlights for function definitions and references)

runtime/queries/prql/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/prql/highlights.scm Outdated Show resolved Hide resolved
@the-mikedavis the-mikedavis merged commit 2bd8bc8 into helix-editor:master Mar 3, 2023
@the-mikedavis
Copy link
Member

Thanks!

@matthias-Q matthias-Q deleted the add_prql_support branch March 3, 2023 20:06
estin pushed a commit to estin/helix that referenced this pull request Mar 4, 2023
wes-adams pushed a commit to wes-adams/helix that referenced this pull request Jul 4, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-language-support Area: Support for programming/text languages S-waiting-on-review Status: Awaiting review from a maintainer.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PRQL support
3 participants