From 5df3504cf4528186cabe427f465cbe88a56edf6d Mon Sep 17 00:00:00 2001 From: sxyazi Date: Wed, 4 Oct 2023 14:34:42 +0800 Subject: [PATCH] .. [no ci] --- app/src/executor.rs | 6 +++--- core/src/manager/finder.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/executor.rs b/app/src/executor.rs index f9fbe404..788cf3f4 100644 --- a/app/src/executor.rs +++ b/app/src/executor.rs @@ -156,9 +156,9 @@ impl Executor { let prev = exec.named.contains_key("previous"); let case = match (exec.named.contains_key("smart"), exec.named.contains_key("insensitive")) { - (false, false) => FinderCase::Sensitive, - (false, true) => FinderCase::Insensitive, - (true, _) => FinderCase::Smart, // prioritize smart over insensitive + (true, _) => FinderCase::Smart, + (_, false) => FinderCase::Sensitive, + (_, true) => FinderCase::Insensitive, }; cx.manager.active_mut().find(query, prev, case) } diff --git a/core/src/manager/finder.rs b/core/src/manager/finder.rs index 16f2daff..ab1f4e99 100644 --- a/core/src/manager/finder.rs +++ b/core/src/manager/finder.rs @@ -8,9 +8,9 @@ use crate::files::Files; #[derive(PartialEq, Eq)] pub enum FinderCase { + Smart, Sensitive, Insensitive, - Smart, } pub struct Finder { @@ -22,12 +22,12 @@ pub struct Finder { impl Finder { pub(super) fn new(s: &str, case: FinderCase) -> Result { let query = match case { - FinderCase::Sensitive => Regex::new(s)?, - FinderCase::Insensitive => RegexBuilder::new(s).case_insensitive(true).build()?, FinderCase::Smart => { let uppercase = s.chars().any(|c| c.is_uppercase()); RegexBuilder::new(s).case_insensitive(!uppercase).build()? } + FinderCase::Sensitive => Regex::new(s)?, + FinderCase::Insensitive => RegexBuilder::new(s).case_insensitive(true).build()?, }; Ok(Self { query, matched: Default::default(), version: 0 }) }