From 59f7c523fac538a433ee80ebdbd8a1f410590082 Mon Sep 17 00:00:00 2001
From: Devyn Cairns <devyn.cairns@gmail.com>
Date: Fri, 17 May 2024 07:18:18 -0700
Subject: [PATCH] Fix the way the output of `table` is printed in `print()`
 (#12895)

# Description

Forgot that I fixed this already on my branch, but when printing without
a display output hook, the implicit call to `table` gets its output
mangled with newlines (since #12774). This happens when running `nu -c`
or a script file.

Here's that fix in one PR so it can be merged easily.

# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
---
 .../nu-protocol/src/pipeline/pipeline_data.rs | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/crates/nu-protocol/src/pipeline/pipeline_data.rs b/crates/nu-protocol/src/pipeline/pipeline_data.rs
index d7e58e63a3..b2883b1673 100644
--- a/crates/nu-protocol/src/pipeline/pipeline_data.rs
+++ b/crates/nu-protocol/src/pipeline/pipeline_data.rs
@@ -543,16 +543,15 @@ impl PipelineData {
             if let Some(decl_id) = engine_state.table_decl_id {
                 let command = engine_state.get_decl(decl_id);
                 if command.get_block_id().is_some() {
-                    self.write_all_and_flush(engine_state, no_newline, to_stderr)?;
+                    self.write_all_and_flush(engine_state, no_newline, to_stderr)
                 } else {
                     let call = Call::new(Span::new(0, 0));
                     let table = command.run(engine_state, stack, &call, self)?;
-                    table.write_all_and_flush(engine_state, no_newline, to_stderr)?;
+                    table.write_all_and_flush(engine_state, no_newline, to_stderr)
                 }
             } else {
-                self.write_all_and_flush(engine_state, no_newline, to_stderr)?;
+                self.write_all_and_flush(engine_state, no_newline, to_stderr)
             }
-            Ok(None)
         }
     }
 
@@ -561,27 +560,32 @@ impl PipelineData {
         engine_state: &EngineState,
         no_newline: bool,
         to_stderr: bool,
-    ) -> Result<(), ShellError> {
-        let config = engine_state.get_config();
-        for item in self {
-            let mut out = if let Value::Error { error, .. } = item {
-                return Err(*error);
-            } else {
-                item.to_expanded_string("\n", config)
-            };
+    ) -> Result<Option<ExitStatus>, ShellError> {
+        if let PipelineData::ByteStream(stream, ..) = self {
+            // Copy ByteStreams directly
+            stream.print(to_stderr)
+        } else {
+            let config = engine_state.get_config();
+            for item in self {
+                let mut out = if let Value::Error { error, .. } = item {
+                    return Err(*error);
+                } else {
+                    item.to_expanded_string("\n", config)
+                };
 
-            if !no_newline {
-                out.push('\n');
+                if !no_newline {
+                    out.push('\n');
+                }
+
+                if to_stderr {
+                    stderr_write_all_and_flush(out)?
+                } else {
+                    stdout_write_all_and_flush(out)?
+                }
             }
 
-            if to_stderr {
-                stderr_write_all_and_flush(out)?
-            } else {
-                stdout_write_all_and_flush(out)?
-            }
+            Ok(None)
         }
-
-        Ok(())
     }
 }