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

Improve tree-sitter queries for vlang #6279

Merged
merged 1 commit into from Mar 15, 2023
Merged

Improve tree-sitter queries for vlang #6279

merged 1 commit into from Mar 15, 2023

Conversation

erasin
Copy link
Contributor

@erasin erasin commented Mar 12, 2023 •
edited

  • Update highlight
  • add indents
  • add textobject
  • add injections

Issues #6164 and #6267.

vlang and verilog has file type conflicts in languages configurations.

@erasin
Add ts queries for vlang
86edc6c 
- Update hightlight
- add indents
- add textobject
- add injections
@the-mikedavis the-mikedavis added C-enhancement Category: Improvements S-waiting-on-review Status: Awaiting review from a maintainer. A-language-support Area: Support for programming/text languages labels Mar 12, 2023
@the-mikedavis the-mikedavis self-requested a review March 12, 2023 16:49
@the-mikedavis the-mikedavis linked an issue Mar 12, 2023 that may be closed by this pull request
Update Vlang in the languages.toml #6140
Closed
@the-mikedavis
Copy link
Member

#3249 has an approach for improving language conflicts that might help with vlang/verilog

@erasin
Copy link
Contributor Author

erasin commented Mar 13, 2023

It looks like this entry beats regular html for .html files. We have another conflict like this between verilog and V and I think the only way around it for now is to have one of them where you have to override it in a .helix/languages.toml or ~/.config/helix/languages.toml:

Do you mean this way, I'm already using it with html/twig，#6164.

In fact, the solution I want for conflict resolution is vscode's files.associations.

@the-mikedavis the-mikedavis changed the title Add ts queries for vlang Improve tree-sitter queries for vlang Mar 15, 2023
@the-mikedavis the-mikedavis merged commit fb56a4b into helix-editor:master Mar 15, 2023
6 checks passed
@the-mikedavis
Copy link
Member

#3249 would help even when the file-types are the same for both languages. What you recommend in #6164 looks like a good workaround for now

@erasin erasin mentioned this pull request Mar 16, 2023
Closed
sagnibak pushed a commit to sagnibak/helix that referenced this pull request Mar 21, 2023
@erasin
Improve tree-sitter queries for vlang (helix-editor#6279)
17a6d6e 
- Update hightlight
- add indents
- add textobject
- add injections
icecreammatt pushed a commit to icecreammatt/helix that referenced this pull request Apr 19, 2023
@erasin @icecreammatt
Improve tree-sitter queries for vlang (helix-editor#6279)
94f455a 
- Update hightlight
- add indents
- add textobject
- add injections
wes-adams pushed a commit to wes-adams/helix that referenced this pull request Jul 4, 2023
@erasin @wes-adams
Improve tree-sitter queries for vlang (helix-editor#6279)
56c9da5 
- Update hightlight
- add indents
- add textobject
- add injections
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 C-enhancement Category: Improvements 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.

Update Vlang in the languages.toml
2 participants
@erasin @the-mikedavis