diff options
| -rw-r--r-- | crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_interface.rs | 2 | ||||
| -rw-r--r-- | crates/shirabe-external-packages/src/symfony/console/helper/table.rs | 27 |
2 files changed, 23 insertions, 6 deletions
diff --git a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_interface.rs b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_interface.rs index 41c84dab..a436ad8c 100644 --- a/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_interface.rs +++ b/crates/shirabe-external-packages/src/symfony/console/formatter/output_formatter_interface.rs @@ -3,7 +3,7 @@ use crate::symfony::console::formatter::output_formatter_style_interface::OutputFormatterStyleInterface; /// Formatter interface for console output. -pub trait OutputFormatterInterface { +pub trait OutputFormatterInterface: shirabe_php_shim::AsAny { /// Sets the decorated flag. fn set_decorated(&mut self, decorated: bool); 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 ca0802d0..99c1b6ea 100644 --- a/crates/shirabe-external-packages/src/symfony/console/helper/table.rs +++ b/crates/shirabe-external-packages/src/symfony/console/helper/table.rs @@ -4,6 +4,7 @@ use crate::composer::pcre::preg::Preg; use crate::symfony::console::exception::invalid_argument_exception::InvalidArgumentException; use crate::symfony::console::exception::runtime_exception::RuntimeException; use crate::symfony::console::formatter::output_formatter::OutputFormatter; +use crate::symfony::console::formatter::wrappable_output_formatter_interface::WrappableOutputFormatterInterface; use crate::symfony::console::helper::helper::Helper; use crate::symfony::console::helper::table_cell::{TableCell, TableCellOption}; use crate::symfony::console::helper::table_cell_style::TableCellStyle; @@ -924,11 +925,11 @@ impl Table { && Helper::width(&self.remove_decoration(&cell.to_php_string())) > self.column_max_widths[&column] { - // TODO(phase-b): formatAndWrap requires a WrappableOutputFormatterInterface; - // downcasting dyn OutputFormatterInterface to it needs concrete knowledge. - let _ = colspan; - let wrapped: Option<String> = todo!(); - cell = Cell::Value(wrapped.unwrap_or_default()); + let wrapped = self.format_and_wrap( + &cell.to_php_string(), + self.column_max_widths[&column] * colspan, + ); + cell = Cell::Value(wrapped); } let cell_str = cell.to_php_string(); if shirabe_php_shim::strstr(&cell_str, "\n").is_none() { @@ -1389,6 +1390,22 @@ impl Table { true } + /// `setColumnMaxWidth` guarantees the formatter is a `WrappableOutputFormatterInterface`, and + /// `OutputFormatter` is the sole implementor in this port, so `instanceof` reduces to this + /// downcast. + fn format_and_wrap(&self, string: &str, width: i64) -> String { + let formatter = self.output.borrow().get_formatter(); + let mut formatter = formatter.borrow_mut(); + let formatter = formatter + .as_any_mut() + .downcast_mut::<OutputFormatter>() + .expect("formatter must be a WrappableOutputFormatterInterface"); + formatter + .format_and_wrap(Some(string), width) + .unwrap() + .unwrap_or_default() + } + /// PHP `Helper::removeDecoration($this->output->getFormatter(), $string)`. fn remove_decoration(&self, string: &str) -> String { let formatter = self.output.borrow().get_formatter(); |