From 52a0665acbbe5bf5b8c6875118fb9cdf7952453b Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Mon, 17 Aug 2026 06:43:52 +0900
Subject: refactor(preg): wrap the preg_* $matches maps in newtypes

The five IndexMap shapes that the preg_* functions and Preg fill in are
now distinct types generated by preg_match_map!, so a matches map no
longer interchanges with any other map of the same key and value type.

Index<usize> is kept alongside Index<&Q> because call sites such as
config_command and event_dispatcher reach for a group by its position in
the map rather than by its capture key.
---
 crates/shirabe-symfony-console/src/formatter/output_formatter.rs | 7 +++----
 crates/shirabe-symfony-console/src/helper/progress_bar.rs        | 4 ++--
 crates/shirabe-symfony-console/src/input/string_input.rs         | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'crates/shirabe-symfony-console/src')

diff --git a/crates/shirabe-symfony-console/src/formatter/output_formatter.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter.rs
index 1a3de217..de030e96 100644
--- a/crates/shirabe-symfony-console/src/formatter/output_formatter.rs
+++ b/crates/shirabe-symfony-console/src/formatter/output_formatter.rs
@@ -7,8 +7,8 @@ use crate::formatter::output_formatter_style_interface::OutputFormatterStyleInte
 use crate::formatter::output_formatter_style_stack::OutputFormatterStyleStack;
 use crate::formatter::wrappable_output_formatter_interface::WrappableOutputFormatterInterface;
 use shirabe_php_shim::{
-    CaptureKey, php_regex, preg_match, preg_match_all, preg_match_all_offset_capture,
-    preg_match_all_set_order, preg_replace,
+    CaptureKey, PregMatchesAllWithOffsets, php_regex, preg_match, preg_match_all,
+    preg_match_all_offset_capture, preg_match_all_set_order, preg_replace,
 };
 use shirabe_symfony_string::b;
 
@@ -290,8 +290,7 @@ impl WrappableOutputFormatterInterface for OutputFormatter {
         let open_tag_regex = "[a-z](?:[^\\\\<>]* | \\\\.)*";
         let close_tag_regex = "[a-z][^<>]*";
         let mut current_line_length: i64 = 0;
-        let mut matches: indexmap::IndexMap<CaptureKey, Vec<(Option<String>, i64)>> =
-            indexmap::IndexMap::new();
+        let mut matches = PregMatchesAllWithOffsets::new();
         preg_match_all_offset_capture(
             format!("#<(({open_tag_regex}) | /({close_tag_regex})?)>#ix"),
             message,
diff --git a/crates/shirabe-symfony-console/src/helper/progress_bar.rs b/crates/shirabe-symfony-console/src/helper/progress_bar.rs
index 1158c507..4764d617 100644
--- a/crates/shirabe-symfony-console/src/helper/progress_bar.rs
+++ b/crates/shirabe-symfony-console/src/helper/progress_bar.rs
@@ -9,7 +9,7 @@ use crate::output::OutputInterface;
 use crate::output::output_interface;
 use crate::terminal::Terminal;
 use indexmap::IndexMap;
-use shirabe_php_shim::{CaptureKey, preg_replace_callback};
+use shirabe_php_shim::{CaptureKey, PregMatches, preg_replace_callback};
 
 pub const FORMAT_VERBOSE: &str = "verbose";
 pub const FORMAT_VERY_VERBOSE: &str = "very_verbose";
@@ -798,7 +798,7 @@ impl ProgressBar {
         let format = self.format.clone().unwrap_or_default();
 
         // $callback in PHP, expressed as a closure over $this and the matches.
-        let callback = |matches: &IndexMap<CaptureKey, Option<String>>| -> anyhow::Result<String> {
+        let callback = |matches: &PregMatches| -> anyhow::Result<String> {
             let name = matches[&CaptureKey::ByIndex(1)].clone().unwrap_or_default();
 
             let text: shirabe_php_shim::PhpMixed =
diff --git a/crates/shirabe-symfony-console/src/input/string_input.rs b/crates/shirabe-symfony-console/src/input/string_input.rs
index d6794957..245b948d 100644
--- a/crates/shirabe-symfony-console/src/input/string_input.rs
+++ b/crates/shirabe-symfony-console/src/input/string_input.rs
@@ -6,7 +6,7 @@ use crate::input::InputDefinition;
 use crate::input::InputInterface;
 use crate::input::StreamableInputInterface;
 use indexmap::IndexMap;
-use shirabe_php_shim::{CaptureKey, PhpMixed, php_regex, preg_match2};
+use shirabe_php_shim::{CaptureKey, PhpMixed, PregMatches, php_regex, preg_match2};
 
 /// StringInput represents an input provided as a string.
 ///
@@ -57,7 +57,7 @@ impl StringInput {
                 continue;
             }
 
-            let mut m: IndexMap<CaptureKey, Option<String>> = IndexMap::new();
+            let mut m = PregMatches::new();
             if preg_match2(php_regex!(r"/\s+/A"), input, &mut m, cursor as usize) {
                 if token.is_some() {
                     tokens.push(token.take().unwrap());
-- 
cgit v1.3.1-4-g156e