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 escape

Browse source
This commit is contained in:
sxyazi 2023-12-28 00:23:03 +08:00
parent 3812ea2d3a
commit e489bf3c81
No known key found for this signature in database
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -46,7 +46,7 @@ impl Tab {
#[inline]
fn escape_filter(&mut self) -> bool {
self.filter_do(super::filter::Opt { query: None, ..Default::default() })
self.filter_do(super::filter::Opt { query: "", ..Default::default() })
}
#[inline]

11
yazi-core/src/tab/commands/filter.rs
View file

@ -9,13 +9,13 @@ use crate::{folder::{Filter, FilterCase}, input::Input, manager::Manager, tab::T
#[derive(Default)]
pub struct Opt<'a> {
pub query: Option<&'a str>,
pub query: &'a str,
pub case: FilterCase,
}
impl<'a> From<&'a Exec> for Opt<'a> {
fn from(e: &'a Exec) -> Self {
Self { query: e.args.first().map(|s| s.as_str()), case: e.into() }
Self { query: e.args.first().map(|s| s.as_str()).unwrap_or_default(), case: e.into() }
}
}
@ -43,13 +43,10 @@ impl Tab {
pub fn filter_do<'a>(&mut self, opt: impl Into<Opt<'a>>) -> bool {
let opt = opt.into() as Opt;
let Some(query) = opt.query else {
return false;
};
let filter = if query.is_empty() {
let filter = if opt.query.is_empty() {
None
} else if let Ok(f) = Filter::new(query, opt.case) {
} else if let Ok(f) = Filter::new(opt.query, opt.case) {
Some(f)
} else {
return false;