mirror of
https://github.com/nushell/nushell.git
synced 2024-11-29 20:03:54 +01:00
70f7db14d4
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> This PR is basically a copy of #10986 by @CAD97, which made `$env.PROMPT_COMMAND` only run once per prompt, but @fdncred found an issue where hitting Enter would make the transient prompt appear and be immediately overwritten by the regular prompt, so it was [reverted](https://github.com/nushell/nushell/pull/11340). https://github.com/nushell/nushell/pull/10788 was also made to do the same thing as #10986 but that ended up having the same issue. For some reason, this branch doesn't have that problem, although I haven't figured out why yet. @CAD97, if you have any inputs or want to make your own PR, let me know. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> When hitting enter, the prompt shouldn't blink in place anymore. # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. -->
199 lines
6.9 KiB
Rust
199 lines
6.9 KiB
Rust
use crate::NushellPrompt;
|
|
use log::trace;
|
|
use nu_engine::eval_subexpression;
|
|
use nu_protocol::report_error;
|
|
use nu_protocol::{
|
|
engine::{EngineState, Stack, StateWorkingSet},
|
|
Config, PipelineData, Value,
|
|
};
|
|
use reedline::Prompt;
|
|
|
|
// Name of environment variable where the prompt could be stored
|
|
pub(crate) const PROMPT_COMMAND: &str = "PROMPT_COMMAND";
|
|
pub(crate) const PROMPT_COMMAND_RIGHT: &str = "PROMPT_COMMAND_RIGHT";
|
|
pub(crate) const PROMPT_INDICATOR: &str = "PROMPT_INDICATOR";
|
|
pub(crate) const PROMPT_INDICATOR_VI_INSERT: &str = "PROMPT_INDICATOR_VI_INSERT";
|
|
pub(crate) const PROMPT_INDICATOR_VI_NORMAL: &str = "PROMPT_INDICATOR_VI_NORMAL";
|
|
pub(crate) const PROMPT_MULTILINE_INDICATOR: &str = "PROMPT_MULTILINE_INDICATOR";
|
|
pub(crate) const TRANSIENT_PROMPT_COMMAND: &str = "TRANSIENT_PROMPT_COMMAND";
|
|
pub(crate) const TRANSIENT_PROMPT_COMMAND_RIGHT: &str = "TRANSIENT_PROMPT_COMMAND_RIGHT";
|
|
pub(crate) const TRANSIENT_PROMPT_INDICATOR: &str = "TRANSIENT_PROMPT_INDICATOR";
|
|
pub(crate) const TRANSIENT_PROMPT_INDICATOR_VI_INSERT: &str =
|
|
"TRANSIENT_PROMPT_INDICATOR_VI_INSERT";
|
|
pub(crate) const TRANSIENT_PROMPT_INDICATOR_VI_NORMAL: &str =
|
|
"TRANSIENT_PROMPT_INDICATOR_VI_NORMAL";
|
|
pub(crate) const TRANSIENT_PROMPT_MULTILINE_INDICATOR: &str =
|
|
"TRANSIENT_PROMPT_MULTILINE_INDICATOR";
|
|
// According to Daniel Imms @Tyriar, we need to do these this way:
|
|
// <133 A><prompt><133 B><command><133 C><command output>
|
|
pub(crate) const PRE_PROMPT_MARKER: &str = "\x1b]133;A\x1b\\";
|
|
pub(crate) const POST_PROMPT_MARKER: &str = "\x1b]133;B\x1b\\";
|
|
|
|
fn get_prompt_string(
|
|
prompt: &str,
|
|
config: &Config,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
) -> Option<String> {
|
|
stack
|
|
.get_env_var(engine_state, prompt)
|
|
.and_then(|v| match v {
|
|
Value::Closure { val, .. } => {
|
|
let block = engine_state.get_block(val.block_id);
|
|
let mut stack = stack.captures_to_stack(val.captures);
|
|
// Use eval_subexpression to force a redirection of output, so we can use everything in prompt
|
|
let ret_val =
|
|
eval_subexpression(engine_state, &mut stack, block, PipelineData::empty());
|
|
trace!(
|
|
"get_prompt_string (block) {}:{}:{}",
|
|
file!(),
|
|
line!(),
|
|
column!()
|
|
);
|
|
|
|
ret_val
|
|
.map_err(|err| {
|
|
let working_set = StateWorkingSet::new(engine_state);
|
|
report_error(&working_set, &err);
|
|
})
|
|
.ok()
|
|
}
|
|
Value::Block { val: block_id, .. } => {
|
|
let block = engine_state.get_block(block_id);
|
|
// Use eval_subexpression to force a redirection of output, so we can use everything in prompt
|
|
let ret_val = eval_subexpression(engine_state, stack, block, PipelineData::empty());
|
|
trace!(
|
|
"get_prompt_string (block) {}:{}:{}",
|
|
file!(),
|
|
line!(),
|
|
column!()
|
|
);
|
|
|
|
ret_val
|
|
.map_err(|err| {
|
|
let working_set = StateWorkingSet::new(engine_state);
|
|
report_error(&working_set, &err);
|
|
})
|
|
.ok()
|
|
}
|
|
Value::String { .. } => Some(PipelineData::Value(v.clone(), None)),
|
|
_ => None,
|
|
})
|
|
.and_then(|pipeline_data| {
|
|
let output = pipeline_data.collect_string("", config).ok();
|
|
|
|
output.map(|mut x| {
|
|
// Just remove the very last newline.
|
|
if x.ends_with('\n') {
|
|
x.pop();
|
|
}
|
|
|
|
if x.ends_with('\r') {
|
|
x.pop();
|
|
}
|
|
x
|
|
})
|
|
})
|
|
}
|
|
|
|
pub(crate) fn update_prompt(
|
|
config: &Config,
|
|
engine_state: &EngineState,
|
|
stack: &Stack,
|
|
nu_prompt: &mut NushellPrompt,
|
|
) {
|
|
let mut stack = stack.clone();
|
|
|
|
let left_prompt_string = get_prompt_string(PROMPT_COMMAND, config, engine_state, &mut stack);
|
|
|
|
// Now that we have the prompt string lets ansify it.
|
|
// <133 A><prompt><133 B><command><133 C><command output>
|
|
let left_prompt_string = if config.shell_integration {
|
|
if let Some(prompt_string) = left_prompt_string {
|
|
Some(format!(
|
|
"{PRE_PROMPT_MARKER}{prompt_string}{POST_PROMPT_MARKER}"
|
|
))
|
|
} else {
|
|
left_prompt_string
|
|
}
|
|
} else {
|
|
left_prompt_string
|
|
};
|
|
|
|
let right_prompt_string =
|
|
get_prompt_string(PROMPT_COMMAND_RIGHT, config, engine_state, &mut stack);
|
|
|
|
let prompt_indicator_string =
|
|
get_prompt_string(PROMPT_INDICATOR, config, engine_state, &mut stack);
|
|
|
|
let prompt_multiline_string =
|
|
get_prompt_string(PROMPT_MULTILINE_INDICATOR, config, engine_state, &mut stack);
|
|
|
|
let prompt_vi_insert_string =
|
|
get_prompt_string(PROMPT_INDICATOR_VI_INSERT, config, engine_state, &mut stack);
|
|
|
|
let prompt_vi_normal_string =
|
|
get_prompt_string(PROMPT_INDICATOR_VI_NORMAL, config, engine_state, &mut stack);
|
|
|
|
// apply the other indicators
|
|
nu_prompt.update_all_prompt_strings(
|
|
left_prompt_string,
|
|
right_prompt_string,
|
|
prompt_indicator_string,
|
|
prompt_multiline_string,
|
|
(prompt_vi_insert_string, prompt_vi_normal_string),
|
|
config.render_right_prompt_on_last_line,
|
|
);
|
|
trace!("update_prompt {}:{}:{}", file!(), line!(), column!());
|
|
}
|
|
|
|
/// Construct the transient prompt based on the normal nu_prompt
|
|
pub(crate) fn make_transient_prompt(
|
|
config: &Config,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
nu_prompt: &NushellPrompt,
|
|
) -> Box<dyn Prompt> {
|
|
let mut nu_prompt = nu_prompt.clone();
|
|
|
|
if let Some(s) = get_prompt_string(TRANSIENT_PROMPT_COMMAND, config, engine_state, stack) {
|
|
nu_prompt.update_prompt_left(Some(s))
|
|
}
|
|
|
|
if let Some(s) = get_prompt_string(TRANSIENT_PROMPT_COMMAND_RIGHT, config, engine_state, stack)
|
|
{
|
|
nu_prompt.update_prompt_right(Some(s), config.render_right_prompt_on_last_line)
|
|
}
|
|
|
|
if let Some(s) = get_prompt_string(TRANSIENT_PROMPT_INDICATOR, config, engine_state, stack) {
|
|
nu_prompt.update_prompt_indicator(Some(s))
|
|
}
|
|
if let Some(s) = get_prompt_string(
|
|
TRANSIENT_PROMPT_INDICATOR_VI_INSERT,
|
|
config,
|
|
engine_state,
|
|
stack,
|
|
) {
|
|
nu_prompt.update_prompt_vi_insert(Some(s))
|
|
}
|
|
if let Some(s) = get_prompt_string(
|
|
TRANSIENT_PROMPT_INDICATOR_VI_NORMAL,
|
|
config,
|
|
engine_state,
|
|
stack,
|
|
) {
|
|
nu_prompt.update_prompt_vi_normal(Some(s))
|
|
}
|
|
|
|
if let Some(s) = get_prompt_string(
|
|
TRANSIENT_PROMPT_MULTILINE_INDICATOR,
|
|
config,
|
|
engine_state,
|
|
stack,
|
|
) {
|
|
nu_prompt.update_prompt_multiline(Some(s))
|
|
}
|
|
|
|
Box::new(nu_prompt)
|
|
}
|