diff options
Diffstat (limited to 'crates/shirabe/src/command/completion_trait.rs')
| -rw-r--r-- | crates/shirabe/src/command/completion_trait.rs | 12 |
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); } } |