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

consolidate shell integration behind config setting (#5302)

Browse Source 
* consolidate shell integration behind config setting

* write output differently
This commit is contained in:
Darren Schroeder
2022-04-23 19:53:12 -05:00
committed by GitHub
parent e2b510b65e
commit 8eab311565
5 changed files with 38 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/nu-cli/src/prompt.rs
View File

@ -7,6 +7,9 @@ use {
std::borrow::Cow,
};
const PROMPT_MARKER_BEFORE_PS1: &str = "\x1b]133;A\x1b\\"; // OSC 133;A ST
const PROMPT_MARKER_BEFORE_PS2: &str = "\x1b]133;A;k=s\x1b\\"; // OSC 133;A;k=s ST
/// Nushell prompt definition
#[derive(Clone)]
pub struct NushellPrompt {
@ -95,7 +98,7 @@ impl Prompt for NushellPrompt {
// Just before starting to draw the PS1 prompt send the escape code (see
// https://sw.kovidgoyal.net/kitty/shell-integration/#notes-for-shell-developers)
let mut prompt = if self.shell_integration {
String::from("\x1b]133;A\x1b\\")
String::from(PROMPT_MARKER_BEFORE_PS1)
} else {
String::new()
};
@ -155,7 +158,7 @@ impl Prompt for NushellPrompt {
// Just before starting to draw the PS1 prompt send the escape code (see
// https://sw.kovidgoyal.net/kitty/shell-integration/#notes-for-shell-developers)
let mut prompt = if self.shell_integration {
String::from("\x1b]133;A;k=s\x1b\\")
String::from(PROMPT_MARKER_BEFORE_PS2)
} else {
String::new()
};

2
crates/nu-cli/src/prompt_update.rs
View File

@ -147,7 +147,7 @@ pub(crate) fn update_prompt<'prompt>(
(prompt_vi_insert_string, prompt_vi_normal_string),
);
if config.use_ansi_coloring {
if config.shell_integration {
nu_prompt.enable_shell_integration();
}

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

@ -18,9 +18,13 @@ use nu_protocol::{
ShellError, Span, Value,
};
use reedline::{DefaultHinter, Emacs, Vi};
use std::io::{self, Write};
use std::path::PathBuf;
use std::{sync::atomic::Ordering, time::Instant};
const PROMPT_MARKER_BEFORE_CMD: &str = "\x1b]133;C\x1b\\"; // OSC 133;C ST
const RESET_APPLICATION_MODE: &str = "\x1b[?1l";
pub fn evaluate_repl(
engine_state: &mut EngineState,
stack: &mut Stack,
@ -209,12 +213,7 @@ pub fn evaluate_repl(
}
let input = line_editor.read_line(prompt);
if config.use_ansi_coloring {
// Just before running a command/program, send the escape code (see
// https://sw.kovidgoyal.net/kitty/shell-integration/#notes-for-shell-developers)
print!("\x1b]133;C\x1b\\");
}
let use_shell_integration = config.shell_integration;
match input {
Ok(Signal::Success(s)) => {
@ -305,6 +304,22 @@ pub fn evaluate_repl(
let _ = std::env::set_current_dir(path);
engine_state.env_vars.insert("PWD".into(), cwd);
}
if use_shell_integration {
// Just before running a command/program, send the escape code (see
// https://sw.kovidgoyal.net/kitty/shell-integration/#notes-for-shell-developers)
let mut ansi_escapes = String::from(PROMPT_MARKER_BEFORE_CMD);
ansi_escapes.push_str(RESET_APPLICATION_MODE);
if let Some(cwd) = stack.get_env_var(engine_state, "PWD") {
let path = cwd.as_string()?;
ansi_escapes.push_str(&format!("\x1b]2;{}\x07", path));
}
// print!("{}", ansi_escapes);
match io::stdout().write_all(ansi_escapes.as_bytes()) {
Ok(it) => it,
Err(err) => print!("error: {}", err),
};
}
}
Ok(Signal::CtrlC) => {
// `Reedline` clears the line content. New prompt is shown