Skip to content

5539 - CTRL+Z then Enter will now close shell on Windows. #6223

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
youknowone merged 4 commits into from
Oct 28, 2025
Merged

5539 - CTRL+Z then Enter will now close shell on Windows. #6223

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c64c695
CTRL+Z then Enter will now close shell on Windows.
JazzGlobal Oct 27, 2025
2b3ee61
Additional comment.
JazzGlobal Oct 27, 2025
e6089ab
Use EOF const
JazzGlobal Oct 27, 2025
7cabf8e
Add cfg(windows) for EOF_CHAR
youknowone Oct 28, 2025
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
27 changes: 26 additions & 1 deletion vm/src/readline.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ mod rustyline_readline {
repl: rustyline::Editor<H, rustyline::history::DefaultHistory>,
}

#[cfg(windows)]
const EOF_CHAR: &str = "\u{001A}";

impl<H: Helper> Readline<H> {
pub fn new(helper: H) -> Self {
use rustyline::*;
Expand All @@ -88,6 +91,16 @@ mod rustyline_readline {
)
.expect("failed to initialize line editor");
repl.set_helper(Some(helper));

// Bind CTRL + Z to insert EOF character on Windows
#[cfg(windows)]
{
repl.bind_sequence(
KeyEvent::new('z', Modifiers::CTRL),
EventHandler::Simple(Cmd::Insert(1, EOF_CHAR.into())),
);
}

Self { repl }
}

Expand Down Expand Up @@ -115,7 +128,19 @@ mod rustyline_readline {
use rustyline::error::ReadlineError;
loop {
break match self.repl.readline(prompt) {
Ok(line) => ReadlineResult::Line(line),
Ok(line) => {
// Check for CTRL + Z on Windows
#[cfg(windows)]
{
use std::io::IsTerminal;

let trimmed = line.trim_end_matches(&['\r', '\n'][..]);
if trimmed == EOF_CHAR && io::stdin().is_terminal() {
return ReadlineResult::Eof;
}
}
ReadlineResult::Line(line)
}
Err(ReadlineError::Interrupted) => ReadlineResult::Interrupt,
Err(ReadlineError::Eof) => ReadlineResult::Eof,
Err(ReadlineError::Io(e)) => ReadlineResult::Io(e),
Expand Down
Loading