feat: add git diff syntax highlighting#39
feat: add git diff syntax highlighting#39jack-mil merged 4 commits intocatppuccin:mainfrom jack-mil:add-diff
Conversation
templates/editor.tera
Outdated
| <WordsStyle name="COMMENT" styleID="1" fgColor="{{ overlay2.hex }}" bgColor="{{ base.hex }}" colorStyle="1" fontName="" fontStyle="0" fontSize="" /> | ||
| <WordsStyle name="COMMAND" styleID="2" fgColor="{{ mauve.hex }}" bgColor="{{ base.hex }}" colorStyle="1" fontName="" fontStyle="1" fontSize="" /> | ||
| <WordsStyle name="HEADER" styleID="3" fgColor="{{ blue.hex }}" bgColor="{{ base.hex }}" colorStyle="1" fontName="" fontStyle="0" fontSize="" /> | ||
| <WordsStyle name="POSITION" styleID="4" fgColor="{{ yellow.hex }}" bgColor="{{ base.hex }}" colorStyle="1" fontName="" fontStyle="1" fontSize="" /> |
There was a problem hiding this comment.
I think peach might be better suited than yellow here.
|
We don't realllyyy have a good standard for diffs. For reference: Helix
Neovim
Visual Studio Code
Zed
|
|
Here is the change with location/line numbers in |
|
I think yellow looks bette, but as we do not have standards, I also don't know which would fit better. |
I'm justifying
and it's the second rainbow heading. Commands are usually blue in our terminal ports but I guess Edit: |
|
|
|
If you'd humour me, what about setting the command to |
yea I think that might be fitting, actually |
|
Personally, I liked more colors with blue & mauve for command and filenames, respectively.
|
|
My reasoning there is that I don't think the diff command is something you want highlighted since it's duplicated information from the filenames 🤔 @backwardspy - what do you think? |
|
I think we should highlight as something other than text to distinguish it from the commit/patch message/details above and raw lines of code below that are also plain |
|
i agree, it makes sense for it to stand out. i think the original and blue/mauve/peach both look nice. i say we pick one, put it in the style guide, and see what we can do about getting the other editors in line. |
Sounds like a plan, I'd currently put forward:
|
|
i'm happy with that! |
|
Ok, so this PR as is looks like this, in Mocha, Frappe, and Latte mocha
frappe
latte
|
Fwiw I think we have traditionally done pink filenames, as can be seen in Neovim and Zed's reference images in my earlier comment, as well is with unquoted paths in Nix. With the already have use of mauve in our syntax highlighting, and with pink being less common, maybe we can diversify and go with pink for filenames here? |
|
Sure, happy with |
|
Done |
5 participants
Finally something that might actually offer a slight improvement over the VS Code default!
The choices of color are a bit arbitrary, but I personally think it looks nice.
Relates to #33