extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-08 14:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

move the shell integration title setting to the right place (#6112)

Browse Source
This commit is contained in:
Darren Schroeder 2022-07-24 09:01:59 -05:00 committed by GitHub
parent 0812a08bfb
commit 10536f70f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -314,22 +314,22 @@ pub fn evaluate_repl(
if shell_integration { if shell_integration {
run_ansi_sequence(RESET_APPLICATION_MODE)?; run_ansi_sequence(RESET_APPLICATION_MODE)?;
run_ansi_sequence(PRE_EXECUTE_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
let maybe_abbrev_path = if let Some(p) = nu_path::home_dir() { // let maybe_abbrev_path = if let Some(p) = nu_path::home_dir() {
path.replace(&p.as_path().display().to_string(), "~") // path.replace(&p.as_path().display().to_string(), "~")
} else { // } else {
path // path
}; // };
// Set window title too // // Set window title too
// https://tldp.org/HOWTO/Xterm-Title-3.html // // https://tldp.org/HOWTO/Xterm-Title-3.html
// ESC]0;stringBEL -- Set icon name and window title to string // // ESC]0;stringBEL -- Set icon name and window title to string
// ESC]1;stringBEL -- Set icon name to string // // ESC]1;stringBEL -- Set icon name to string
// ESC]2;stringBEL -- Set window title to string // // ESC]2;stringBEL -- Set window title to string
run_ansi_sequence(&format!("\x1b]2;{}\x07", maybe_abbrev_path))?; // run_ansi_sequence(&format!("\x1b]2;{}\x07", maybe_abbrev_path))?;
} // }
} }
let start_time = Instant::now(); let start_time = Instant::now();
@ -429,6 +429,22 @@ pub fn evaluate_repl(
if shell_integration { if shell_integration {
run_ansi_sequence(&get_command_finished_marker(stack, engine_state))?; run_ansi_sequence(&get_command_finished_marker(stack, engine_state))?;
if let Some(cwd) = stack.get_env_var(engine_state, "PWD") {
let path = cwd.as_string()?;
// Try to abbreviate string for windows title
let maybe_abbrev_path = if let Some(p) = nu_path::home_dir() {
path.replace(&p.as_path().display().to_string(), "~")
} else {
path
};
// Set window title too
// https://tldp.org/HOWTO/Xterm-Title-3.html
// ESC]0;stringBEL -- Set icon name and window title to string
// ESC]1;stringBEL -- Set icon name to string
// ESC]2;stringBEL -- Set window title to string
run_ansi_sequence(&format!("\x1b]2;{}\x07", maybe_abbrev_path))?;
}
} }
} }
Ok(Signal::CtrlC) => { Ok(Signal::CtrlC) => {