diff options
| author | Dan Davison <dandavison7@gmail.com> | 2021-11-29 20:54:48 -0500 |
|---|---|---|
| committer | Dan Davison <dandavison7@gmail.com> | 2021-12-05 11:25:05 -0500 |
| commit | 6745f42ddadeccfa30628c70d39b8f9abbff35f0 (patch) | |
| tree | 19cdd504eba5632d6bb0d6a72559b1ee1774c057 /src/features | |
| parent | e7294060ef3b8af0d2307eea4359123232f85646 (diff) | |
Display merge conflicts
Diffstat (limited to 'src/features')
| -rw-r--r-- | src/features/side_by_side.rs | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/features/side_by_side.rs b/src/features/side_by_side.rs index 85b066cb..568142dc 100644 --- a/src/features/side_by_side.rs +++ b/src/features/side_by_side.rs @@ -5,6 +5,7 @@ use unicode_segmentation::UnicodeSegmentation; use crate::ansi; use crate::cli; use crate::config::{self, delta_unreachable, Config}; +use crate::delta::DiffType; use crate::delta::State; use crate::edits; use crate::features::{line_numbers, OptionValueFunction}; @@ -180,7 +181,7 @@ pub fn paint_minus_and_plus_lines_side_by_side( &lines_have_homolog[Left], match minus_line_index { Some(i) => &line_states[Left][i], - None => &State::HunkMinus(None, None), + None => &State::HunkMinus(DiffType::Unified, None), }, &mut Some(line_numbers_data), bg_should_fill[Left], @@ -201,7 +202,7 @@ pub fn paint_minus_and_plus_lines_side_by_side( &lines_have_homolog[Right], match plus_line_index { Some(i) => &line_states[Right][i], - None => &State::HunkPlus(None, None), + None => &State::HunkPlus(DiffType::Unified, None), }, &mut Some(line_numbers_data), bg_should_fill[Right], @@ -222,7 +223,7 @@ pub fn paint_zero_lines_side_by_side<'a>( painted_prefix: Option<ansi_term::ANSIString>, background_color_extends_to_terminal_width: BgShouldFill, ) { - let states = vec![State::HunkZero(None)]; + let states = vec![State::HunkZero(DiffType::Unified)]; let (states, syntax_style_sections, diff_style_sections) = wrap_zero_block( config, @@ -418,8 +419,12 @@ fn paint_minus_or_plus_panel_line<'a>( ) } else { let opposite_state = match state { - State::HunkMinus(_, s) => State::HunkPlus(None, s.clone()), - State::HunkPlus(_, s) => State::HunkMinus(None, s.clone()), + State::HunkMinus(DiffType::Unified, s) => { + State::HunkPlus(DiffType::Unified, s.clone()) + } + State::HunkPlus(DiffType::Unified, s) => { + State::HunkMinus(DiffType::Unified, s.clone()) + } _ => unreachable!(), }; ( |