|
|
@ -533,18 +533,24 @@ impl Component for Prompt {
|
|
|
|
if self.selection.is_some() && self.line.ends_with(std::path::MAIN_SEPARATOR) {
|
|
|
|
if self.selection.is_some() && self.line.ends_with(std::path::MAIN_SEPARATOR) {
|
|
|
|
self.recalculate_completion(cx.editor);
|
|
|
|
self.recalculate_completion(cx.editor);
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
|
|
|
|
let last_item = self
|
|
|
|
|
|
|
|
.history_register
|
|
|
|
|
|
|
|
.and_then(|reg| cx.editor.registers.last(reg).cloned())
|
|
|
|
|
|
|
|
.map(|entry| entry.into())
|
|
|
|
|
|
|
|
.unwrap_or_else(|| Cow::from(""));
|
|
|
|
|
|
|
|
|
|
|
|
// handle executing with last command in history if nothing entered
|
|
|
|
// handle executing with last command in history if nothing entered
|
|
|
|
let input: Cow<str> = if self.line.is_empty() {
|
|
|
|
let input: Cow<str> = if self.line.is_empty() {
|
|
|
|
// latest value in the register list
|
|
|
|
last_item
|
|
|
|
self.history_register
|
|
|
|
|
|
|
|
.and_then(|reg| cx.editor.registers.last(reg).cloned())
|
|
|
|
|
|
|
|
.map(|entry| entry.into())
|
|
|
|
|
|
|
|
.unwrap_or_else(|| Cow::from(""))
|
|
|
|
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
if let Some(register) = self.history_register {
|
|
|
|
if last_item != self.line {
|
|
|
|
// store in history
|
|
|
|
// store in history
|
|
|
|
let register = cx.editor.registers.get_mut(register);
|
|
|
|
if let Some(register) = self.history_register {
|
|
|
|
register.push(self.line.clone());
|
|
|
|
cx.editor
|
|
|
|
|
|
|
|
.registers
|
|
|
|
|
|
|
|
.get_mut(register)
|
|
|
|
|
|
|
|
.push(self.line.clone());
|
|
|
|
|
|
|
|
};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
self.line.as_str().into()
|
|
|
|
self.line.as_str().into()
|
|
|
|