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.

Sign up for GitHub

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

Jump to bottom

New assignment of emph and non-emph styles #785

Merged
merged 7 commits into from
Nov 28, 2021
Merged

New assignment of emph and non-emph styles #785

merged 7 commits into from
Nov 28, 2021

Commits on Nov 28, 2021

  1. Initial file state

    @dandavison
    dandavison committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    36cc7e6 View commit details
    Browse the repository at this point in the history

  2. Styles demo commit 

    The diff in this commit contains sections with all of the following semantics:

minus-style (old line 1)
plus-style (new line 1)
zero-style (line 2)
minus-non-emph-style (old line 4, and unchanged sections of old line 3)
minus-emph-style (deleted word "chaffinch" in old line 3)
plus-non-emph-style (new line 3, and unchanged sections of new line 4)
plus-emph-style (added word "dodo" of new line 4)
    @dandavison
    dandavison committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    81ea3ca View commit details
    Browse the repository at this point in the history

  3. Change rules for non-emph style 

    Fixes #776

Previously, when a paired plus line had no edits, it received
plus-style. With this commit such a line receives
plus-non-emph-style.

There's no change to unpaired lines (still plus-style) and paired
lines with edits (still a mosaic of plus-non-emph-style and plus-emph-style).

(The above statements hold for minus lines also).

Since *-non-emph-style defaults to *-emph-style, this commit does not
result in any change in output for users using the defaults.
    @dandavison
    dandavison committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    394ce52 View commit details
    Browse the repository at this point in the history

  4. Always use non-emph style for right fill

    @dandavison
    dandavison committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    5cbf843 View commit details
    Browse the repository at this point in the history

  5. Refactor: hunk style sections handling 

    - Factor out a new function update_diff_style_sections
- Use MinusPlus construct more
    @dandavison
    dandavison committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    fc03370 View commit details
    Browse the repository at this point in the history

  6. Do not fill entirely new/removed lines with non-emph style

    @dandavison
    dandavison committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    1296032 View commit details
    Browse the repository at this point in the history

  7. Fix right fill style on color-moved lines 

    Bug introduced at 7d2ac30
    @dandavison
    dandavison committed Nov 28, 2021
    Configuration menu
    Copy the full SHA
    0612678 View commit details
    Browse the repository at this point in the history