diff options
Diffstat (limited to 'crates/shirabe-external-packages/src')
6 files changed, 23 insertions, 43 deletions
diff --git a/crates/shirabe-external-packages/src/composer/pcre/preg.rs b/crates/shirabe-external-packages/src/composer/pcre/preg.rs index f72835d..d35a3aa 100644 --- a/crates/shirabe-external-packages/src/composer/pcre/preg.rs +++ b/crates/shirabe-external-packages/src/composer/pcre/preg.rs @@ -44,8 +44,7 @@ impl Preg { Some(&mut internal), flags | PREG_UNMATCHED_AS_NULL, offset, - ) - .unwrap_or_else(|| invalid_regex()); + ); if let Some(out) = matches { *out = drop_null_matches(internal); @@ -83,8 +82,7 @@ impl Preg { Some(&mut internal), flags | PREG_UNMATCHED_AS_NULL, offset, - ) - .unwrap_or_else(|| invalid_regex()); + ); if let Some(out) = matches { *out = null_to_empty_match_all(internal); @@ -109,8 +107,7 @@ impl Preg { Some(&mut internal), flags | PREG_UNMATCHED_AS_NULL | PREG_OFFSET_CAPTURE, offset, - ) - .unwrap_or_else(|| invalid_regex()); + ); if let Some(out) = matches { *out = null_to_empty_offset_match_all(internal); @@ -148,7 +145,6 @@ impl Preg { // guards (ARRAY_MSG / INVALID_TYPE_MSG) of the PHP original are // unreachable and not reproduced. shirabe_php_shim::preg_replace2(pattern, replacement, subject, limit, count) - .unwrap_or_else(|| invalid_regex()) } pub fn replace_callback<F: FnMut(&IndexMap<CaptureKey, String>) -> String>( @@ -172,7 +168,6 @@ impl Preg { }; shirabe_php_shim::preg_replace_callback2(pattern, adapter, subject, limit, count, flags) - .unwrap_or_else(|| invalid_regex()) } pub fn split(pattern: &str, subject: &str) -> Vec<String> { @@ -186,7 +181,6 @@ impl Preg { ); shirabe_php_shim::preg_split2(pattern, subject, limit, flags) - .unwrap_or_else(|| invalid_regex()) } pub fn grep(pattern: &str, array: &[&str]) -> Vec<String> { @@ -194,7 +188,7 @@ impl Preg { } pub fn grep3(pattern: &str, array: &[&str], flags: i64) -> Vec<String> { - shirabe_php_shim::preg_grep2(pattern, array, flags).unwrap_or_else(|| invalid_regex()) + shirabe_php_shim::preg_grep2(pattern, array, flags) } pub fn is_match(pattern: &str, subject: &str) -> bool { @@ -231,8 +225,7 @@ impl Preg { Some(&mut internal), PREG_UNMATCHED_AS_NULL, 0, - ) - .unwrap_or_else(|| invalid_regex()); + ); matches.clear(); for (key, value) in internal { @@ -248,8 +241,7 @@ impl Preg { // Classic preg_match semantics (no PREG_UNMATCHED_AS_NULL): trailing // unmatched groups are truncated, interior unmatched groups become "". let mut internal: IndexMap<CaptureKey, Option<String>> = IndexMap::new(); - let result = shirabe_php_shim::preg_match2(pattern, subject, Some(&mut internal), 0, 0) - .unwrap_or_else(|| invalid_regex()); + let result = shirabe_php_shim::preg_match2(pattern, subject, Some(&mut internal), 0, 0); if result == 0 { return None; @@ -363,9 +355,3 @@ fn null_to_empty_offset_match_all( }) .collect() } - -/// Panics if a pattern is invalid instead of throwing a PcreException. -/// TODO: takes regex::Error and shows its message -fn invalid_regex() -> ! { - panic!("invalid regex"); -} diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs index 0de90be..6736ada 100644 --- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs +++ b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter.rs @@ -19,8 +19,7 @@ pub struct OutputFormatter { impl OutputFormatter { /// Escapes "<" and ">" special chars in given text. pub fn escape(text: &str) -> anyhow::Result<String> { - let text = shirabe_php_shim::preg_replace("/([^\\\\]|^)([<>])/", "$1\\\\$2", text) - .expect("preg_replace failed"); + let text = shirabe_php_shim::preg_replace("/([^\\\\]|^)([<>])/", "$1\\\\$2", text); Ok(Self::escape_trailing_backslash(&text)) } @@ -106,7 +105,7 @@ impl OutputFormatter { "/([^=]+)=([^;]+)(;|$)/", string, &mut matches, - )? == 0 + ) == 0 { return Ok(None); } @@ -122,8 +121,7 @@ impl OutputFormatter { } else if r#match[0] == "bg" { style.set_background(Some(&shirabe_php_shim::strtolower(&r#match[1]))); } else if r#match[0] == "href" { - let url = shirabe_php_shim::preg_replace("{\\\\([<>])}", "$1", &r#match[1]) - .expect("preg_replace failed"); + let url = shirabe_php_shim::preg_replace("{\\\\([<>])}", "$1", &r#match[1]); style.set_href(&url); } else if r#match[0] == "options" { let mut options = shirabe_php_shim::preg_match_all( @@ -292,7 +290,7 @@ impl WrappableOutputFormatterInterface for OutputFormatter { &format!("#<(({open_tag_regex}) | /({close_tag_regex})?)>#ix"), message, &mut matches, - )?; + ); let count = matches.group(0).len(); for i in 0..count { let (text, pos) = matches.group(0)[i].clone(); diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs index 40a8f85..07b1f77 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/helper.rs @@ -147,12 +147,10 @@ impl Helper { // remove <...> formatting let string = formatter.format(Some(string)).unwrap().unwrap_or_default(); // remove already formatted characters - let string = - shirabe_php_shim::preg_replace("/\u{1b}\\[[^m]*m/", "", &string).unwrap_or_default(); + let string = shirabe_php_shim::preg_replace("/\u{1b}\\[[^m]*m/", "", &string); // remove terminal hyperlinks let string = - shirabe_php_shim::preg_replace("/\u{1b}]8;[^;]*;[^\u{1b}]*\u{1b}\\\\/", "", &string) - .unwrap_or_default(); + shirabe_php_shim::preg_replace("/\u{1b}]8;[^;]*;[^\u{1b}]*\u{1b}\\\\/", "", &string); formatter.set_decorated(is_decorated); string diff --git a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs index ea36e26..2b1102c 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/argv_input.rs @@ -528,8 +528,13 @@ impl ArgvInput { .tokens .iter() .map(|token| { - if let Some(m) = shirabe_php_shim::preg_match_groups("{^(-[^=]+=)(.+)}", token) { - return format!("{}{}", m[1], self.inner.escape_token(&m[2])); + let mut r#match: Vec<Option<String>> = Vec::new(); + if shirabe_php_shim::preg_match("{^(-[^=]+=)(.+)}", token, &mut r#match) != 0 { + return format!( + "{}{}", + r#match[1].as_deref().unwrap_or(""), + self.inner.escape_token(r#match[2].as_deref().unwrap_or("")) + ); } if !token.is_empty() && token.as_bytes()[0] != b'-' { diff --git a/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs b/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs index 7e2d086..5ef265e 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/input_option.rs @@ -110,7 +110,7 @@ impl InputOption { fn normalize_shortcut(s: String) -> anyhow::Result<Option<String>> { let stripped = shirabe_php_shim::ltrim(&s, Some("-")); - let parts = shirabe_php_shim::preg_split(r"\|(-?)", &stripped).unwrap_or_default(); + let parts = shirabe_php_shim::preg_split(r"\|(-?)", &stripped); let filtered: Vec<String> = shirabe_php_shim::array_filter(&parts, |s: &String| !s.is_empty()); let result = shirabe_php_shim::implode("|", &filtered); diff --git a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs index 952a18e..f57fcf6 100644 --- a/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs +++ b/crates/shirabe-external-packages/src/symfony/console/input/string_input.rs @@ -56,7 +56,6 @@ impl StringInput { let mut m: IndexMap<CaptureKey, Option<String>> = IndexMap::new(); if shirabe_php_shim::preg_match2(r"/\s+/A", input, Some(&mut m), 0, cursor as usize) - .expect("invalid regex") == 1 { if token.is_some() { @@ -70,9 +69,7 @@ impl StringInput { Some(&mut m), 0, cursor as usize, - ) - .expect("invalid regex") - == 1 + ) == 1 { let inner = shirabe_php_shim::substr( m[&CaptureKey::ByIndex(3)].as_deref().unwrap_or(""), @@ -96,9 +93,7 @@ impl StringInput { Some(&mut m), 0, cursor as usize, - ) - .expect("invalid regex") - == 1 + ) == 1 { token = Some(format!( "{}{}", @@ -117,9 +112,7 @@ impl StringInput { Some(&mut m), 0, cursor as usize, - ) - .expect("invalid regex") - == 1 + ) == 1 { token = Some(format!( "{}{}", |