Age | Commit message (Collapse) | Author |
|
The code was relying on inequality-by-value of e.g. --minus-style and
--minus-emph-style. So when those were the same by value, the behavior
was incorrect.
See also previous commit eec0fb23cfcf64cd2a5da78895112ce7fe3f1108
|
|
This isn't a correct approach. The problem being addressed is that
currently, Style instances are being used to represent things like the
presence of an emph section in a line with edit annotations. A
consequence is that if an emph and non-emph section are styled the
same, then it's impossible to tell that the sections are different in
any way at all. I think the correct approach is probably to start
using a Struct that models elements such as emph/non-emph to represent
these things, and make each such struct instance possess a style.
|
|
|
|
|
|
If this attribute is set in --thing-style then the `thing` element
text received from git should be passed though unchanged. (It may or
may not have a decoration.)
|
|
|
|
|
|
|
|
|
|
Fixes #169
|
|
|
|
- Do not apply foreground syntax style if it is "null syntect style"
This isn't really correct. We should find either a valid sentinel
value, or a way to only do the superimposing when we're doing
syntax-highlighting.
- Add --zero-style option (style for unchanged hunk lines)
- Implement --color-only using an option rewrite rule
|
|
|
|
https://git-scm.com/docs/git-config#Documentation/git-config.txt-color
- Support "syntax" pseudo foreground color
- Delete the --syntax-highlight CLI option
This was never released.
|
|
|
|
- Revert "Do not expose new foreground color options yet"
This reverts commit 253bc3ac0fe34a8f08c2bf625fcc8bb78de01a4c.
- Make test assertions for minus_foreground_color
- Fix test: fix detection of foreground color
- Add diagnostic output to hunk highlighting test
- Disable syntax-highlighting if the user has set foreground colors
- Eliminate redundant style modifiers in config
- Revert fixed_foreground_style implementation
The syntax_style_sections will just contain syntect styles, or else a
dummy no-op style. All delta styles will be done in
diff_style_sections.
- Add more dimensions to grid in hunk highlighting test
- Support "none" as a value for background colors
- Set foreground colors in a way that's consistent with background colors
- Bug fix: don't highlight when there is no theme
|
|
- New command-line option --syntax highlight to select which category
of hunk lines to be syntax highlighted. --highlight-removed is now
deprecated.
- New hunk highlighting test tests syntax highlighting and background colors
- Refactor: construction of style modifiers for config struct
- Refactor: compute minus and plus foreground style sections separately
- Refactor: foreground style logic
- Refactor: rearrange style modifier construction for config
- Refactor: change variable name: => highlight_minus_lines
- Refactor: clean up --color-only config implementation
|
|
Experimental feature controlled by environment variable
DELTA_EXPERIMENTAL_MAX_LINE_DISTANCE_FOR_NAIVELY_PAIRED_LINES.
|
|
Thanks @da-x
|
|
|
|
Fixes #136
|
|
|
|
At the parent commit da473302, some lines are being incorrectly
truncated at word boundaries. It's something to do with an interaction
between (a) the changes made in da473302 in order to implement
--retain-plus-minus-markers, and (b) the logic in tokenize(). This
commit works around that by reinstating the leading space character
during tokenization and syntax highlighting, and then removing it
afterwards in a hacky way.
|
|
|
|
|
|
|
|
|
|
|
|
Fixes #110
With this commit, delta enters "24 bit color mode" iff either of the
following are true:
1. The --24-bit-color command line option value is "always"
2. The --24-bit-color command line option value is "auto" and the
COLORTERM environment variable is set to "truecolor" or "24bit".
See
https://gist.github.com/XVilka/8346728#true-color-detection
https://github.com/sharkdp/bat/blob/7779d9f6221b3e98c43a43ceb5596ba285fdf4f8/src/bin/bat/app.rs#L29-L33
Otherwise, delta enters "8-bit color mode".
In "24 bit color mode", delta will
1. Emit 24-bit RGB color shell escape sequences that will only be
displayed correctly by a terminal application that supports 24 bit
colors.
2. Select default background colors that will only be displayed
correctly by a terminal application that supports 24 bit colors.
In "8-bit color mode", delta will
1. Emit color shell escape sequences specifying the entry in the ANSI
256 color palette that is closest (according to the ansi_colours
library) to the requested color.
2. Select default background colors that will work well in a terminal
application that supports 8-bit color but not 24-bit color.
|
|
- Fixes #99, #103
- Support both RGB and ANSI codes
- Eliminate (almost) ansi_term crate in favor of syntect for representing colors
|
|
Fixes #54
See https://github.com/sharkdp/bat/pull/543
|
|
|
|
Fixes diffs rendering with lines containing CJK characters.
|
|
If a theme is selected, foreground highlighting will be highlighted as .txt.
If theme=none there will be no foreground highlighting.
Fixes #34
|
|
|
|
Fixes #14
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This remains tightly coupled to syntect's data structure, i.e.
[(Style, &str), ...]
but removes any explicit mention of styles in the edit module.
|