diff options
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/console/helper')
7 files changed, 42 insertions, 61 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/debug_formatter_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/debug_formatter_helper.rs index d528b4a..030fda4 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/debug_formatter_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/debug_formatter_helper.rs @@ -56,8 +56,8 @@ impl DebugFormatterHelper { format!( "{}<bg=blue;fg=white> {} </> <fg=blue>{}</>\n", self.get_border(id), - prefix.to_string(), - message.to_string(), + prefix, + message, ) } @@ -81,7 +81,7 @@ impl DebugFormatterHelper { message.push_str(&format!( "{}<bg=red;fg=white> {} </> ", self.get_border(id), - error_prefix.to_string(), + error_prefix, )); self.started.get_mut(id).unwrap().err = true; } @@ -91,7 +91,7 @@ impl DebugFormatterHelper { &format!( "\n{}<bg=red;fg=white> {} </> ", self.get_border(id), - error_prefix.to_string(), + error_prefix, ), buffer, )); @@ -104,7 +104,7 @@ impl DebugFormatterHelper { message.push_str(&format!( "{}<bg=green;fg=white> {} </> ", self.get_border(id), - prefix.to_string(), + prefix, )); self.started.get_mut(id).unwrap().out = true; } @@ -114,7 +114,7 @@ impl DebugFormatterHelper { &format!( "\n{}<bg=green;fg=white> {} </> ", self.get_border(id), - prefix.to_string(), + prefix, ), buffer, )); @@ -134,19 +134,19 @@ impl DebugFormatterHelper { if successful { return format!( "{}{}<bg=green;fg=white> {} </> <fg=green>{}</>\n", - trailing_eol.to_string(), + trailing_eol, self.get_border(id), - prefix.to_string(), - message.to_string(), + prefix, + message, ); } let message = format!( "{}{}<bg=red;fg=white> {} </> <fg=red>{}</>\n", - trailing_eol.to_string(), + trailing_eol, self.get_border(id), - prefix.to_string(), - message.to_string(), + prefix, + message, ); if let Some(session) = self.started.get_mut(id) { @@ -158,10 +158,7 @@ impl DebugFormatterHelper { } fn get_border(&self, id: &str) -> String { - format!( - "<bg={}> </>", - COLORS[self.started[id].border as usize].to_string(), - ) + format!("<bg={}> </>", COLORS[self.started[id].border as usize],) } } diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs index 8a6c97f..e1dbd1e 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/formatter_helper.rs @@ -16,13 +16,7 @@ pub struct FormatterHelper { impl FormatterHelper { /// Formats a message within a section. pub fn format_section(&self, section: &str, message: &str, style: &str) -> String { - format!( - "<{}>[{}]</{}> {}", - style.to_string(), - section.to_string(), - style.to_string(), - message.to_string(), - ) + format!("<{}>[{}]</{}> {}", style, section, style, message,) } /// Formats a message as a block of text. @@ -66,12 +60,7 @@ impl FormatterHelper { let mut i = 0; while i < messages.len() { - messages[i] = format!( - "<{}>{}</{}>", - style.to_string(), - messages[i].clone(), - style.to_string(), - ); + messages[i] = format!("<{}>{}</{}>", style, messages[i].clone(), style,); i += 1; } diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs index c59eed0..10fff08 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/process_helper.rs @@ -4,7 +4,6 @@ use crate::symfony::console::helper::debug_formatter_helper::DebugFormatterHelpe use crate::symfony::console::helper::helper::Helper; use crate::symfony::console::helper::helper_interface::HelperInterface; use crate::symfony::console::helper::helper_set::HelperSet; -use crate::symfony::console::output::console_output_interface::ConsoleOutputInterface; use crate::symfony::console::output::output_interface::{self, OutputInterface}; use crate::symfony::process::exception::process_failed_exception::ProcessFailedException; use crate::symfony::process::process::Process; @@ -221,7 +220,8 @@ impl ProcessHelper { &self, output: Rc<RefCell<dyn OutputInterface>>, process: &Process, - mut callback: Option<Box<dyn FnMut(&str, &str)>>, + // TODO: remove allow(unused_mut) once todo!() is resolved. + #[allow(unused_mut)] mut callback: Option<Box<dyn FnMut(&str, &str)>>, ) -> Box<dyn FnMut(&str, &str)> { // PHP: `if ($output instanceof ConsoleOutputInterface) { $output = // $output->getErrorOutput(); }`. Downcasting a shared `dyn diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs b/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs index ab97d2e..aa7e326 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/progress_bar.rs @@ -584,7 +584,7 @@ impl ProgressBar { Box::new( |bar: &ProgressBar, output: &Rc<RefCell<dyn OutputInterface>>| { let complete_bars = bar.get_bar_offset(); - let mut display = shirabe_php_shim::str_repeat( + let display = shirabe_php_shim::str_repeat( &bar.get_bar_character(), complete_bars as usize, ); diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs index 281069e..b6d096a 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/question_helper.rs @@ -19,7 +19,6 @@ use crate::symfony::console::question::ChoiceQuestion; use crate::symfony::console::question::QuestionInterface; use crate::symfony::console::terminal::Terminal; use crate::symfony::string::s; -use shirabe_php_shim::AsAny; use shirabe_php_shim::PhpMixed; use std::cell::RefCell; use std::rc::Rc; @@ -126,10 +125,23 @@ impl QuestionHelper { let autocomplete = question.get_autocompleter_callback(); let ret: PhpMixed; - if autocomplete.is_none() - || !STTY.load(std::sync::atomic::Ordering::SeqCst) - || !Terminal::has_stty_available() + + if let Some(autocomplete) = autocomplete + && STTY.load(std::sync::atomic::Ordering::SeqCst) + && Terminal::has_stty_available() { + let callback = autocomplete; + // The autocompleter callback yields an iterable (Option here); PHP + // treats a null result as an empty list of suggestions. + let callback = move |input: &str| callback(input).unwrap_or_default(); + let autocomplete = + self.autocomplete(Rc::clone(&output), question, &input_stream, &callback); + ret = PhpMixed::String(if question.is_trimmable() { + shirabe_php_shim::trim(&autocomplete, None) + } else { + autocomplete + }); + } else { let mut r: PhpMixed = PhpMixed::Bool(false); if question.is_hidden() { match self.get_hidden_response( @@ -182,18 +194,6 @@ impl QuestionHelper { } } ret = r; - } else { - let callback = autocomplete.unwrap(); - // The autocompleter callback yields an iterable (Option here); PHP - // treats a null result as an empty list of suggestions. - let callback = move |input: &str| callback(input).unwrap_or_default(); - let autocomplete = - self.autocomplete(Rc::clone(&output), question, &input_stream, &callback); - ret = PhpMixed::String(if question.is_trimmable() { - shirabe_php_shim::trim(&autocomplete, None) - } else { - autocomplete - }); } let mut ret = ret; @@ -318,12 +318,12 @@ impl QuestionHelper { ) { let message = if let Some(helper_set) = self.get_helper_set() { let formatter = helper_set.borrow().get_formatter(); - let message = formatter.borrow().format_block( + + formatter.borrow().format_block( FormatBlockMessages::String(error.message.clone()), "error", false, - ); - message + ) } else { format!("<error>{}</error>", error.message) }; @@ -476,7 +476,6 @@ impl QuestionHelper { ) }) .collect(); - num_matches = matches.len() as i64; ofs = -1; } diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs b/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs index ea7a322..a5118f4 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/symfony_question_helper.rs @@ -6,7 +6,6 @@ use crate::symfony::console::output::output_interface; use crate::symfony::console::output::output_interface::OutputInterface; use crate::symfony::console::question::QuestionInterface; use crate::symfony::console::style::symfony_style::SymfonyStyle; -use shirabe_php_shim::AsAny; use shirabe_php_shim::PhpMixed; use std::cell::RefCell; use std::ops::{Deref, DerefMut}; @@ -46,8 +45,7 @@ impl SymfonyQuestionHelper { "yes" } else { "no" - } - .to_string(), + }, ); } else if let Some(choice_question) = question.as_choice().filter(|q| q.is_multiselect()) { let choices = choice_question.get_choices(); diff --git a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs index 59da457..04d5f1f 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs @@ -14,7 +14,6 @@ use crate::symfony::console::helper::table_style::TableStyle; use crate::symfony::console::output::console_section_output::ConsoleSectionOutput; use crate::symfony::console::output::output_interface::OutputInterface; use indexmap::IndexMap; -use shirabe_php_shim::AsAny; use shirabe_php_shim::PhpMixed; use std::cell::RefCell; use std::rc::Rc; @@ -509,8 +508,7 @@ impl Table { /// Renders table to output. pub fn render(&mut self) { - let rows: Vec<Row>; - if self.horizontal { + let rows: Vec<Row> = if self.horizontal { let mut horizontal_rows: IndexMap<i64, Vec<Cell>> = IndexMap::new(); let header0 = self.headers.first().map(|h| h.cells()).unwrap_or_default(); for (i, header) in header0.into_iter().enumerate() { @@ -538,13 +536,13 @@ impl Table { } } } - rows = horizontal_rows.into_values().map(Row::Cells).collect(); + horizontal_rows.into_values().map(Row::Cells).collect() } else { let mut merged = self.headers.clone(); merged.push(Row::HeaderDivider); merged.extend(self.rows.clone()); - rows = merged; - } + merged + }; self.calculate_number_of_columns(&rows); |