extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-04-25 05:38:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes to shell integation in repl. (#5701)

Browse Source 
Added CMD_FINISHED_MARKER to be emitted when command finishes.
Also switched the names PRE_EXECUTE_MARKER and PRE_PROMPT_MARKER
as the old names were confusing/wrong.
This commit is contained in:
Per Bothner 2022-06-02 15:57:19 -07:00 committed by GitHub
parent a06299c77a
commit 7a9bf06005
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
crates/nu-cli/src/repl.rs
View File

@ -19,8 +19,9 @@ use std::io::{self, Write};
use std::path::PathBuf; use std::path::PathBuf;
use std::{sync::atomic::Ordering, time::Instant}; use std::{sync::atomic::Ordering, time::Instant};
const PRE_EXECUTE_MARKER: &str = "\x1b]133;A\x1b\\"; const PRE_PROMPT_MARKER: &str = "\x1b]133;A\x1b\\";
const PRE_PROMPT_MARKER: &str = "\x1b]133;C\x1b\\"; const PRE_EXECUTE_MARKER: &str = "\x1b]133;C\x1b\\";
const CMD_FINISHED_MARKER: &str = "\x1b]133;D\x1b\\";
const RESET_APPLICATION_MODE: &str = "\x1b[?1l"; const RESET_APPLICATION_MODE: &str = "\x1b[?1l";
pub fn evaluate_repl( pub fn evaluate_repl(
@ -272,8 +273,9 @@ pub fn evaluate_repl(
config = engine_state.get_config(); config = engine_state.get_config();
if config.shell_integration { let shell_integration = config.shell_integration;
run_ansi_sequence(PRE_EXECUTE_MARKER)?; if shell_integration {
run_ansi_sequence(PRE_PROMPT_MARKER)?;
} }
let prompt = let prompt =
@ -303,9 +305,9 @@ pub fn evaluate_repl(
} }
} }
if config.shell_integration { if shell_integration {
run_ansi_sequence(RESET_APPLICATION_MODE)?; run_ansi_sequence(RESET_APPLICATION_MODE)?;
run_ansi_sequence(PRE_PROMPT_MARKER)?; run_ansi_sequence(PRE_EXECUTE_MARKER)?;
if let Some(cwd) = stack.get_env_var(engine_state, "PWD") { if let Some(cwd) = stack.get_env_var(engine_state, "PWD") {
let path = cwd.as_string()?; let path = cwd.as_string()?;
// Try to abbreviate string for windows title // Try to abbreviate string for windows title
@ -411,12 +413,23 @@ pub fn evaluate_repl(
let _ = std::env::set_current_dir(path); let _ = std::env::set_current_dir(path);
engine_state.add_env_var("PWD".into(), cwd); engine_state.add_env_var("PWD".into(), cwd);
} }
if shell_integration {
// FIXME: use variant with exit code, if apropriate
run_ansi_sequence(CMD_FINISHED_MARKER)?;
}
} }
Ok(Signal::CtrlC) => { Ok(Signal::CtrlC) => {
// `Reedline` clears the line content. New prompt is shown // `Reedline` clears the line content. New prompt is shown
if shell_integration {
run_ansi_sequence(CMD_FINISHED_MARKER)?;
}
} }
Ok(Signal::CtrlD) => { Ok(Signal::CtrlD) => {
// When exiting clear to a new line // When exiting clear to a new line
if shell_integration {
run_ansi_sequence(CMD_FINISHED_MARKER)?;
}
println!(); println!();
break; break;
} }
@ -425,6 +438,9 @@ pub fn evaluate_repl(
if !message.contains("duration") { if !message.contains("duration") {
println!("Error: {:?}", err); println!("Error: {:?}", err);
} }
if shell_integration {
run_ansi_sequence(CMD_FINISHED_MARKER)?;
}
} }
} }
} }