Skip to content

cat: only print % at the very end if needed #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfv merged 1 commit into from
Jan 20, 2025
Merged

cat: only print % at the very end if needed #196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions crates/deno_task_shell/src/shell/commands/cat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ fn execute_cat(mut context: ShellCommandContext) -> Result<ExecuteResult> {
} else {
// buffered to prevent reading an entire file
// in memory
let mut new_line = true;
match File::open(context.state.cwd().join(&path)) {
Ok(mut file) => loop {
if context.state.token().is_cancelled() {
Expand All @@ -55,17 +56,17 @@ fn execute_cat(mut context: ShellCommandContext) -> Result<ExecuteResult> {

let size = file.read(&mut buf).into_diagnostic()?;
if size == 0 {
if let ShellPipeWriter::Stdout = context.stdout {
// check if it's interactive
if !new_line && std::io::stdout().is_terminal() {
// make sure that we end up on a new line
context.stdout.write_all(b"%\n")?;
}
}
break;
} else {
context.stdout.write_all(&buf[..size])?;
}

if let ShellPipeWriter::Stdout = context.stdout {
// check if it's interactive
if buf[size - 1] != b'\n' && std::io::stdout().is_terminal() {
// make sure that we end up on a new line
context.stdout.write_all(b"%\n")?;
}
new_line = buf[size - 1] == b'\n';
}
},
Err(err) => {
Expand Down
Loading