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

Update languages.toml for Nickel #7059

Merged
merged 4 commits into from
May 26, 2023
Merged

Update languages.toml for Nickel #7059

merged 4 commits into from
May 26, 2023

Conversation

vkleen
Copy link
Contributor

@vkleen vkleen commented May 17, 2023

Update the revision of tree-sitter-nickel and copy over the highlighting queries. Also, adjust the auto-pairs configuration, since ' isn't a paired delimiter in Nickel.

ErinvanderVeen
ErinvanderVeen previously approved these changes May 17, 2023
View reviewed changes
@the-mikedavis the-mikedavis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. A-language-support Area: Support for programming/text languages labels May 18, 2023
the-mikedavis
the-mikedavis previously approved these changes May 19, 2023
View reviewed changes
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.

Thanks!

@the-mikedavis the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 19, 2023
@pascalkuthe
Copy link
Member

pascalkuthe commented May 19, 2023 •
edited by the-mikedavis
Loading

Seems like CI is failing with some indentation query related error. Seems like those also need to be updated before we can merge

@the-mikedavis
Copy link
Member

Ah yeah it looks like the switch_expr node doesn't exist in this version (https://github.com/helix-editor/helix/actions/runs/5023053043/jobs/9020326641?pr=7059). It looks like it may be match_expr now https://github.com/nickel-lang/tree-sitter-nickel/blob/3a794388773f2424a97b2186828aa3fac4c66ce6/grammar.js#L145-L150

@the-mikedavis the-mikedavis added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from a maintainer. labels May 20, 2023
@vkleen
Copy link
Contributor Author

vkleen commented May 20, 2023

I'll take care of that later today, thanks for diagnosing!

@pascalkuthe pascalkuthe added S-waiting-on-review Status: Awaiting review from a maintainer. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 20, 2023
@the-mikedavis the-mikedavis merged commit 0c21c22 into helix-editor:master May 26, 2023
aotarola pushed a commit to aotarola/helix that referenced this pull request May 28, 2023
@vkleen @aotarola
Update languages.toml for Nickel (helix-editor#7059)
58daf6f
aotarola pushed a commit to aotarola/helix that referenced this pull request May 28, 2023
@vkleen @aotarola
Update languages.toml for Nickel (helix-editor#7059)
5b6ba6d
Triton171 pushed a commit to Triton171/helix that referenced this pull request Jun 18, 2023
@vkleen @Triton171
Update languages.toml for Nickel (helix-editor#7059)
1598758
wes-adams pushed a commit to wes-adams/helix that referenced this pull request Jul 4, 2023
@vkleen @wes-adams
Update languages.toml for Nickel (helix-editor#7059)
06929ff
mtoohey31 pushed a commit to mtoohey31/helix that referenced this pull request Jun 2, 2024
@vkleen @mtoohey31
Update languages.toml for Nickel (helix-editor#7059)
ba8d9d0
smortime pushed a commit to smortime/helix that referenced this pull request Jul 10, 2024
@vkleen
Update languages.toml for Nickel (helix-editor#7059)
047ef78
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

@pascalkuthe pascalkuthe pascalkuthe approved these changes

@ErinvanderVeen ErinvanderVeen ErinvanderVeen left review comments

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.
4 participants
@vkleen @pascalkuthe @the-mikedavis @ErinvanderVeen