diff options
Diffstat (limited to 'crates/shirabe-symfony-console/src')
| -rw-r--r-- | crates/shirabe-symfony-console/src/completion/completion_input.rs | 6 | ||||
| -rw-r--r-- | crates/shirabe-symfony-console/src/formatter/output_formatter.rs | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/crates/shirabe-symfony-console/src/completion/completion_input.rs b/crates/shirabe-symfony-console/src/completion/completion_input.rs index aafa7c8a..41c15ec5 100644 --- a/crates/shirabe-symfony-console/src/completion/completion_input.rs +++ b/crates/shirabe-symfony-console/src/completion/completion_input.rs @@ -3,7 +3,7 @@ use crate::input::ArgvInput; use crate::input::InputDefinition; use crate::input::InputOption; -use shirabe_php_shim::{PhpMixed, php_regex, preg_match_all}; +use shirabe_php_shim::{CaptureKey, PhpMixed, php_regex, preg_match_all}; /// An input specialized for shell completion. /// @@ -35,7 +35,9 @@ impl CompletionInput { ); Self::from_tokens( - tokens[0] + tokens + .get(&CaptureKey::ByIndex(0)) + .expect("group 0 is always present") .iter() .map(|token| { token diff --git a/crates/shirabe-symfony-console/src/formatter/output_formatter.rs b/crates/shirabe-symfony-console/src/formatter/output_formatter.rs index 256fade1..f4c55573 100644 --- a/crates/shirabe-symfony-console/src/formatter/output_formatter.rs +++ b/crates/shirabe-symfony-console/src/formatter/output_formatter.rs @@ -135,12 +135,14 @@ impl OutputFormatter { let url = preg_replace(php_regex!("{\\\\([<>])}"), "$1", &r#match[1]); style.set_href(&url); } else if r#match[0] == "options" { - let mut options = preg_match_all( + let options = preg_match_all( php_regex!("([^,;]+)"), &shirabe_php_shim::strtolower(&r#match[1]), ); - let options = shirabe_php_shim::array_shift(&mut options).unwrap_or_default(); - for option in &options { + let options = options + .get(&CaptureKey::ByIndex(0)) + .expect("group 0 is always present"); + for option in options { style.set_option( option .as_deref() |