Improve Haskell highlight queries #40
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The highlighting is based on the highlight file from nvim-treesitter PR
1210, with the following changes:
* Highlight minus sign in negated numbers, e.g. (-10)
* Resolve error when comma captured as punctuation delimiter (previously
commented out)
* Add semicolon as punctuation delimiter
* Add `case` and `of` to `@conditional` capture group
* Move `qualified` out of `@keyword` and into `@include` capture group
* Add missing operators:
* `type_operator`
* Dots from export and record wildcards, i.e. `Record{..}`, `exp (..)`
* Equals and pipe = |
* Function arrows => and ->
* Bind arrow <-
* Lambda operator \
* Treat infix functions as operators (and also highlight the backtick)
* @ symbol (except for in the as-pattern, where it is highlighted as
`@namespace`)
* Highlight namespaces with `@namespace` instead of `@constructor`, e.g.
in `T.Text`
* Simplify queries for types
|
wait, this is rendered by nvim? any clue if there was some recent change that made this possible? I've been having issues like this one #35 anyways, looks good! |
|
Thanks for merging! Yes, it is rendered by nvim. While I haven't been able to reproduce the exact issue you mentioned, I have noticed Playground not updating at all (for all languages). Not sure if those issues are related but I might look into it further in the near future. |
|
@elianiva shouldn't |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR makes improvements to the
highlights.scmfile intree-sitter-haskell.It's partly based off the one by @elianiva from nvim-treesitter/nvim-treesitter#1210.
(I'm aware that PR is still in the works, so wasn't sure whether to open the PR
here or on the
nvim-treesitterrepo).Here are the changes I've made compared to the one from the
nvim-treesitterPR:
commented out)
caseandofto@conditionalcapture groupqualifiedout of@keywordand into@includecapture grouptype_operatorRecord{..},exp (..)=and|=>and-><-\@symbol (except for in the as-pattern, where it is highlighted as@namespace)@namespaceinstead of@constructor, e.g.in
T.TextThere's also a comparison of each of the aforementioned highlights, so you can see the results visually.
Example 1
tree-sitter-haskellnvim-treesitterPRExample 2
tree-sitter-haskellnvim-treesitterPR