aboutsummaryrefslogtreecommitdiffhomepage
path: root/crates/shirabe/src/command/completion_trait.rs
diff options
context:
space:
mode:
authornsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
committernsfisis <nsfisis@gmail.com>2026-08-18 01:57:02 +0900
commit530d085d4f3e19f94ac3cf8f8ac3b17000214b2e (patch)
treeb4de2c2443e2bb2cfc692454ac284dc1d2313e59 /crates/shirabe/src/command/completion_trait.rs
parent0caac63bacefb9a1f62848636d47fca07f592bba (diff)
downloadphp-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.gz
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.tar.zst
php-shirabe-530d085d4f3e19f94ac3cf8f8ac3b17000214b2e.zip
refactor(pcre): inline Preg into its call sites and drop the crate
Preg had shed everything it owned: after the last few rounds its methods were one-line forwards to the shim's preg_*(), differing only in a default argument or a wrapper the caller unwrapped anyway. The 460 call sites now name the shim function, and shirabe-pcre is gone from the workspace along with its LICENSE entry. The forwards expand as they read: isMatch becomes preg_match2(.., 0).is_some() (is_none() where PHP negates it), isMatch3 and match3 drop the .is_some(), matchAll counts through preg_match_all2(..).occurrence_count(), and replace4/replace5 spell out the limit and count arguments preg_replace2 takes. Callbacks are the one place the shapes differ: preg_replace_callback carries an error out of the callback, so the fourteen infallible closures wrap their result in Ok() and expect() it back. Config::process() is the fifteenth, and it drops the `error` cell it captured to smuggle a failure past a closure that could only return a String. The `?` in the closure now carries it, which is what the PHP does -- a throw from the callback leaves preg_replace_callback at the failing match rather than running the remaining replacements and reporting the last error. The module doc that explained why composer/pcre's exceptions and *StrictGroups() variants have no counterpart moves to the shim's preg module, where the functions it describes live. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Diffstat (limited to 'crates/shirabe/src/command/completion_trait.rs')
-rw-r--r--crates/shirabe/src/command/completion_trait.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/crates/shirabe/src/command/completion_trait.rs b/crates/shirabe/src/command/completion_trait.rs
index 491c5d07..ce0aef58 100644
--- a/crates/shirabe/src/command/completion_trait.rs
+++ b/crates/shirabe/src/command/completion_trait.rs
@@ -11,8 +11,7 @@ use crate::repository::RepositoryInterfaceHandle;
use crate::repository::RootPackageRepository;
use crate::repository::repository_interface::{SEARCH_NAME, SEARCH_VENDOR, SearchResult};
use indexmap::IndexMap;
-use shirabe_pcre::Preg;
-use shirabe_php_shim::{PhpMixed, php_regex, preg_quote};
+use shirabe_php_shim::{PhpMixed, php_regex, preg_match2, preg_quote};
/// Adds completion to arguments and options.
///
@@ -257,10 +256,13 @@ pub trait CompletionTrait: BaseCommand {
/// platform packages from the ones available on the currently-running PHP
fn suggest_available_package_incl_platform(&self) -> SuggestedValues {
SuggestedValues::Closure(Box::new(|this, input, suggestions| {
- let matches = if Preg::is_match(
+ let matches = if preg_match2(
php_regex!(r"{^(ext|lib|php)(-|$)|^com}"),
&input.get_completion_value(),
- ) {
+ 0,
+ )
+ .is_some()
+ {
this.suggest_platform_package()
.call(this, input, suggestions)?
} else {
@@ -295,7 +297,7 @@ pub trait CompletionTrait: BaseCommand {
let mut names: Vec<String> = vec![];
for package in repos.get_packages()? {
let name = package.get_name();
- if Preg::is_match(pattern.clone(), &name) {
+ if preg_match2(pattern.clone(), &name, 0).is_some() {
names.push(name);
}
}