Fixed hint-related regression caused by recent history logic changes
This commit is contained in:
@@ -11,7 +11,7 @@ use crate::parse::lex::{LexFlags, LexStream, Tk, TkFlags, TkRule, is_field_sep,
|
|||||||
use crate::parse::{Redir, RedirType};
|
use crate::parse::{Redir, RedirType};
|
||||||
use crate::procio::{IoBuf, IoFrame, IoMode, IoStack};
|
use crate::procio::{IoBuf, IoFrame, IoMode, IoStack};
|
||||||
use crate::state::{
|
use crate::state::{
|
||||||
LogTab, VarFlags, read_jobs, read_logic, read_vars, write_jobs, write_meta, write_vars,
|
LogTab, VarFlags, read_logic, read_vars, write_jobs, write_meta, write_vars,
|
||||||
};
|
};
|
||||||
use crate::{jobs, prelude::*};
|
use crate::{jobs, prelude::*};
|
||||||
|
|
||||||
@@ -36,7 +36,9 @@ pub const PROC_SUB_OUT: char = '\u{fdd6}';
|
|||||||
/// arguments Without this marker, it would be handled like an empty string,
|
/// arguments Without this marker, it would be handled like an empty string,
|
||||||
/// which breaks some commands
|
/// which breaks some commands
|
||||||
pub const NULL_EXPAND: char = '\u{fdd7}';
|
pub const NULL_EXPAND: char = '\u{fdd7}';
|
||||||
|
/// Explicit marker for argument separation
|
||||||
|
/// This is used to join the arguments given by "$@", and preserves exact formatting
|
||||||
|
/// of the original arguments, including quoting
|
||||||
pub const ARG_SEP: char = '\u{fdd8}';
|
pub const ARG_SEP: char = '\u{fdd8}';
|
||||||
|
|
||||||
impl Tk {
|
impl Tk {
|
||||||
|
|||||||
@@ -285,6 +285,8 @@ impl History {
|
|||||||
if let Some(pending) = &mut self.pending {
|
if let Some(pending) = &mut self.pending {
|
||||||
pending.set_buffer(cmd);
|
pending.set_buffer(cmd);
|
||||||
pending.cursor.set(cursor_pos);
|
pending.cursor.set(cursor_pos);
|
||||||
|
} else {
|
||||||
|
self.pending = Some(LineBuf::new().with_initial(&cmd, cursor_pos));
|
||||||
}
|
}
|
||||||
self.constrain_entries(constraint);
|
self.constrain_entries(constraint);
|
||||||
}
|
}
|
||||||
@@ -357,10 +359,6 @@ impl History {
|
|||||||
.saturating_add_signed(offset)
|
.saturating_add_signed(offset)
|
||||||
.clamp(0, self.search_mask.len());
|
.clamp(0, self.search_mask.len());
|
||||||
|
|
||||||
log::debug!(
|
|
||||||
"Scrolling history by offset {offset} from cursor at index {}",
|
|
||||||
self.cursor
|
|
||||||
);
|
|
||||||
self.search_mask.get(self.cursor)
|
self.search_mask.get(self.cursor)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user