Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/help.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ mod tests {
use super::*;

#[test]
fn test_run() {
fn run_success() {
assert!(
run()
.get_message()
Expand Down
2 changes: 1 addition & 1 deletion src/license.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ mod tests {
use super::*;

#[test]
fn test_run() {
fn run_success() {
assert!(
run()
.get_message()
Expand Down
2 changes: 1 addition & 1 deletion src/modules/external_editor/argument_tokenizer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub(super) fn tokenize(input: &str) -> Option<Vec<String>> {
let mut force_value = false;

let mut tokens = vec![];
for (i, c) in input.chars().enumerate() {
for (i, c) in input.char_indices() {
match state {
State::Normal => {
if c == '\\' {
Expand Down
2 changes: 1 addition & 1 deletion src/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ mod tests {

#[test]
#[serial_test::serial]
fn test_run() {
fn run_success() {
assert!(run().get_message().unwrap().starts_with("interactive-rebase-tool"));
}

Expand Down
29 changes: 5 additions & 24 deletions src/view/render_slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,7 @@ impl RenderSlice {
return 0;
}

let view_height = if self.padding_height < self.height {
self.height - self.padding_height
}
else {
0
};
let view_height = self.height.saturating_sub(self.padding_height);

if view_height <= 1 || view_height > self.lines_count {
return 0;
Expand Down Expand Up @@ -285,12 +280,8 @@ impl RenderSlice {
else {
// trailing lines have precedence over leading lines, title always has precedence
let padding_height = if self.show_title { 1 } else { 0 } + trailing_lines_length;
let available_height = if padding_height < self.height {
self.height - padding_height
}
else {
0
};
let available_height = self.height.saturating_sub(padding_height);

let leading_lines_end = if leading_lines_length < available_height {
leading_lines_length
}
Expand All @@ -310,12 +301,7 @@ impl RenderSlice {
else {
// title always has precedence
let padding_height = if self.show_title { 1 } else { 0 };
let available_height = if padding_height < self.height {
self.height - padding_height
}
else {
0
};
let available_height = self.height.saturating_sub(padding_height);

let trailing_lines_end = if trailing_lines_length < available_height {
trailing_lines_length
Expand All @@ -335,12 +321,7 @@ impl RenderSlice {
}
else {
// all other lines take precedence over regular lines
let available_height = if self.padding_height < self.height {
self.height - self.padding_height
}
else {
0
};
let available_height = self.height.saturating_sub(self.padding_height);

let lines_start = self.scroll_position.get_top_position();

Expand Down
Loading