2022-03-16 18:17:06 +00:00
|
|
|
use crate::NushellPrompt;
|
2023-01-08 20:05:46 +00:00
|
|
|
use log::trace;
|
2022-01-28 21:59:00 +00:00
|
|
|
use nu_engine::eval_subexpression;
|
2023-04-08 11:53:43 +00:00
|
|
|
use nu_protocol::report_error;
|
2022-01-18 08:48:28 +00:00
|
|
|
use nu_protocol::{
|
2022-01-21 02:22:03 +00:00
|
|
|
engine::{EngineState, Stack, StateWorkingSet},
|
2022-12-07 18:31:57 +00:00
|
|
|
Config, PipelineData, Value,
|
2022-01-18 08:48:28 +00:00
|
|
|
};
|
|
|
|
use reedline::Prompt;
|
2023-12-15 17:58:32 +00:00
|
|
|
use std::borrow::Cow;
|
|
|
|
use std::sync::Arc;
|
2022-01-18 08:48:28 +00:00
|
|
|
|
|
|
|
// 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";
|
2022-01-27 07:53:23 +00:00
|
|
|
pub(crate) const PROMPT_INDICATOR_VI_NORMAL: &str = "PROMPT_INDICATOR_VI_NORMAL";
|
2022-01-18 08:48:28 +00:00
|
|
|
pub(crate) const PROMPT_MULTILINE_INDICATOR: &str = "PROMPT_MULTILINE_INDICATOR";
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
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";
|
2022-07-20 20:03:29 +00:00
|
|
|
// According to Daniel Imms @Tyriar, we need to do these this way:
|
|
|
|
// <133 A><prompt><133 B><command><133 C><command output>
|
|
|
|
const PRE_PROMPT_MARKER: &str = "\x1b]133;A\x1b\\";
|
|
|
|
const POST_PROMPT_MARKER: &str = "\x1b]133;B\x1b\\";
|
2022-01-18 08:48:28 +00:00
|
|
|
|
|
|
|
fn get_prompt_string(
|
|
|
|
prompt: &str,
|
|
|
|
config: &Config,
|
|
|
|
engine_state: &EngineState,
|
|
|
|
stack: &mut Stack,
|
|
|
|
) -> Option<String> {
|
|
|
|
stack
|
|
|
|
.get_env_var(engine_state, prompt)
|
2022-01-21 02:22:03 +00:00
|
|
|
.and_then(|v| match v {
|
2023-10-30 22:34:23 +00:00
|
|
|
Value::Closure { val, .. } => {
|
|
|
|
let block = engine_state.get_block(val.block_id);
|
2023-11-07 23:43:28 +00:00
|
|
|
let mut stack = stack.captures_to_stack(val.captures);
|
2022-01-28 23:22:09 +00:00
|
|
|
// Use eval_subexpression to force a redirection of output, so we can use everything in prompt
|
2022-12-07 18:31:57 +00:00
|
|
|
let ret_val =
|
|
|
|
eval_subexpression(engine_state, &mut stack, block, PipelineData::empty());
|
2023-01-08 20:05:46 +00:00
|
|
|
trace!(
|
2022-11-10 08:21:49 +00:00
|
|
|
"get_prompt_string (block) {}:{}:{}",
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!()
|
|
|
|
);
|
|
|
|
|
2023-01-21 13:47:00 +00:00
|
|
|
ret_val
|
|
|
|
.map_err(|err| {
|
2022-11-10 08:21:49 +00:00
|
|
|
let working_set = StateWorkingSet::new(engine_state);
|
|
|
|
report_error(&working_set, &err);
|
2023-01-21 13:47:00 +00:00
|
|
|
})
|
|
|
|
.ok()
|
2022-11-10 08:21:49 +00:00
|
|
|
}
|
|
|
|
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
|
2022-12-07 18:31:57 +00:00
|
|
|
let ret_val = eval_subexpression(engine_state, stack, block, PipelineData::empty());
|
2023-01-08 20:05:46 +00:00
|
|
|
trace!(
|
2022-10-21 15:20:21 +00:00
|
|
|
"get_prompt_string (block) {}:{}:{}",
|
|
|
|
file!(),
|
|
|
|
line!(),
|
|
|
|
column!()
|
|
|
|
);
|
2022-02-09 22:08:16 +00:00
|
|
|
|
2023-01-21 13:47:00 +00:00
|
|
|
ret_val
|
|
|
|
.map_err(|err| {
|
2022-02-21 15:46:19 +00:00
|
|
|
let working_set = StateWorkingSet::new(engine_state);
|
|
|
|
report_error(&working_set, &err);
|
2023-01-21 13:47:00 +00:00
|
|
|
})
|
|
|
|
.ok()
|
2022-01-21 02:22:03 +00:00
|
|
|
}
|
2022-03-31 23:00:50 +00:00
|
|
|
Value::String { .. } => Some(PipelineData::Value(v.clone(), None)),
|
2022-01-21 02:22:03 +00:00
|
|
|
_ => None,
|
2022-01-18 08:48:28 +00:00
|
|
|
})
|
2022-01-28 23:22:09 +00:00
|
|
|
.and_then(|pipeline_data| {
|
|
|
|
let output = pipeline_data.collect_string("", config).ok();
|
|
|
|
|
2023-01-24 11:23:42 +00:00
|
|
|
output.map(|mut x| {
|
|
|
|
// Just remove the very last newline.
|
|
|
|
if x.ends_with('\n') {
|
|
|
|
x.pop();
|
|
|
|
}
|
2022-01-28 23:22:09 +00:00
|
|
|
|
2023-01-24 11:23:42 +00:00
|
|
|
if x.ends_with('\r') {
|
|
|
|
x.pop();
|
2022-01-28 23:22:09 +00:00
|
|
|
}
|
2023-01-24 11:23:42 +00:00
|
|
|
x
|
|
|
|
})
|
2022-01-28 23:22:09 +00:00
|
|
|
})
|
2022-01-18 08:48:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub(crate) fn update_prompt<'prompt>(
|
|
|
|
config: &Config,
|
|
|
|
engine_state: &EngineState,
|
|
|
|
stack: &Stack,
|
|
|
|
nu_prompt: &'prompt mut NushellPrompt,
|
|
|
|
) -> &'prompt dyn Prompt {
|
|
|
|
let mut stack = stack.clone();
|
|
|
|
|
2022-10-21 15:20:21 +00:00
|
|
|
let left_prompt_string = get_prompt_string(PROMPT_COMMAND, config, engine_state, &mut stack);
|
2022-03-31 05:22:55 +00:00
|
|
|
|
2022-07-20 20:03:29 +00:00
|
|
|
// 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 {
|
2023-01-24 11:23:42 +00:00
|
|
|
if let Some(prompt_string) = left_prompt_string {
|
|
|
|
Some(format!(
|
2023-01-30 01:37:54 +00:00
|
|
|
"{PRE_PROMPT_MARKER}{prompt_string}{POST_PROMPT_MARKER}"
|
2023-01-24 11:23:42 +00:00
|
|
|
))
|
|
|
|
} else {
|
|
|
|
left_prompt_string
|
2022-07-20 20:03:29 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
left_prompt_string
|
|
|
|
};
|
|
|
|
|
2022-10-21 15:20:21 +00:00
|
|
|
let right_prompt_string =
|
|
|
|
get_prompt_string(PROMPT_COMMAND_RIGHT, config, engine_state, &mut stack);
|
2022-03-31 05:22:55 +00:00
|
|
|
|
2022-10-21 15:20:21 +00:00
|
|
|
let prompt_indicator_string =
|
|
|
|
get_prompt_string(PROMPT_INDICATOR, config, engine_state, &mut stack);
|
2022-03-31 05:22:55 +00:00
|
|
|
|
2022-10-21 15:20:21 +00:00
|
|
|
let prompt_multiline_string =
|
|
|
|
get_prompt_string(PROMPT_MULTILINE_INDICATOR, config, engine_state, &mut stack);
|
2022-03-31 05:22:55 +00:00
|
|
|
|
2022-10-21 15:20:21 +00:00
|
|
|
let prompt_vi_insert_string =
|
|
|
|
get_prompt_string(PROMPT_INDICATOR_VI_INSERT, config, engine_state, &mut stack);
|
2022-03-31 05:22:55 +00:00
|
|
|
|
2022-10-21 15:20:21 +00:00
|
|
|
let prompt_vi_normal_string =
|
|
|
|
get_prompt_string(PROMPT_INDICATOR_VI_NORMAL, config, engine_state, &mut stack);
|
2022-03-31 05:22:55 +00:00
|
|
|
|
2022-01-18 08:48:28 +00:00
|
|
|
// apply the other indicators
|
|
|
|
nu_prompt.update_all_prompt_strings(
|
2022-03-31 05:22:55 +00:00
|
|
|
left_prompt_string,
|
|
|
|
right_prompt_string,
|
2022-01-18 08:48:28 +00:00
|
|
|
prompt_indicator_string,
|
|
|
|
prompt_multiline_string,
|
2022-01-27 07:53:23 +00:00
|
|
|
(prompt_vi_insert_string, prompt_vi_normal_string),
|
2022-10-23 14:18:26 +00:00
|
|
|
config.render_right_prompt_on_last_line,
|
2022-01-18 08:48:28 +00:00
|
|
|
);
|
|
|
|
|
2022-02-09 22:08:16 +00:00
|
|
|
let ret_val = nu_prompt as &dyn Prompt;
|
2023-01-08 20:05:46 +00:00
|
|
|
trace!("update_prompt {}:{}:{}", file!(), line!(), column!());
|
2022-02-09 22:08:16 +00:00
|
|
|
|
|
|
|
ret_val
|
2022-01-18 08:48:28 +00:00
|
|
|
}
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
|
2023-12-15 17:58:32 +00:00
|
|
|
struct TransientPrompt {
|
|
|
|
engine_state: Arc<EngineState>,
|
|
|
|
stack: Stack,
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Try getting `$env.TRANSIENT_PROMPT_<X>`, and get `$env.PROMPT_<X>` if that fails
|
|
|
|
fn get_transient_prompt_string(
|
|
|
|
transient_prompt: &str,
|
|
|
|
prompt: &str,
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
config: &Config,
|
|
|
|
engine_state: &EngineState,
|
2023-12-15 17:58:32 +00:00
|
|
|
stack: &mut Stack,
|
|
|
|
) -> Option<String> {
|
|
|
|
get_prompt_string(transient_prompt, config, engine_state, stack)
|
|
|
|
.or_else(|| get_prompt_string(prompt, config, engine_state, stack))
|
|
|
|
}
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
|
2023-12-15 17:58:32 +00:00
|
|
|
impl Prompt for TransientPrompt {
|
|
|
|
fn render_prompt_left(&self) -> Cow<str> {
|
|
|
|
let mut nu_prompt = NushellPrompt::new();
|
|
|
|
let config = &self.engine_state.get_config().clone();
|
|
|
|
let mut stack = self.stack.clone();
|
|
|
|
nu_prompt.update_prompt_left(get_transient_prompt_string(
|
|
|
|
TRANSIENT_PROMPT_COMMAND,
|
|
|
|
PROMPT_COMMAND,
|
|
|
|
config,
|
|
|
|
&self.engine_state,
|
|
|
|
&mut stack,
|
|
|
|
));
|
|
|
|
nu_prompt.render_prompt_left().to_string().into()
|
|
|
|
}
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
|
2023-12-15 17:58:32 +00:00
|
|
|
fn render_prompt_right(&self) -> Cow<str> {
|
|
|
|
let mut nu_prompt = NushellPrompt::new();
|
|
|
|
let config = &self.engine_state.get_config().clone();
|
|
|
|
let mut stack = self.stack.clone();
|
|
|
|
nu_prompt.update_prompt_right(
|
|
|
|
get_transient_prompt_string(
|
|
|
|
TRANSIENT_PROMPT_COMMAND_RIGHT,
|
|
|
|
PROMPT_COMMAND_RIGHT,
|
|
|
|
config,
|
|
|
|
&self.engine_state,
|
|
|
|
&mut stack,
|
|
|
|
),
|
|
|
|
config.render_right_prompt_on_last_line,
|
|
|
|
);
|
|
|
|
nu_prompt.render_prompt_right().to_string().into()
|
|
|
|
}
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
|
2023-12-15 17:58:32 +00:00
|
|
|
fn render_prompt_indicator(&self, prompt_mode: reedline::PromptEditMode) -> Cow<str> {
|
|
|
|
let mut nu_prompt = NushellPrompt::new();
|
|
|
|
let config = &self.engine_state.get_config().clone();
|
|
|
|
let mut stack = self.stack.clone();
|
|
|
|
nu_prompt.update_prompt_indicator(get_transient_prompt_string(
|
|
|
|
TRANSIENT_PROMPT_INDICATOR,
|
|
|
|
PROMPT_INDICATOR,
|
|
|
|
config,
|
|
|
|
&self.engine_state,
|
|
|
|
&mut stack,
|
|
|
|
));
|
|
|
|
nu_prompt.update_prompt_vi_insert(get_transient_prompt_string(
|
|
|
|
TRANSIENT_PROMPT_INDICATOR_VI_INSERT,
|
|
|
|
PROMPT_INDICATOR_VI_INSERT,
|
|
|
|
config,
|
|
|
|
&self.engine_state,
|
|
|
|
&mut stack,
|
|
|
|
));
|
|
|
|
nu_prompt.update_prompt_vi_normal(get_transient_prompt_string(
|
|
|
|
TRANSIENT_PROMPT_INDICATOR_VI_NORMAL,
|
|
|
|
PROMPT_INDICATOR_VI_NORMAL,
|
|
|
|
config,
|
|
|
|
&self.engine_state,
|
|
|
|
&mut stack,
|
|
|
|
));
|
|
|
|
nu_prompt
|
|
|
|
.render_prompt_indicator(prompt_mode)
|
|
|
|
.to_string()
|
|
|
|
.into()
|
|
|
|
}
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
|
2023-12-15 17:58:32 +00:00
|
|
|
fn render_prompt_multiline_indicator(&self) -> Cow<str> {
|
|
|
|
let mut nu_prompt = NushellPrompt::new();
|
|
|
|
let config = &self.engine_state.get_config().clone();
|
|
|
|
let mut stack = self.stack.clone();
|
|
|
|
nu_prompt.update_prompt_multiline(get_transient_prompt_string(
|
|
|
|
TRANSIENT_PROMPT_MULTILINE_INDICATOR,
|
|
|
|
PROMPT_MULTILINE_INDICATOR,
|
|
|
|
config,
|
|
|
|
&self.engine_state,
|
|
|
|
&mut stack,
|
|
|
|
));
|
|
|
|
nu_prompt
|
|
|
|
.render_prompt_multiline_indicator()
|
|
|
|
.to_string()
|
|
|
|
.into()
|
|
|
|
}
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
|
2023-12-15 17:58:32 +00:00
|
|
|
fn render_prompt_history_search_indicator(
|
|
|
|
&self,
|
|
|
|
history_search: reedline::PromptHistorySearch,
|
|
|
|
) -> Cow<str> {
|
|
|
|
NushellPrompt::new()
|
|
|
|
.render_prompt_history_search_indicator(history_search)
|
|
|
|
.to_string()
|
|
|
|
.into()
|
|
|
|
}
|
|
|
|
}
|
2023-12-15 13:56:29 +00:00
|
|
|
|
2023-12-15 17:58:32 +00:00
|
|
|
/// Construct the transient prompt
|
|
|
|
pub(crate) fn transient_prompt(engine_state: Arc<EngineState>, stack: &Stack) -> Box<dyn Prompt> {
|
|
|
|
Box::new(TransientPrompt {
|
2023-12-15 13:56:29 +00:00
|
|
|
engine_state,
|
2023-12-15 17:58:32 +00:00
|
|
|
stack: stack.clone(),
|
|
|
|
})
|
Transient prompt (#10391)
## Description
This PR uses environment variables to enable and set a transient prompt,
which lets you draw a different prompt once you've entered a command and
you've moved on to the next line. This is useful if you have a fancy
two-line prompt with a bunch of info about time and git status that you
don't really need in your scrollback buffer.
Here's a screenshot. You can see how my usual prompt has two lines and
would take up a lot more space if every past command also used the full
prompt, but reducing past prompts to `🚀` or `>` makes it take up less
space.
![image](https://github.com/nushell/nushell/assets/45539777/dde8d0f5-f95f-4529-9a14-b7919bd51126)
I added the following lines to my `env.nu` to get that rocket as the
prompt initially:
```nu
$env.TRANSIENT_PROMPT_COMMAND = {|| "" }
$env.TRANSIENT_PROMPT_INDICATOR = {|| open --raw "~/.prompt-indicator" }
$env.TRANSIENT_PROMPT_INDICATOR_VI_INSERT = $env.TRANSIENT_PROMPT_INDICATOR
```
## User-Facing Changes
If you want to change a segment of the prompt, set the corresponding
`TRANSIENT_PROMPT_*` variable.
<!-- 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.
-->
## Problems/Things to Consider:
- The transient prompt clones the `Stack` at the very beginning of the
session and keeps that around. I'm not sure if that could cause
problems, but if so, it could probably take an `Arc<State>` instead.
- This isn't truly a problem, but now there's even more environment
variables, which is kinda annoying.
- There might be some performance issues with creating a new
`NushellPrompt` object and cloning the `Stack` for every segment of the
transient prompt. What's more, the transient prompt is added to the
`Reedline` object whether or not the user has enabled transient prompt,
so if there are indeed performance issues, simply disabling the
transient prompt won't help.
- Perhaps instead of a separate `TRANSIENT_PROMPT_INDICATOR_VI_INSERT`
and `TRANSIENT_PROMPT_INDICATOR_VI_NORMAL`, `TRANSIENT_PROMPT_INDICATOR`
could be used for both (if it exists). Insert and normal mode don't
really matter for previously entered commands.
2023-09-22 19:35:09 +00:00
|
|
|
}
|