Skip to content

Commit

Permalink
Fix ci issues
Browse files Browse the repository at this point in the history
  • Loading branch information
AMythicDev committed Feb 12, 2024
1 parent 71f7cc4 commit a0cc54f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/core/utils/display/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ pub fn draw_for_change(
ps.line_wrapping,
ps.left_mark,
ps.line_numbers.is_on(),
ps.screen.line_count(),
ps.screen.get_line_count(),
)?;

ps.upper_mark = *new_upper_mark;
Expand Down Expand Up @@ -280,7 +280,7 @@ pub fn write_from_pagerstate(out: &mut impl Write, ps: &mut PagerState) -> Resul
ps.line_wrapping,
ps.left_mark,
ps.line_numbers.is_on(),
ps.screen.line_count(),
ps.screen.get_line_count(),
)
}

Expand Down Expand Up @@ -310,7 +310,7 @@ pub fn write_lines_in_horizontal_scroll(
) -> crate::Result {
let line_number_ascii_seq_len = if line_numbers { 8 } else { 0 };
let line_number_padding = if line_numbers {
minus_core::digits(line_count) + LineNumbers::EXTRA_PADDING + 3
minus_core::utils::digits(line_count) + LineNumbers::EXTRA_PADDING + 3
} else {
0
};
Expand Down
4 changes: 4 additions & 0 deletions src/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,8 @@ pub struct IncrementalSearchOpts<'a> {
pub initial_formatted_lines: &'a Vec<String>,
/// Value of [PagerState::upper_mark] before starting of search prompt
pub initial_upper_mark: usize,
/// Value of [PagerState::line_wrapping] before starting of search prompt
pub line_wrapping: bool,
}

impl<'a> From<&'a PagerState> for IncrementalSearchOpts<'a> {
Expand All @@ -174,6 +176,7 @@ impl<'a> From<&'a PagerState> for IncrementalSearchOpts<'a> {
initial_upper_mark: ps.upper_mark,
upper_mark: ps.upper_mark,
initial_formatted_lines: &ps.screen.formatted_lines,
line_wrapping: ps.line_wrapping,
}
}
}
Expand Down Expand Up @@ -329,6 +332,7 @@ where
incremental_search_options.text,
incremental_search_options.line_numbers,
so.cols.into(),
incremental_search_options.line_wrapping,
&so.compiled_regex,
);
let position_of_next_match = next_nth_match(
Expand Down

0 comments on commit a0cc54f

Please sign in to comment.