Switch from diff-so-fancy to delta #282
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
diff-so-fancy [1] provided a way better highlighting than diff-highlight [2], the tool that is shipped with Git. Anyway, next to the fact that it is written in Perl and required yet another interpreter installation, there have also been long-time problems regarding the `fatal: mismatched output` error when running as `interactive.diffFilter`. In so-fancy/diff-so-fancy#296 and so-fancy/diff-so-fancy#35 are long discussions and some proposed workarounds, but none really worked properly. Therefore I switched to delta [3] a while ago and the configurations have now been tested enough on a day-by-day basis to be persisted in igloo. delta not only provides the same features like diff-so-fancy and other highlighters [4] but comes with many more advantages. The highlighting can also be styled using the same themes like bat [5] that is also already available as snowblock [6]. The colors have been adjusted to match the Nord [7] theme. Note that the Nord color palettes must be provided through the terminal [8] as the 16 ANSI base colors. Some diff specific colors have been specified as HEX tripplets. The background colors for added, removed and modified lines are adjusted in brightness and saturation using the `scale()` function [9] of the `color` module [10] provided by the official Sass reference implementation written in Dart [11]. ```scss @use "sass:color"; $nord10: #5e81ac; $nord11: #bf616a; $minus-color: color.scale($nord11, $lightness: -28%, $saturation: -20%); $plus-color: color.scale($nord10, $lightness: -22%, $saturation: -16%); ``` [1]: https://github.com/so-fancy/diff-so-fancy [2]: https://github.com/git/git/tree/master/contrib/diff-highlight [3]: https://github.com/dandavison/delta [4]: https://github.com/dandavison/delta#features [5]: https://github.com/sharkdp/bat [6]: https://github.com/arcticicestudio/igloo/tree/master/snowblocks/bat [7]: https://www.nordtheme.com [8]: https://www.nordtheme.com/ports [9]: https://sass-lang.com/documentation/modules/color#scale [10]: https://sass-lang.com/documentation/modules [11]: https://github.com/sass/dart-sass GH-281 Co-authored-by: Sven Greb <[email protected]>
svengreb
approved these changes
May 9, 2020
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.
Closes #281