diff options
Diffstat (limited to 'crates/shirabe-external-packages/src/symfony/console')
4 files changed, 7 insertions, 19 deletions
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 f5242d9a..8ec8d15c 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 @@ -685,7 +685,7 @@ impl QuestionHelper { input_stream: &shirabe_php_shim::PhpResource, trimmable: bool, ) -> anyhow::Result<Result<String, RuntimeException>> { - if std::path::MAIN_SEPARATOR == '\\' { + if cfg!(windows) { let mut exe = format!( "{}/../Resources/bin/hiddeninput.exe", shirabe_php_shim::dir() diff --git a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs index 8ee2f186..8be98a57 100644 --- a/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs +++ b/crates/shirabe-external-packages/src/symfony/console/output/stream_output.rs @@ -98,8 +98,7 @@ impl StreamOutput { return false; } - if std::path::MAIN_SEPARATOR == '\\' && shirabe_php_shim::sapi_windows_vt100_support(stream) - { + if cfg!(windows) && shirabe_php_shim::sapi_windows_vt100_support(stream) { return true; } diff --git a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs index e0994e99..8ae4d885 100644 --- a/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs +++ b/crates/shirabe-external-packages/src/symfony/console/style/symfony_style.rs @@ -56,11 +56,7 @@ impl SymfonyStyle { output: std::rc::Rc<std::cell::RefCell<dyn OutputInterface>>, ) -> Self { let buffered_output = TrimmedBufferOutput::new( - if std::path::MAIN_SEPARATOR == '\\' { - 4 - } else { - 2 - }, + if cfg!(windows) { 4 } else { 2 }, Some(output.borrow().get_verbosity()), false, // TODO(plugin): clone of the formatter; PHP `clone $output->getFormatter()`. @@ -72,10 +68,7 @@ impl SymfonyStyle { let w = Terminal::new().get_width(); if w != 0 { w } else { MAX_LINE_LENGTH } }; - let line_length = std::cmp::min( - width - (std::path::MAIN_SEPARATOR == '\\') as i64, - MAX_LINE_LENGTH, - ); + let line_length = std::cmp::min(width - cfg!(windows) as i64, MAX_LINE_LENGTH); let inner = OutputStyle::new(output.clone()); @@ -279,7 +272,7 @@ impl SymfonyStyle { pub fn create_progress_bar(&self, max: i64) -> ProgressBar { let mut progress_bar = self.inner.create_progress_bar(max); - if std::path::MAIN_SEPARATOR != '\\' + if !cfg!(windows) || shirabe_php_shim::getenv("TERM_PROGRAM").as_deref() == Some(std::ffi::OsStr::new("Hyper")) { diff --git a/crates/shirabe-external-packages/src/symfony/console/terminal.rs b/crates/shirabe-external-packages/src/symfony/console/terminal.rs index 353dffcb..9af712ad 100644 --- a/crates/shirabe-external-packages/src/symfony/console/terminal.rs +++ b/crates/shirabe-external-packages/src/symfony/console/terminal.rs @@ -69,11 +69,7 @@ impl Terminal { let result = shirabe_php_shim::shell_exec(&format!( "stty 2> {}", - if std::path::MAIN_SEPARATOR == '\\' { - "NUL" - } else { - "/dev/null" - } + if cfg!(windows) { "NUL" } else { "/dev/null" } )) .is_some(); STTY.with(|s| s.set(Some(result))); @@ -81,7 +77,7 @@ impl Terminal { } fn init_dimensions() { - if std::path::MAIN_SEPARATOR == '\\' { + if cfg!(windows) { let ansicon = shirabe_php_shim::getenv("ANSICON"); let mut matches: Vec<Option<String>> = Vec::new(); if let Some(ansicon) = &ansicon |