mroot/yazi
1
0
Fork 0
mirror of https://github.com/sxyazi/yazi.git synced 2026-07-25 08:41:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix: don't check if has a hovered file in advance, only do so when --hovered is explicitly specified

Browse source
This commit is contained in:
sxyazi 2024-12-27 19:19:36 +08:00
parent d754ac5dac
commit 3fae3f5acc
No known key found for this signature in database
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
yazi-core/src/manager/commands/remove.rs
View file

@ -28,14 +28,13 @@ impl Manager {
if !self.active_mut().try_escape_visual() { if !self.active_mut().try_escape_visual() {
return; return;
} }
let Some(hovered) = self.hovered().map(|h| &h.url) else {
return;
};
opt.targets = if opt.hovered { opt.targets = if !opt.hovered {
vec![hovered.clone()]
} else {
self.selected_or_hovered(true).cloned().collect() self.selected_or_hovered(true).cloned().collect()
} else if let Some(h) = self.hovered() {
vec![h.url.clone()]
} else {
return;
}; };
if opt.force { if opt.force {

7
yazi-core/src/manager/commands/rename.rs
View file

@ -33,15 +33,14 @@ impl Manager {
pub fn rename(&mut self, opt: Opt) { pub fn rename(&mut self, opt: Opt) {
if !self.active_mut().try_escape_visual() { if !self.active_mut().try_escape_visual() {
return; return;
} else if !opt.hovered && !self.active().selected.is_empty() {
return self.bulk_rename();
} }
let Some(hovered) = self.hovered().map(|h| h.url_owned()) else { let Some(hovered) = self.hovered().map(|h| h.url_owned()) else {
return; return;
}; };
if !opt.hovered && !self.active().selected.is_empty() {
return self.bulk_rename();
}
let name = Self::empty_url_part(&hovered, &opt.empty); let name = Self::empty_url_part(&hovered, &opt.empty);
let cursor = match opt.cursor.as_ref() { let cursor = match opt.cursor.as_ref() {
"start" => Some(0), "start" => Some(0),