Update some grammars to a commit where the license file is included #8691

blinxen · 2023-11-01T19:38:18Z

This PR is kind of tricky because I am unsure how you guys handle language / grammar updates.

Problem I am trying to solve here: We need to include license files for all grammars. Some grammars that are used in languages.toml use an old commit where the license file is not included. I updated the grammars to a commit that includes the license file.

blinxen · 2023-11-01T19:40:12Z

There are also some grammars that don't have any license files at all. I created PR for those and will file a PR (here) each time one of those is merged. (I am unsure myself why I went as far as filing PRs for missing license files but here we are :D)

the-mikedavis · 2023-11-02T13:59:45Z

In general when updating a language you need to update the commit hash but also look through the grammar.js changes and see if there are any changes we need to make to the queries (runtime/queries/<lang>/*.scm). CI is happy so there weren't any breaking changes in the updates (i.e. the existing queries will still all work) but I'll take a look through the diffs when I review to see if we need to add any new queries

the-mikedavis

Looks good, thanks for updating these!

the-mikedavis · 2023-11-03T19:55:04Z

languages.toml

 name = "beancount"
-source = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "4cbd1f09cd07c1f1fabf867c2cf354f9da53cc4c" }
+source = { git = "https://github.com/polarmutex/tree-sitter-beancount", rev = "f3741a3a68ade59ec894ed84a64673494d2ba8f3" }


beancount had quite a few changes but it's all refactoring to make the grammar and nodes nicer to work with. It doesn't look like the queries we use need any updates.

the-mikedavis · 2023-11-03T19:56:05Z

languages.toml

 name = "comment"
-source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "5dd3c62f1bbe378b220fe16b317b85247898639e" }
+source = { git = "https://github.com/stsewd/tree-sitter-comment", rev = "a37ca370310ac6f89b6e0ebf2b86b2219780494e" }


No changes here to the grammar

the-mikedavis · 2023-11-03T19:56:44Z

languages.toml

 name = "llvm"
-source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "3b213925b9c4f42c1acfe2e10bfbb438d9c6834d" }
+source = { git = "https://github.com/benwilliamgraham/tree-sitter-llvm", rev = "e9948edc41e9e5869af99dddb2b5ff5cc5581af6" }


This just adds the license file

the-mikedavis · 2023-11-03T19:57:18Z

languages.toml

 name = "ungrammar"
-source = { git = "https://github.com/Philipp-M/tree-sitter-ungrammar", rev = "0113de880a58ea14f2a75802e9b99fcc25003d9c" }
+source = { git = "https://github.com/Philipp-M/tree-sitter-ungrammar", rev = "a7e104629cff5a8b7367187610631e8f5eb7c6ea" }


Same here, just the license

the-mikedavis · 2023-11-03T19:57:58Z

languages.toml

 name = "astro"
-source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "5f5c3e73c45967df9aa42f861fad2d77cd4e0900" }
+source = { git = "https://github.com/virchau13/tree-sitter-astro", rev = "947e93089e60c66e681eba22283f4037841451e7" }


And here too, just the license

blinxen · 2023-11-03T21:04:19Z

In the meantime some of my PRs were merged, here is another set of language updates :D.

blinxen · 2023-11-03T21:40:25Z

It seems that the generation of the docs for the sql grammar failed? Not sure what exactly failed but I can see that the operators in https://github.com/DerekStride/tree-sitter-sql/blob/gh-pages/queries/highlights.scm#L418 changed in comparison to https://github.com/helix-editor/helix/blob/master/runtime/queries/sql/highlights.scm#L380. Do they need to be kept in sync?

pascalkuthe · 2023-11-03T23:03:39Z

i seems the sql queries will need to be updated

the-mikedavis · 2023-11-05T12:39:51Z

For sql I think we should be able to copy the changes to the queries upstream: DerekStride/tree-sitter-sql@eeab724...25be0b8#diff-d485a982e458ef8da2cc203585065b7542665cb80b78d230b1e8f77ea25825d4

blinxen · 2023-11-05T22:54:21Z

I updated the sql highlighting configuration and now all CI checks pass :D.

blinxen · 2023-11-06T17:57:05Z

Funny how each time someone approves, a PR of mine gets merged and I have to update another language :D

blinxen · 2023-11-06T18:03:29Z

The conflict stems from #8712. That PR updates the grammar but uses a fork which seems very weird because the original repository is still maintained? The last commit is a merge commit from the owner of the new fork. Very weird 🤔

the-mikedavis · 2023-11-06T22:18:39Z

It looks to me like the author of the new repo is working on upstreaming their changes to the original: https://github.com/Maskhjarna/tree-sitter-purescript/pulls?q=is%3Apr+sort%3Aupdated-desc+is%3Aclosed+author%3Apostsolar - they may have swapped us to their fork if they have a bunch of changes that are waiting on review / effort to upstream. If they merge their main branch with Maskhjarna's they should get the license file change: postsolar/tree-sitter-purescript@main...Maskhjarna:tree-sitter-purescript:main

postsolar · 2023-11-07T19:06:33Z

Yeah it's pretty much what Mike said, I made the swap because I don't expect the original repo owner to review as often as I commit and needed some extra velocity. They contacted me about it and we agreed on both repos staying open for now. Expect mine fork to have more frequent updates. I just added a LICENSE file to resolve the situation, so you can pin to the latest commit @blinxen. There were no breaking changes but there's a bugfix so please update the queries as well. You can just copy them because they're Helix-compatible.

blinxen · 2023-11-07T22:02:44Z

This PR is blocked until Maskhjarna/tree-sitter-purescript#30 is solved / merged. Also see postsolar/tree-sitter-purescript#5.

archseer · 2023-11-08T04:58:45Z

Note that for Fedora packaging you're also able to exclude or include grammars in the language config, so you should be able to skip any unlicensed grammars

archseer · 2023-11-08T05:01:01Z

(See https://docs.helix-editor.com/languages.html#choosing-grammars)

Maskhjarna · 2023-11-08T14:07:55Z

This PR is blocked until Maskhjarna/tree-sitter-purescript#30 is solved / merged. Also see postsolar/tree-sitter-purescript#5.

The referenced PR has been merged.

blinxen · 2023-11-08T17:38:15Z

Rebased to master and updated purescript to the latest version.

the-mikedavis

A few small changes for the new queries but otherwise this looks good 👍

the-mikedavis · 2023-11-08T18:32:27Z

runtime/queries/sql/highlights.scm

Actually, could you reset the changes here except for the additions to the @keyword pattern and the changes to the @operator pattern? The queries upstream are written for nvim so they differ a little from our capture names (https://docs.helix-editor.com/master/themes.html#syntax-highlighting) and use nvim-specific features like #lua-match?. The current highlights other that those keyword and operator highlights shouldn't need any changes I don't think

Removed all changes except the ones you told me to keep.

the-mikedavis · 2023-11-08T18:32:56Z

runtime/queries/purescript/highlights.scm

@@ -117,8 +117,9 @@

 (row_field (field_name) @variable.other.member)
 (record_field (field_name) @variable.other.member)
- (record_accessor (variable) @variable.other.member)
- (exp_record_access (variable) @variable.other.member)
+ (record_field (field_pun) @field)


Suggested change

(record_field (field_pun) @field)

(record_field (field_pun) @variable.other.member)

nvim's @field is @variable.other.member in helix capture names

Sorry, it' a typo. Just pushed the change :)

Updated to the latest commit

…st upstream version

…ncluded

…elix-editor#8691)

the-mikedavis added S-waiting-on-review Status: Awaiting review from a maintainer. A-language-support Area: Support for programming/text languages labels Nov 2, 2023

the-mikedavis previously approved these changes Nov 3, 2023

View reviewed changes

blinxen dismissed the-mikedavis’s stale review via 8ca8ec8 November 3, 2023 21:01

blinxen force-pushed the master branch from 8ca8ec8 to 3b082e6 Compare November 3, 2023 21:09

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 Nov 5, 2023

pascalkuthe previously approved these changes Nov 6, 2023

View reviewed changes

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 Nov 6, 2023

blinxen dismissed pascalkuthe’s stale review via a46f9b8 November 6, 2023 17:55

the-mikedavis added upstream S-waiting-on-pr Status: This is waiting on another PR to be merged first and removed S-waiting-on-review Status: Awaiting review from a maintainer. labels Nov 8, 2023

the-mikedavis removed the upstream label Nov 8, 2023

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-pr Status: This is waiting on another PR to be merged first labels Nov 8, 2023

blinxen added 2 commits November 8, 2023 18:35

Update some grammars to a commit where the license file is included

ee9c90e

Update more grammars to a commit where the license file is included

5c4700e

blinxen force-pushed the master branch from a46f9b8 to f3bae14 Compare November 8, 2023 17:37

the-mikedavis reviewed Nov 8, 2023

View reviewed changes

blinxen added 2 commits November 11, 2023 20:22

[tree-sitter/queries] Update sql highlights configuration to the late…

d742243

…st upstream version

Update tree-sitter-purescript to a commit where the license file is i…

0de82ee

…ncluded

blinxen force-pushed the master branch from f3bae14 to 0de82ee Compare November 11, 2023 19:27

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 Nov 12, 2023

the-mikedavis approved these changes Nov 16, 2023

View reviewed changes

archseer merged commit 39aa6fa into helix-editor:master Nov 18, 2023
6 checks passed

blinxen mentioned this pull request Jan 8, 2024

Update some grammars to a commit where the license file is included #9279

Merged

dgkf pushed a commit to dgkf/helix that referenced this pull request Jan 30, 2024

Update some grammars to a commit where the license file is included (h…

8a2e4aa

…elix-editor#8691)

mtoohey31 pushed a commit to mtoohey31/helix that referenced this pull request Jun 2, 2024

Update some grammars to a commit where the license file is included (h…

57efeb6

…elix-editor#8691)

Vulpesx pushed a commit to Vulpesx/helix that referenced this pull request Jun 7, 2024

Update some grammars to a commit where the license file is included (h…

e584db8

…elix-editor#8691)

smortime pushed a commit to smortime/helix that referenced this pull request Jul 10, 2024

Update some grammars to a commit where the license file is included (h…

cf45b96

…elix-editor#8691)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update some grammars to a commit where the license file is included #8691

Update some grammars to a commit where the license file is included #8691

blinxen commented Nov 1, 2023

blinxen commented Nov 1, 2023

the-mikedavis commented Nov 2, 2023

the-mikedavis left a comment

the-mikedavis Nov 3, 2023

the-mikedavis Nov 3, 2023

the-mikedavis Nov 3, 2023

the-mikedavis Nov 3, 2023

the-mikedavis Nov 3, 2023

blinxen commented Nov 3, 2023

blinxen commented Nov 3, 2023

pascalkuthe commented Nov 3, 2023 •

edited

Loading

the-mikedavis commented Nov 5, 2023

blinxen commented Nov 5, 2023

blinxen commented Nov 6, 2023

blinxen commented Nov 6, 2023

the-mikedavis commented Nov 6, 2023

postsolar commented Nov 7, 2023 •

edited

Loading

blinxen commented Nov 7, 2023 •

edited

Loading

archseer commented Nov 8, 2023

archseer commented Nov 8, 2023

Maskhjarna commented Nov 8, 2023

blinxen commented Nov 8, 2023

the-mikedavis left a comment

the-mikedavis Nov 8, 2023

blinxen Nov 11, 2023

the-mikedavis Nov 8, 2023

postsolar Nov 8, 2023 •

edited

Loading

blinxen Nov 11, 2023

	(record_field (field_pun) @field)
	(record_field (field_pun) @variable.other.member)

Update some grammars to a commit where the license file is included #8691

Update some grammars to a commit where the license file is included #8691

Conversation

blinxen commented Nov 1, 2023

blinxen commented Nov 1, 2023

the-mikedavis commented Nov 2, 2023

the-mikedavis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

blinxen commented Nov 3, 2023

blinxen commented Nov 3, 2023

pascalkuthe commented Nov 3, 2023 • edited Loading

the-mikedavis commented Nov 5, 2023

blinxen commented Nov 5, 2023

blinxen commented Nov 6, 2023

blinxen commented Nov 6, 2023

the-mikedavis commented Nov 6, 2023

postsolar commented Nov 7, 2023 • edited Loading

blinxen commented Nov 7, 2023 • edited Loading

archseer commented Nov 8, 2023

archseer commented Nov 8, 2023

Maskhjarna commented Nov 8, 2023

blinxen commented Nov 8, 2023

the-mikedavis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

postsolar Nov 8, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pascalkuthe commented Nov 3, 2023 •

edited

Loading

postsolar commented Nov 7, 2023 •

edited

Loading

blinxen commented Nov 7, 2023 •

edited

Loading

postsolar Nov 8, 2023 •

edited

Loading