forked from extern/nushell
# Description When referring to the type use `int` consistently. Only when referring to the concept of integer numbers use `integer`. - Fix `random integer` to `random int` tests - Forgot in #10520 - Use int instead of integer in error messages - Use int type name in bits commands - Fix messages in `for` examples - Use int typename in `into` commands - Use int typename in rest of commands - Report errors in `nu-protocol` with int typename Work for #10332 # User-Facing Changes User errorrs should now use `int` so you can easily find the necessary commands or type annotations. # Tests + Formatting Only two tests found that needed updating
130 lines
4.5 KiB
Rust
130 lines
4.5 KiB
Rust
use nu_engine::CallExt;
|
|
use nu_protocol::{
|
|
ast::Call,
|
|
engine::{Command, EngineState, Stack},
|
|
Category, IntoPipelineData, PipelineData, ShellError, Signature, SyntaxShape, Type, Value,
|
|
};
|
|
use unicode_segmentation::UnicodeSegmentation;
|
|
|
|
#[derive(Clone)]
|
|
pub struct Commandline;
|
|
|
|
impl Command for Commandline {
|
|
fn name(&self) -> &str {
|
|
"commandline"
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
Signature::build("commandline")
|
|
.input_output_types(vec![
|
|
(Type::Nothing, Type::Nothing),
|
|
(Type::String, Type::String),
|
|
])
|
|
.switch(
|
|
"cursor",
|
|
"Set or get the current cursor position",
|
|
Some('c'),
|
|
)
|
|
.switch(
|
|
"cursor-end",
|
|
"Set the current cursor position to the end of the buffer",
|
|
Some('e'),
|
|
)
|
|
.switch(
|
|
"append",
|
|
"appends the string to the end of the buffer",
|
|
Some('a'),
|
|
)
|
|
.switch(
|
|
"insert",
|
|
"inserts the string into the buffer at the cursor position",
|
|
Some('i'),
|
|
)
|
|
.switch(
|
|
"replace",
|
|
"replaces the current contents of the buffer (default)",
|
|
Some('r'),
|
|
)
|
|
.optional(
|
|
"cmd",
|
|
SyntaxShape::String,
|
|
"the string to perform the operation with",
|
|
)
|
|
.category(Category::Core)
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
"View or modify the current command line input buffer."
|
|
}
|
|
|
|
fn search_terms(&self) -> Vec<&str> {
|
|
vec!["repl", "interactive"]
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
_input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
if let Some(cmd) = call.opt::<Value>(engine_state, stack, 0)? {
|
|
let mut repl = engine_state.repl_state.lock().expect("repl state mutex");
|
|
|
|
if call.has_flag("cursor") {
|
|
let cmd_str = cmd.as_string()?;
|
|
match cmd_str.parse::<i64>() {
|
|
Ok(n) => {
|
|
repl.cursor_pos = if n <= 0 {
|
|
0usize
|
|
} else {
|
|
repl.buffer
|
|
.grapheme_indices(true)
|
|
.map(|(i, _c)| i)
|
|
.nth(n as usize)
|
|
.unwrap_or(repl.buffer.len())
|
|
}
|
|
}
|
|
Err(_) => {
|
|
return Err(ShellError::CantConvert {
|
|
to_type: "int".to_string(),
|
|
from_type: "string".to_string(),
|
|
span: cmd.span(),
|
|
help: Some(format!(
|
|
r#"string "{cmd_str}" does not represent a valid int"#
|
|
)),
|
|
})
|
|
}
|
|
}
|
|
} else if call.has_flag("append") {
|
|
repl.buffer.push_str(&cmd.as_string()?);
|
|
} else if call.has_flag("insert") {
|
|
let cmd_str = cmd.as_string()?;
|
|
let cursor_pos = repl.cursor_pos;
|
|
repl.buffer.insert_str(cursor_pos, &cmd_str);
|
|
repl.cursor_pos += cmd_str.len();
|
|
} else {
|
|
repl.buffer = cmd.as_string()?;
|
|
repl.cursor_pos = repl.buffer.len();
|
|
}
|
|
Ok(Value::nothing(call.head).into_pipeline_data())
|
|
} else {
|
|
let mut repl = engine_state.repl_state.lock().expect("repl state mutex");
|
|
if call.has_flag("cursor-end") {
|
|
repl.cursor_pos = repl.buffer.graphemes(true).count();
|
|
Ok(Value::nothing(call.head).into_pipeline_data())
|
|
} else if call.has_flag("cursor") {
|
|
let char_pos = repl
|
|
.buffer
|
|
.grapheme_indices(true)
|
|
.chain(std::iter::once((repl.buffer.len(), "")))
|
|
.position(|(i, _c)| i == repl.cursor_pos)
|
|
.expect("Cursor position isn't on a grapheme boundary");
|
|
Ok(Value::string(char_pos.to_string(), call.head).into_pipeline_data())
|
|
} else {
|
|
Ok(Value::string(repl.buffer.to_string(), call.head).into_pipeline_data())
|
|
}
|
|
}
|
|
}
|
|
}
|