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

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

Merged
merged 4 commits into from
Jan 25, 2024

Conversation

blinxen
Copy link
Contributor

@blinxen blinxen commented Jan 8, 2024

This is the second part of #8691.
This PR should include all remaining grammars, that don't have license files. Except tree-sitter-eex because upstream seems to be dead.

I am unsure if the changes to the scm files are 100% OK. I'd appreciate it if someone could double check them.

@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 Jan 8, 2024
runtime/queries/vhs/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/vhs/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/vhs/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/vhs/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/vhs/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/vhs/highlights.scm Outdated Show resolved Hide resolved
Comment on lines 9 to 33
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head1")
(content) @markup.heading.1)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head2")
(content) @markup.heading.2)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head3")
(content) @markup.heading.3)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head4")
(content) @markup.heading.4)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head5")
(content) @markup.heading.5)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head6")
(content) @markup.heading.6)

Copy link
Member

Choose a reason for hiding this comment

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

This heading styling seems to have been reverted

Copy link
Member

Choose a reason for hiding this comment

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

This is not yet resolved: the pattern on L7 should match =head1, =head2, etc. and use the markup.heading.1, markup.heading.2, etc. captures

(interior_sequence
(sequence_letter) @character
(#eq? @character "B")
(content) @text.strong)
Copy link
Member

Choose a reason for hiding this comment

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

All of these @text styles are wrong and should use the @markup styles we had before

(#not-match? @keyword "^=(head|over|item|encoding)")
(content) @string)

(verbatim_paragraph (content) @text.literal)
Copy link
Member

Choose a reason for hiding this comment

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

This was @markup.raw

@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 Jan 9, 2024
Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
@blinxen
Copy link
Contributor Author

blinxen commented Jan 10, 2024

Thanks for the review! I applied your suggested changes.

Comment on lines 9 to 33
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head1")
(content) @markup.heading.1)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head2")
(content) @markup.heading.2)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head3")
(content) @markup.heading.3)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head4")
(content) @markup.heading.4)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head5")
(content) @markup.heading.5)
(head_paragraph
(head_directive) @directive
(#eq? @directive "=head6")
(content) @markup.heading.6)

Copy link
Member

Choose a reason for hiding this comment

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

This is not yet resolved: the pattern on L7 should match =head1, =head2, etc. and use the markup.heading.1, markup.heading.2, etc. captures

runtime/queries/pod/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/pod/highlights.scm Outdated Show resolved Hide resolved
(content) @markup.link.url)
(sequence_letter) @character
(#eq? @character "E")
(content) @string.escape)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
(content) @string.escape)
(content) @string.special.escape)

runtime/queries/pod/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/pod/highlights.scm Outdated Show resolved Hide resolved
runtime/queries/pod/highlights.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.

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 Jan 16, 2024
@archseer archseer merged commit 2661e05 into helix-editor:master Jan 25, 2024
6 checks passed
flinesse pushed a commit to flinesse/helix that referenced this pull request Jan 25, 2024
…elix-editor#9279)

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
flinesse pushed a commit to flinesse/helix that referenced this pull request Jan 25, 2024
…elix-editor#9279)

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
dgkf pushed a commit to dgkf/helix that referenced this pull request Jan 30, 2024
…elix-editor#9279)

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
postsolar pushed a commit to postsolar/helix that referenced this pull request Apr 4, 2024
…elix-editor#9279)

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
mtoohey31 pushed a commit to mtoohey31/helix that referenced this pull request Jun 2, 2024
…elix-editor#9279)

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
Vulpesx pushed a commit to Vulpesx/helix that referenced this pull request Jun 7, 2024
…elix-editor#9279)

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
smortime pushed a commit to smortime/helix that referenced this pull request Jul 10, 2024
…elix-editor#9279)

Co-authored-by: Blaž Hrastnik <blaz@mxxn.io>
Co-authored-by: Michael Davis <mcarsondavis@gmail.com>
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.

3 participants