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

feat: update syntax highlighting to match vscode #34

Merged
merged 8 commits into from
Feb 3, 2025

Conversation

uncenter
Copy link
Member

Closes #33.

Comment on lines +133 to +150
{
"name": "Variable declaration",
"scope": "keyword.declaration",
"foreground": "var(mauve)",
"font_style": "italic"
},
{
"name": "Class declaration",
"scope": "keyword.declaration.class",
"foreground": "var(mauve)",
"font_style": "italic"
},
{
"name": "Function declaration",
"scope": "keyword.declaration.function",
"foreground": "var(mauve)",
"font_style": "italic"
},
Copy link
Member Author

Choose a reason for hiding this comment

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

It seems impossible to combine these into one setting with multiple scopes for some reason, not sure why but it kept not working for me.

@MatthiasPortzel
Copy link
Member

I want to be upfront here, when I pulled this and checked it out I went "wow." This is a big change.

Before and after for those following along at home

Before:

Screenshot 2025-02-02 at 10 55 59 PM Screenshot 2025-02-02 at 11 13 47 PM

After:

Screenshot 2025-02-02 at 10 55 12 PM Screenshot 2025-02-02 at 11 13 28 PM

We've obviously mauveifyed everything. You said the other day that we use a lot of mauve—at least in the VSCode port. I'm not a huge fan of mauve here either. Some of the changes I think are good or I'm ambivalent to, like comment color being overlay2 or class names being yellow. The ones that I'm skeptical of are mauve for all keywords, and the punctuation going to overlay2.

Looking at the PR as a whole, I think it's an improvement, but I'm not quite ready to merge it. It's not a fact in my mind that VSCode is the canonical Catppuccin port. I just want to make sure that we're standardizing on the best version of the theme. So what I'm asking is if there's a justification for these changes beyond just "this is what vscode does." (Even if there's like a Discord thread discussing it—I honestly don't know.)

@sgoudham
Copy link
Contributor

sgoudham commented Feb 3, 2025

Keywords should be mauve and the punctuation should be overlay2, as per the style guide. JetBrains, VSCode and the newer things we've merged follow this.

I honestly didn't realise how far behind Sublime was here, it'll be good to get this merged.

The justification of following VSCode is quite common lol.

@pos-ki
Copy link

pos-ki commented Feb 3, 2025

The main justification is indeed the Catppuccin style guide, where the use of the colors (including mauve, as implemented in the PR) is described. VS Code (and bat) were just examples in #33 where I noticed the differences - they both implement the updated style guide.

@MatthiasPortzel MatthiasPortzel merged commit b7c6329 into catppuccin:main Feb 3, 2025
1 check passed
@uncenter uncenter deleted the pr-60fae795 branch February 3, 2025 14:01
@MatthiasPortzel
Copy link
Member

Fine.

The justification of following VSCode is quite common lol.

I'm unsympathetic to this argument because I don't use VSCode.

VSCode (and bat)

The reason Bat matches VSCode is because the Bat port was deleted, and replaced with code that auto-generates the theme from VSCode.

@uncenter
Copy link
Member Author

uncenter commented Feb 3, 2025

I'm unsympathetic to this argument because I don't use VSCode.

Whether you like it or not, it has become the standard. If you want to suggest improvements to the syntax highlighting standard, I suggest opening discussions/issues/PRs to the catppuccin/catppuccin repository (and style guide within). If changes are made to the style guide with regard to syntax highlighting I'd be happy to update all the downstream ports to match.

@sgoudham
Copy link
Contributor

sgoudham commented Feb 3, 2025

I'm unsympathetic to this argument because I don't use VSCode.

It's not so much about the editor but it was just the first one that we revamped properly with the new style guide in mind. If we started with Sublime then it would have been VSCode getting these PRs with "just follow Sublime"

In any case, a more thorough and detailed style guide is required for us to stop recommending what VSCode currently does.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Colors out of sync with VS Code and other tools
4 participants