github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 12:04:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactoring. Decompose ReaderData.jump function to two functions

Browse Source 
Part of #1842

Split to:
- jump_and_remember_last_jump. What previously was called jump, now called
  jump_and_remember_last_jump
- jump. Only jump, don't remember last jump. Now it's also possible to pass
  vector of targets

The commit is pure refactoring, no functional changes are introduced.
The refactoring is needed for the next commits
This commit is contained in:
Nikita Bobko 2024-06-28 22:25:00 +02:00 committed by Peter Ammon
parent 1cbd18cc30
commit c966c19c56
No known key found for this signature in database
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/reader.rs
View File

@ -1739,7 +1739,7 @@ impl ReaderData {
}
}
fn jump(
fn jump_and_remember_last_jump(
&mut self,
direction: JumpDirection,
precision: JumpPrecision,
@ -1749,7 +1749,16 @@ impl ReaderData {
self.last_jump_target = Some(target);
self.last_jump_direction = direction;
self.last_jump_precision = precision;
self.jump(direction, precision, elt, vec![target])
}
fn jump(
&mut self,
direction: JumpDirection,
precision: JumpPrecision,
elt: EditableLineTag,
targets: Vec<char>,
) -> bool {
let el = self.edit_line(elt);
match direction {
@ -1761,7 +1770,7 @@ impl ReaderData {
return false;
}
tmp_pos -= 1;
if el.at(tmp_pos) == target {
if targets.iter().any(|&target| el.at(tmp_pos) == target) {
if precision == JumpPrecision::Till {
tmp_pos = std::cmp::min(el.len() - 1, tmp_pos + 1);
}
@ -1773,7 +1782,7 @@ impl ReaderData {
JumpDirection::Forward => {
let mut tmp_pos = el.position() + 1;
while tmp_pos < el.len() {
if el.at(tmp_pos) == target {
if targets.iter().any(|&target| el.at(tmp_pos) == target) {
if precision == JumpPrecision::Till {
tmp_pos -= 1;
}
@ -3098,7 +3107,8 @@ impl<'a> Reader<'a> {
};
let (elt, _el) = self.active_edit_line();
if let Some(target) = self.function_pop_arg() {
let success = self.jump(direction, precision, elt, target);
let success =
self.jump_and_remember_last_jump(direction, precision, elt, target);
self.input_data.function_set_status(success);
}
@ -3108,7 +3118,7 @@ impl<'a> Reader<'a> {
let mut success = false;
if let Some(target) = self.last_jump_target {
success = self.data.jump(
success = self.data.jump_and_remember_last_jump(
self.data.last_jump_direction,
self.data.last_jump_precision,
elt,
@ -3130,9 +3140,12 @@ impl<'a> Reader<'a> {
};
if let Some(last_target) = self.last_jump_target {
success = self
.data
.jump(dir, self.data.last_jump_precision, elt, last_target);
success = self.data.jump_and_remember_last_jump(
dir,
self.data.last_jump_precision,
elt,
last_target,
);
}
self.last_jump_direction = original_dir;