Only trim prompt (#876)

* Only trim the output for prompts

* Only remove the last newline

crates/nu-command/src/filesystem/open.rs

@@ -124,7 +124,6 @@ impl Command for Open {
                 RawStream::new(
                     Box::new(BufferedReader { input: buf_reader }),
                     ctrlc,
-                    false,
                     call_span,
                 ),
                 call_span,

crates/nu-command/src/network/fetch.rs

@@ -362,7 +362,6 @@ fn response_to_buffer(
                 input: buffered_input,
             }),
             engine_state.ctrlc.clone(),
-            false,
             span,
         ),
         span,

crates/nu-command/src/system/run_external.rs

@@ -243,7 +243,7 @@ impl ExternalCommand {
                 let receiver = ChannelReceiver::new(rx);
 
                 Ok(PipelineData::RawStream(
-                    RawStream::new(Box::new(receiver), output_ctrlc, true, head),
+                    RawStream::new(Box::new(receiver), output_ctrlc, head),
                     head,
                     None,
                 ))

crates/nu-command/src/viewers/table.rs

@@ -72,7 +72,6 @@ impl Command for Table {
                         .into_iter(),
                     ),
                     ctrlc,
-                    false,
                     head,
                 ),
                 head,
@@ -189,7 +188,6 @@ impl Command for Table {
                             stream,
                         }),
                         ctrlc,
-                        false,
                         head,
                     ),
                     head,

crates/nu-protocol/src/pipeline_data.rs

@@ -150,8 +150,6 @@ impl PipelineData {
             PipelineData::RawStream(s, ..) => {
                 let mut items = vec![];
 
-                let trim_end = s.trim_end;
-
                 for val in s {
                     match val {
                         Ok(val) => {
@@ -173,10 +171,6 @@ impl PipelineData {
                     }
                 }
 
-                if trim_end {
-                    output = output.trim_end().to_string();
-                }
-
                 Ok(output)
             }
         }

crates/nu-protocol/src/value/stream.rs

@@ -12,7 +12,6 @@ pub struct RawStream {
     pub leftover: Vec<u8>,
     pub ctrlc: Option<Arc<AtomicBool>>,
     pub is_binary: bool,
-    pub trim_end: bool,
     pub span: Span,
 }
 
@@ -20,7 +19,6 @@ impl RawStream {
     pub fn new(
         stream: Box<dyn Iterator<Item = Result<Vec<u8>, ShellError>> + Send + 'static>,
         ctrlc: Option<Arc<AtomicBool>>,
-        trim_end: bool,
         span: Span,
     ) -> Self {
         Self {
@@ -28,7 +26,6 @@ impl RawStream {
             leftover: vec![],
             ctrlc,
             is_binary: false,
-            trim_end,
             span,
         }
     }
@@ -46,16 +43,10 @@ impl RawStream {
     pub fn into_string(self) -> Result<String, ShellError> {
         let mut output = String::new();
 
-        let trim_end = self.trim_end;
-
         for item in self {
             output.push_str(&item?.as_string()?);
         }
 
-        if trim_end {
-            output = output.trim_end().to_string();
-        }
-
         Ok(output)
     }
 }

src/main.rs

@@ -123,7 +123,6 @@ fn main() -> Result<()> {
                     RawStream::new(
                         Box::new(BufferedReader::new(buf_reader)),
                         Some(ctrlc),
-                        true,
                         redirect_stdin.span,
                     ),
                     redirect_stdin.span,

src/prompt_update.rs

@@ -59,6 +59,7 @@ fn get_prompt_string(
         .and_then(|v| match v {
             Value::Block { val: block_id, .. } => {
                 let block = engine_state.get_block(block_id);
+                // Use eval_subexpression to force a redirection of output, so we can use everything in prompt
                 eval_subexpression(
                     engine_state,
                     stack,
@@ -70,6 +71,7 @@ fn get_prompt_string(
             Value::String { val: source, .. } => {
                 let mut working_set = StateWorkingSet::new(engine_state);
                 let (block, _) = parse(&mut working_set, None, source.as_bytes(), true);
+                // Use eval_subexpression to force a redirection of output, so we can use everything in prompt
                 eval_subexpression(
                     engine_state,
                     stack,
@@ -80,7 +82,24 @@ fn get_prompt_string(
             }
             _ => None,
         })
-        .and_then(|pipeline_data| pipeline_data.collect_string("", config).ok())
+        .and_then(|pipeline_data| {
+            let output = pipeline_data.collect_string("", config).ok();
+
+            match output {
+                Some(mut x) => {
+                    // Just remove the very last newline.
+                    if x.ends_with('\n') {
+                        x.pop();
+                    }
+
+                    if x.ends_with('\r') {
+                        x.pop();
+                    }
+                    Some(x)
+                }
+                None => None,
+            }
+        })
 }
 
 pub(crate) fn update_prompt<'prompt>(