From c839244d8d09f3036ebfee8eef7eb6b147e593ab Mon Sep 17 00:00:00 2001 From: nsfisis Date: Tue, 19 May 2026 00:10:22 +0900 Subject: fix(compile): fix various compile errors Co-Authored-By: Claude Sonnet 4.6 --- crates/shirabe/src/console/input/input_option.rs | 81 ++++-------------------- 1 file changed, 11 insertions(+), 70 deletions(-) (limited to 'crates/shirabe/src/console/input/input_option.rs') diff --git a/crates/shirabe/src/console/input/input_option.rs b/crates/shirabe/src/console/input/input_option.rs index 6e93a62..0c0745e 100644 --- a/crates/shirabe/src/console/input/input_option.rs +++ b/crates/shirabe/src/console/input/input_option.rs @@ -1,91 +1,32 @@ //! ref: composer/src/Composer/Console/Input/InputOption.php use anyhow::Result; -use shirabe_external_packages::symfony::console::completion::completion_input::CompletionInput; -use shirabe_external_packages::symfony::console::completion::completion_suggestions::CompletionSuggestions; -use shirabe_external_packages::symfony::console::completion::suggestion::Suggestion; use shirabe_external_packages::symfony::console::input::input_option::InputOption as BaseInputOption; -use shirabe_php_shim::LogicException; use shirabe_php_shim::PhpMixed; -pub enum SuggestedValues { - List(Vec), - Closure(Box Vec>), -} - -impl std::fmt::Debug for SuggestedValues { - fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - match self { - SuggestedValues::List(list) => write!(f, "SuggestedValues::List({:?})", list), - SuggestedValues::Closure(_) => write!(f, "SuggestedValues::Closure()"), - } - } -} - -pub enum StringOrSuggestion { - Str(String), - Suggestion(Suggestion), -} - #[derive(Debug)] pub struct InputOption { inner: BaseInputOption, - suggested_values: SuggestedValues, } impl InputOption { + pub const VALUE_NONE: i64 = 1; + pub const VALUE_REQUIRED: i64 = 2; + pub const VALUE_OPTIONAL: i64 = 4; + pub const VALUE_IS_ARRAY: i64 = 8; + pub const VALUE_NEGATABLE: i64 = 16; + pub fn new( name: &str, shortcut: Option, mode: Option, description: &str, default: Option, - suggested_values: SuggestedValues, + // TODO(cli-completion): suggested_values closure / list dropped along with completion support ) -> Result { - let inner = BaseInputOption::new(name, shortcut, mode, description, default)?; - let this = Self { - inner, - suggested_values, - }; - - if let SuggestedValues::List(ref list) = this.suggested_values { - if !list.is_empty() && !this.inner.accept_value() { - return Err(LogicException { - message: "Cannot set suggested values if the option does not accept a value." - .to_string(), - code: 0, - } - .into()); - } - } else if let SuggestedValues::Closure(_) = this.suggested_values { - if !this.inner.accept_value() { - return Err(LogicException { - message: "Cannot set suggested values if the option does not accept a value." - .to_string(), - code: 0, - } - .into()); - } - } - - Ok(this) - } - - pub fn complete( - &self, - input: &CompletionInput, - suggestions: &mut CompletionSuggestions, - ) -> Result<()> { - let values: Vec = match &self.suggested_values { - SuggestedValues::List(list) => list - .iter() - .map(|s| StringOrSuggestion::Str(s.clone())) - .collect(), - SuggestedValues::Closure(closure) => closure(input, suggestions), - }; - if !values.is_empty() { - suggestions.suggest_values(values); - } - Ok(()) + let shortcut_str = shortcut.as_ref().and_then(|s| s.as_string()); + let default_mixed = default.unwrap_or(PhpMixed::Null); + let inner = BaseInputOption::new(name, shortcut_str, mode, description, default_mixed); + Ok(Self { inner }) } } -- cgit v1.3.1