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

Contribute zebra features for movedcolors support #900

Closed
wants to merge 0 commits into from

Conversation

chtenb
Copy link
Contributor

@chtenb chtenb commented Jan 13, 2022

In response to #72

The features are theme agnostic. The colors have been carefully chosen to work with most colorschemes.

image

image

@dandavison
Copy link
Owner

This is really cool. I think I'd like to add those screenshots to the README also -- if you feel like doing that, that would be great, or else I will.

Could you give the VSCode themes that you're using?

Btw I'm also a VSCode user nowadays, and so also use delta in the VSCode integrated terminal, as well as in iTerm2. It's nice that the file paths are clickable isn't it? (without resorting to hyperlinks) Do you use delta's relative-paths option? I believe that's necessary to ensure file-paths emitted by delta are correct relative to the current directory.

OK, more ambitious challenge: how do we get delta colorizing the diff output of the Edamagit VSCode extension?? :)

@chtenb
Copy link
Contributor Author

chtenb commented Jan 14, 2022

This is really cool. I think I'd like to add those screenshots to the README also -- if you feel like doing that, that would be great, or else I will.

Sure, no problem.

Could you give the VSCode themes that you're using?

Funny you should ask, since I just set out this week to develop a syntax highlighting standard, because I'm dissatisfied with the syntax highlighting quality of many VSCode themes and because I don't like that my integrated terminal doesn't automatically display diffs with the same syntax coloring scheme.

I've started to formulate the guidelines at https://github.com/chtenb/ansi16 and I have created a bunch of implementations at https://marketplace.visualstudio.com/items?itemName=ctenbrinke.ansi16
The screenshots were from those. It is still very young, liquid and not carefully thought out, but the themes work pretty well so far.

Do you use delta's relative-paths option? I believe that's necessary to ensure file-paths emitted by delta are correct relative to the current directory.

I do not, but it looks like I should. I wasn't aware of this option. Thanks!

OK, more ambitious challenge: how do we get delta colorizing the diff output of the Edamagit VSCode extension?? :)

I only use vanilla commandline myself, but I have to say that that looks pretty powerful. I'm gonna put it on my list of things to check out :)

@chtenb
Copy link
Contributor Author

chtenb commented Jan 17, 2022

I've added the screenshots

@chtenb
Copy link
Contributor Author

chtenb commented Jan 25, 2022

@dandavison is there anything else you need me to do for this PR?

README.md Outdated
@@ -512,6 +512,8 @@ This feature allows all of git's color-moved options to be rendered using delta
map-styles = bold purple => syntax magenta, bold cyan => syntax blue
```

There is a pair of features provided in [themes.config](https://github.com/chtenb/delta/blob/master/themes.gitconfig) called `zebra-dark` and `zebra-light` which utilise the moved colors by displaying them as a faint background color on the affected lines while keeping syntax highlighting as the foreground color. You can enable one of these features by stacking it upon the theme you are using.

Copy link
Owner

Choose a reason for hiding this comment

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

Could you explain to users a bit more explicitly what you mean by "stacking it upon the theme you are using"? I know people get confused by the different notions of "theme" in delta.

Copy link
Owner

Choose a reason for hiding this comment

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

I'm sorry @chtenb -- I wrote this question ages ago but somehow it got left as a "Pending" review comment instead of just being posted immediately. I'll rebase this branch so that the merge conflicts are gone but I did have this one question.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see, no worries :) Do you have a clearer phrasing in mind, or should there be an example?

Copy link
Owner

Choose a reason for hiding this comment

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

I think an example would help. I'm not clear yet what you mean by "stacking it upon the theme you are using". zebra-light and zebra-dark set core styles such as minus-style and plus-style so it seems to me that they would mostly overwrite the styles from another theme that the user is using?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I was thinking like features = my-theme zebra-dark. This way zebra dark overrides the git colors specifically but leaves the rest of your preferred theme intact. That's how I use it currently anyway.

@dandavison
Copy link
Owner

Sorry, my GitHub workflows are not going well on this PR! Your changes are in master, but this PR got closed -- sorry about that. I'd still like to give the users more explanation of how you envisage the themes being used (the "stacking" comment above), but you can just post the text here or open a new PR -- totally up to you.

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.

2 participants