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 7

fix: enter and leave commands should treat the search results as regular entities (#1687)

Browse source
This commit is contained in:
三咲雅 · Misaki Masa 2024-09-26 08:50:07 +08:00 • committed by GitHub
parent 5b66192332
commit c4ffdc08bb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
yazi-core/src/manager/commands/peek.rs
View file

@ -1,4 +1,4 @@
use yazi_shared::{event::{Cmd, Data}, fs::Url, render}; use yazi_shared::{event::{Cmd, Data}, fs::Url};
use crate::manager::Manager; use crate::manager::Manager;

2
yazi-core/src/manager/commands/seek.rs
View file

@ -1,6 +1,6 @@
use yazi_config::PLUGIN; use yazi_config::PLUGIN;
use yazi_plugin::isolate; use yazi_plugin::isolate;
use yazi_shared::{MIME_DIR, event::{Cmd, Data}, render}; use yazi_shared::{MIME_DIR, event::{Cmd, Data}};
use crate::manager::Manager; use crate::manager::Manager;

4
yazi-core/src/manager/commands/tab_create.rs
View file

@ -42,11 +42,11 @@ impl Tabs {
} else if let Some(h) = self.active().current.hovered() { } else if let Some(h) = self.active().current.hovered() {
tab.conf = self.active().conf.clone(); tab.conf = self.active().conf.clone();
tab.apply_files_attrs(); tab.apply_files_attrs();
tab.reveal(h.url_owned()); tab.reveal(h.url.to_regular());
} else { } else {
tab.conf = self.active().conf.clone(); tab.conf = self.active().conf.clone();
tab.apply_files_attrs(); tab.apply_files_attrs();
tab.cd(self.active().cwd().to_owned()); tab.cd(self.active().cwd().to_regular());
} }
self.items.insert(self.cursor + 1, tab); self.items.insert(self.cursor + 1, tab);

2
yazi-core/src/tab/commands/enter.rs
View file

@ -4,6 +4,6 @@ use crate::tab::Tab;
impl Tab { impl Tab {
pub fn enter(&mut self, _: Cmd) { pub fn enter(&mut self, _: Cmd) {
self.current.hovered().filter(|h| h.is_dir()).map(|h| h.url_owned()).map(|u| self.cd(u)); self.current.hovered().filter(|h| h.is_dir()).map(|h| h.url.to_regular()).map(|u| self.cd(u));
} }
} }

4
yazi-core/src/tab/commands/leave.rs
View file

@ -15,9 +15,9 @@ impl Tab {
self self
.current .current
.hovered() .hovered()
.and_then(|h| h.parent()) .and_then(|h| h.url.parent_url())
.filter(|u| u != self.cwd()) .filter(|u| u != self.cwd())
.or_else(|| self.cwd().parent_url()) .or_else(|| self.cwd().parent_url())
.map(|u| self.cd(u)); .map(|u| self.cd(u.into_regular()));
} }
} }

3
yazi-shared/src/fs/file.rs
View file

@ -101,7 +101,4 @@ impl File {
#[inline] #[inline]
pub fn stem(&self) -> Option<&OsStr> { self.url.file_stem() } pub fn stem(&self) -> Option<&OsStr> { self.url.file_stem() }
#[inline]
pub fn parent(&self) -> Option<Url> { self.url.parent_url() }
} }