holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix piping output logic (#11317)

Browse Source 
# Description
Fixes: #11295

Sorry for introducing such issue.
The issue is caused by we wrongly set `redirect_stdout` and
`redirect_stderr` during eval, take the following as example:
```nushell
ls | bat --paging always
```
When running `bat --paging always`, `redirect_stdout` should be `false`.
But before this pr, it's set to true due to `ls` command, and then the
`true` value will go to all remaining commands.

# User-Facing Changes
NaN

# Tests + Formatting
Sorry I don't think we have a way to test it. Because it needs to be
tested on interactive command like `nvim`.

# After Submitting
NaN
This commit is contained in:
WindSoilder 2023-12-14 03:16:23 +08:00 committed by GitHub
parent c9841f67e9
commit 23fec8eb0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/nu-engine/src/eval.rs
View File

@ -603,8 +603,8 @@ pub fn eval_block(
stack: &mut Stack, stack: &mut Stack,
block: &Block, block: &Block,
mut input: PipelineData, mut input: PipelineData,
mut redirect_stdout: bool, redirect_stdout: bool,
mut redirect_stderr: bool, redirect_stderr: bool,
) -> Result<PipelineData, ShellError> { ) -> Result<PipelineData, ShellError> {
// if Block contains recursion, make sure we don't recurse too deeply (to avoid stack overflow) // if Block contains recursion, make sure we don't recurse too deeply (to avoid stack overflow)
if let Some(recursive) = block.recursive { if let Some(recursive) = block.recursive {
@ -629,6 +629,8 @@ pub fn eval_block(
let elements = &pipeline.elements; let elements = &pipeline.elements;
let elements_length = elements.len(); let elements_length = elements.len();
for (idx, element) in elements.iter().enumerate() { for (idx, element) in elements.iter().enumerate() {
let mut redirect_stdout = redirect_stdout;
let mut redirect_stderr = redirect_stderr;
if !redirect_stderr && idx < elements_length - 1 { if !redirect_stderr && idx < elements_length - 1 {
let next_element = &elements[idx + 1]; let next_element = &elements[idx + 1];
if matches!( if matches!(