extrawurst/gitui
1
1
Fork 0
mirror of https://github.com/extrawurst/gitui.git synced 2024-11-22 02:12:58 +03:00
Code Issues Projects Releases Wiki Activity

Fix 583 fix diff line selection (#585)

Browse Source 
Preserve line selection after staging/unstaging/discard (closes #583)
This commit is contained in:
Stephan Dilly 2021-03-12 23:57:31 +01:00 committed by GitHub
parent e08f357f57
commit 7937b80483
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- support for pushing tags ([#568](https://github.com/extrawurst/gitui/issues/568))
- visualize *conflicted* files differently ([#576](https://github.com/extrawurst/gitui/issues/576))
### Fixed
- keep diff line selection after staging/unstaging/discarding ([#583](https://github.com/extrawurst/gitui/issues/583))
## [0.12.0] - 2020-03-03
**pull support (ff-merge or conflict-free merge-commit)**

30
src/components/diff.rs
View File

@ -169,20 +169,27 @@ impl DiffComponent {
let hash = hash(&diff);
if self.current.hash != hash {
let reset_selection = self.current.path != path;
self.current = Current {
path,
is_stage,
hash,
};
self.selected_hunk = Self::find_selected_hunk(
&diff,
self.selection.get_start(),
);
self.diff = Some(diff);
self.scroll_top.set(0);
self.selection = Selection::Single(0);
if reset_selection {
self.scroll_top.set(0);
self.selection = Selection::Single(0);
self.update_selection(0);
} else {
let old_selection = match self.selection {
Selection::Single(line) => line,
Selection::Multiple(start, _) => start,
};
self.update_selection(old_selection);
}
}
Ok(())
@ -215,10 +222,15 @@ impl DiffComponent {
}
};
self.update_selection(new_start);
}
}
fn update_selection(&mut self, new_start: usize) {
if let Some(diff) = &self.diff {
let max = diff.lines.saturating_sub(1) as usize;
let new_start = cmp::min(max, new_start);
self.selection = Selection::Single(new_start);
self.selected_hunk =
Self::find_selected_hunk(diff, new_start);
}