-
-
Notifications
You must be signed in to change notification settings - Fork 9
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
more catppuccin treesitter coloring #7
Conversation
tecandrew
commented
Mar 25, 2024
- add more catppuccin colored treesitter syntax (from vim/neovim)
- more coloring definitions
- fix some minor visual bugs
template.hbr
Outdated
"module": { | ||
"color": "#{{lavender}}", | ||
"font_style": "italic", | ||
"font_weight": null | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We've moved away from lavender while defining the newer style guide, I'd be curious how VSCode highlights modules - I'd imagine its yellow?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
template.hbr
Outdated
"string.regex": { | ||
"color": "#{{pink}}", | ||
"color": "#{{peach}}", | ||
"font_style": null, | ||
"font_weight": null | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should stay pink
as per updates in VSCode
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Regex should be pink but if it can be more in detail, it should inherit the other colour mappings (e.g. numbers in regex should be peach, lookaheads being blue since they act like a function taking values, etc) - See VSCode's PR on this (catppuccin/vscode#263)
"string.special.symbol": { | ||
"color": "#{{rosewater}}", | ||
"font_style": "italic", | ||
"font_weight": null | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We've moved away from rosewater in the newer style guide too, I'm curious how VSCode highlights these?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We had some discussion about this on the discord, will update the style guide soon but this should now be peach
The reasoning being that these symbols are usually immutable/constants in languages
"string.special.symbol": { | |
"color": "#{{rosewater}}", | |
"font_style": "italic", | |
"font_weight": null | |
}, | |
"string.special.symbol": { | |
"color": "#{{peach}}", | |
"font_style": "italic", | |
"font_weight": null | |
}, |
"variable.member": { | ||
"color": "#{{lavender}}", | ||
"font_style": null, | ||
"font_weight": null | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Same as above.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like treesitter describes this as:
@variable.member ; object and struct fields
and in VSCode / JetBrains, we kept this as text
:
so this should kept as text
"variable.member": { | |
"color": "#{{lavender}}", | |
"font_style": null, | |
"font_weight": null | |
}, | |
"variable.member": { | |
"color": "#{{text}}", | |
"font_style": null, | |
"font_weight": null | |
}, |
"variable.member": { | ||
"color": "#{{lavender}}", | ||
"font_style": null, | ||
"font_weight": null | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like treesitter describes this as:
@variable.member ; object and struct fields
and in VSCode / JetBrains, we kept this as text
:
so this should kept as text
"variable.member": { | |
"color": "#{{lavender}}", | |
"font_style": null, | |
"font_weight": null | |
}, | |
"variable.member": { | |
"color": "#{{text}}", | |
"font_style": null, | |
"font_weight": null | |
}, |
"string.special.symbol": { | ||
"color": "#{{rosewater}}", | ||
"font_style": "italic", | ||
"font_weight": null | ||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We had some discussion about this on the discord, will update the style guide soon but this should now be peach
The reasoning being that these symbols are usually immutable/constants in languages
"string.special.symbol": { | |
"color": "#{{rosewater}}", | |
"font_style": "italic", | |
"font_weight": null | |
}, | |
"string.special.symbol": { | |
"color": "#{{peach}}", | |
"font_style": "italic", | |
"font_weight": null | |
}, |
will open another PR another time to update these, since this is a bit out of date already 🫡 |