From ea6dda762aa147ebcbc29b269e65b78dd046f4dd Mon Sep 17 00:00:00 2001
From: 魏曹先生 <1992414357@qq.com>
Date: Thu, 16 Jul 2026 04:08:09 +0800
Subject: feat(mingling_picker): replace bool Matcher with FlagMatcher

Rename `bool_matcher` module to `flag_matcher` and introduce a dedicated
`FlagMatcher` struct, moving matching logic away from the `bool` type
itself
---
 mingling_picker/src/builtin/pick_bool.rs     |  5 +--
 mingling_picker/src/parselib.rs              |  3 +-
 mingling_picker/src/parselib/bool_matcher.rs | 45 -----------------------
 mingling_picker/src/parselib/flag_matcher.rs | 53 ++++++++++++++++++++++++++++
 4 files changed, 58 insertions(+), 48 deletions(-)
 delete mode 100644 mingling_picker/src/parselib/bool_matcher.rs
 create mode 100644 mingling_picker/src/parselib/flag_matcher.rs

(limited to 'mingling_picker/src')

diff --git a/mingling_picker/src/builtin/pick_bool.rs b/mingling_picker/src/builtin/pick_bool.rs
index 65efe47..673f2a3 100644
--- a/mingling_picker/src/builtin/pick_bool.rs
+++ b/mingling_picker/src/builtin/pick_bool.rs
@@ -1,4 +1,5 @@
-use crate::{parselib::Matcher, pickable_needed::*};
+use crate::parselib::{FlagMatcher, Matcher};
+use crate::pickable_needed::*;
 
 impl<'a> Pickable<'a> for bool {
     fn get_attr(_: &'a PickerFlag<'a, Self>) -> PickerFlagAttr {
@@ -6,7 +7,7 @@ impl<'a> Pickable<'a> for bool {
     }
 
     fn tag(ctx: TagPhaseContext) -> Vec<usize> {
-        <bool as Matcher>::match_all(ctx.into())
+        FlagMatcher::match_all(ctx.into())
     }
 
     fn pick(raw_strs: &[&str]) -> PickerArgResult<Self> {
diff --git a/mingling_picker/src/parselib.rs b/mingling_picker/src/parselib.rs
index 5950c9d..cf550b7 100644
--- a/mingling_picker/src/parselib.rs
+++ b/mingling_picker/src/parselib.rs
@@ -1,4 +1,5 @@
-mod bool_matcher;
+mod flag_matcher;
+pub use flag_matcher::*;
 
 mod style;
 pub use style::*;
diff --git a/mingling_picker/src/parselib/bool_matcher.rs b/mingling_picker/src/parselib/bool_matcher.rs
deleted file mode 100644
index cbcb111..0000000
--- a/mingling_picker/src/parselib/bool_matcher.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use crate::{
-    matcher_needed::*,
-    parselib::{build_possible_flags, get_seeked_first, multi_seek_eq, seek_end_of_options},
-    vec_string_slice,
-};
-
-impl Matcher for bool {
-    fn on_match_one(
-        args: &[MaskedArg],
-        style: &ParserStyle,
-        arg_info: &PickerArgInfo,
-    ) -> Option<usize> {
-        let possible_flags = build_possible_flags(style, arg_info);
-        let end_of_options = seek_end_of_options(args, style);
-        let result = get_seeked_first(multi_seek_eq(
-            args,
-            vec_string_slice!(possible_flags),
-            style.case_sensitive,
-        ));
-
-        match (end_of_options, result) {
-            (Some(end), Some(current)) if current > end => None,
-            _ => result,
-        }
-    }
-
-    fn on_match_all(
-        args: &[MaskedArg],
-        style: &ParserStyle,
-        arg_info: &PickerArgInfo,
-    ) -> Vec<usize> {
-        let possible_flags = build_possible_flags(style, arg_info);
-        let end_of_options = seek_end_of_options(args, style);
-        let result = multi_seek_eq(
-            args,
-            vec_string_slice!(possible_flags),
-            style.case_sensitive,
-        );
-
-        match end_of_options {
-            Some(end) => result.into_iter().filter(|&idx| idx <= end).collect(),
-            None => result,
-        }
-    }
-}
diff --git a/mingling_picker/src/parselib/flag_matcher.rs b/mingling_picker/src/parselib/flag_matcher.rs
new file mode 100644
index 0000000..af890b9
--- /dev/null
+++ b/mingling_picker/src/parselib/flag_matcher.rs
@@ -0,0 +1,53 @@
+use crate::{
+    matcher_needed::*,
+    parselib::{build_possible_flags, get_seeked_first, multi_seek_eq, seek_end_of_options},
+    vec_string_slice,
+};
+
+/// `FlagMatcher` is used to match flags in command-line arguments.
+///
+/// Flags typically start with `-` or `--` (e.g., `-h`, `--help`),
+/// and do not carry additional values. This matcher is responsible for finding
+/// these flags in the argument list, taking into account that flags after `--`
+/// (end-of-options marker) should not be matched.
+pub struct FlagMatcher;
+
+impl Matcher for FlagMatcher {
+    fn on_match_one(
+        args: &[MaskedArg],
+        style: &ParserStyle,
+        arg_info: &PickerArgInfo,
+    ) -> Option<usize> {
+        let possible_flags = build_possible_flags(style, arg_info);
+        let end_of_options = seek_end_of_options(args, style);
+        let result = get_seeked_first(multi_seek_eq(
+            args,
+            vec_string_slice!(possible_flags),
+            style.case_sensitive,
+        ));
+
+        match (end_of_options, result) {
+            (Some(end), Some(current)) if current > end => None,
+            _ => result,
+        }
+    }
+
+    fn on_match_all(
+        args: &[MaskedArg],
+        style: &ParserStyle,
+        arg_info: &PickerArgInfo,
+    ) -> Vec<usize> {
+        let possible_flags = build_possible_flags(style, arg_info);
+        let end_of_options = seek_end_of_options(args, style);
+        let result = multi_seek_eq(
+            args,
+            vec_string_slice!(possible_flags),
+            style.case_sensitive,
+        );
+
+        match end_of_options {
+            Some(end) => result.into_iter().filter(|&idx| idx <= end).collect(),
+            None => result,
+        }
+    }
+}
-- 
cgit