forked from extern/nushell
Span ID Refactor (Step 2): Make Call SpanId-friendly (#13268)
<!-- 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. --> Part of https://github.com/nushell/nushell/issues/12963, step 2. This PR refactors Call and related argument structures to remove their dependency on `Expression::span` which will be removed in the future. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> Should be none. If you see some error messages that look broken, please report. # 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 toolkit.nu; toolkit test stdlib"` 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. -->
This commit is contained in:
@ -49,7 +49,7 @@ impl Command for BytesBuild {
|
||||
_input: PipelineData,
|
||||
) -> Result<PipelineData, ShellError> {
|
||||
let mut output = vec![];
|
||||
for val in call.rest_iter_flattened(0, |expr| {
|
||||
for val in call.rest_iter_flattened(&engine_state, 0, |expr| {
|
||||
let eval_expression = get_eval_expression(engine_state);
|
||||
eval_expression(engine_state, stack, expr)
|
||||
})? {
|
||||
|
@ -111,11 +111,11 @@ fn get_arguments(
|
||||
) -> Vec<Value> {
|
||||
let mut arg_value = vec![];
|
||||
let span = Span::test_data();
|
||||
for arg in &call.arguments {
|
||||
for arg in &call.arguments.item {
|
||||
match arg {
|
||||
// I think the second argument to Argument::Named is the short name, but I'm not really sure.
|
||||
// Please fix it if it's wrong. :)
|
||||
Argument::Named((name, short, opt_expr)) => {
|
||||
Argument::Named((name, short, opt_expr, _)) => {
|
||||
let arg_type = "named";
|
||||
let arg_value_name = name.item.clone();
|
||||
let arg_value_name_span_start = name.span.start as i64;
|
||||
|
@ -104,7 +104,7 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
|
||||
collect_values,
|
||||
collect_exprs,
|
||||
collect_lines,
|
||||
call.span(),
|
||||
call.span(&engine_state),
|
||||
);
|
||||
|
||||
let lock_err = |_| ShellError::GenericError {
|
||||
@ -125,12 +125,12 @@ confusing the id/parent_id hierarchy. The --expr flag is helpful for investigati
|
||||
let pipeline_data = result?;
|
||||
|
||||
// Collect the output
|
||||
let _ = pipeline_data.into_value(call.span());
|
||||
let _ = pipeline_data.into_value(call.span(&engine_state));
|
||||
|
||||
Ok(engine_state
|
||||
.deactivate_debugger()
|
||||
.map_err(lock_err)?
|
||||
.report(engine_state, call.span())?
|
||||
.report(engine_state, call.span(&engine_state))?
|
||||
.into_pipeline_data())
|
||||
}
|
||||
|
||||
|
@ -177,7 +177,12 @@ impl Command for Open {
|
||||
let block = engine_state.get_block(block_id);
|
||||
eval_block(engine_state, stack, block, stream)
|
||||
} else {
|
||||
decl.run(engine_state, stack, &Call::new(call_span), stream)
|
||||
decl.run(
|
||||
engine_state,
|
||||
stack,
|
||||
&Call::new(call_span, call.arguments_span()),
|
||||
stream,
|
||||
)
|
||||
};
|
||||
output.push(command_output.map_err(|inner| {
|
||||
ShellError::GenericError{
|
||||
|
@ -398,7 +398,7 @@ fn convert_to_extension(
|
||||
let eval_block = get_eval_block(engine_state);
|
||||
eval_block(engine_state, stack, block, input)
|
||||
} else {
|
||||
decl.run(engine_state, stack, &Call::new(span), input)
|
||||
decl.run(engine_state, stack, &Call::new(span, span.past()), input)
|
||||
}
|
||||
} else {
|
||||
Ok(input)
|
||||
|
@ -103,7 +103,7 @@ pub fn get_rest_for_glob_pattern(
|
||||
let mut output = vec![];
|
||||
let eval_expression = get_eval_expression(engine_state);
|
||||
|
||||
for result in call.rest_iter_flattened(starting_pos, |expr| {
|
||||
for result in call.rest_iter_flattened(&engine_state, starting_pos, |expr| {
|
||||
let result = eval_expression(engine_state, stack, expr);
|
||||
match result {
|
||||
Err(e) => Err(e),
|
||||
|
@ -141,7 +141,7 @@ fn from_csv(
|
||||
} else {
|
||||
return Err(ShellError::NonUtf8Custom {
|
||||
msg: "separator should be a single char or a 4-byte unicode".into(),
|
||||
span: call.span(),
|
||||
span: call.span(&engine_state),
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@ -3,6 +3,7 @@ use nu_color_config::StyleComputer;
|
||||
use nu_engine::command_prelude::*;
|
||||
use nu_protocol::ast::{Expr, Expression};
|
||||
|
||||
use nu_protocol::engine::UNKNOWN_SPAN_ID;
|
||||
use std::collections::VecDeque;
|
||||
|
||||
#[derive(Clone)]
|
||||
@ -143,7 +144,7 @@ pub fn cal(
|
||||
style_computer,
|
||||
)?;
|
||||
|
||||
let mut table_no_index = Call::new(Span::unknown());
|
||||
let mut table_no_index = Call::new(Span::unknown(), Span::unknown());
|
||||
table_no_index.add_named((
|
||||
Spanned {
|
||||
item: "index".to_string(),
|
||||
@ -155,6 +156,7 @@ pub fn cal(
|
||||
Span::unknown(),
|
||||
Type::Bool,
|
||||
)),
|
||||
UNKNOWN_SPAN_ID,
|
||||
));
|
||||
|
||||
let cal_table_output =
|
||||
|
@ -412,7 +412,7 @@ fn display(help: &str, engine_state: &EngineState, stack: &mut Stack, span: Span
|
||||
let result = decl.run(
|
||||
engine_state,
|
||||
stack,
|
||||
&Call::new(span),
|
||||
&Call::new(span, span.past()),
|
||||
Value::string(item, Span::unknown()).into_pipeline_data(),
|
||||
);
|
||||
|
||||
|
@ -547,7 +547,7 @@ fn transform_response_using_content_type(
|
||||
Some(converter_id) => engine_state.get_decl(converter_id).run(
|
||||
engine_state,
|
||||
stack,
|
||||
&Call::new(span),
|
||||
&Call::new(span, span.past()),
|
||||
output,
|
||||
),
|
||||
None => Ok(output),
|
||||
|
@ -58,7 +58,12 @@ impl Command for IsTerminal {
|
||||
_ => {
|
||||
return Err(ShellError::IncompatibleParametersSingle {
|
||||
msg: "Only one stream may be checked".into(),
|
||||
span: Span::merge_many(call.arguments.iter().map(|arg| arg.span())),
|
||||
span: Span::merge_many(
|
||||
call.arguments
|
||||
.item
|
||||
.iter()
|
||||
.map(|arg| arg.span(&engine_state)),
|
||||
),
|
||||
});
|
||||
}
|
||||
};
|
||||
|
@ -375,8 +375,12 @@ fn write_pipeline_data(
|
||||
Arc::make_mut(&mut engine_state.config).use_ansi_coloring = false;
|
||||
|
||||
// Invoke the `table` command.
|
||||
let output =
|
||||
crate::Table.run(&engine_state, &mut stack, &Call::new(Span::unknown()), data)?;
|
||||
let output = crate::Table.run(
|
||||
&engine_state,
|
||||
&mut stack,
|
||||
&Call::new(Span::unknown(), Span::unknown()),
|
||||
data,
|
||||
)?;
|
||||
|
||||
// Write the output.
|
||||
for value in output {
|
||||
|
@ -127,7 +127,7 @@ impl Command for Table {
|
||||
return Ok(val.into_pipeline_data());
|
||||
}
|
||||
|
||||
let cfg = parse_table_config(call, engine_state, stack)?;
|
||||
let cfg = parse_table_config(engine_state, call, engine_state, stack)?;
|
||||
let input = CmdInput::new(engine_state, stack, call, input);
|
||||
|
||||
// reset vt processing, aka ansi because illbehaved externals can break it
|
||||
@ -247,6 +247,7 @@ impl TableConfig {
|
||||
}
|
||||
|
||||
fn parse_table_config(
|
||||
engine_state: &EngineState,
|
||||
call: &Call,
|
||||
state: &EngineState,
|
||||
stack: &mut Stack,
|
||||
@ -269,9 +270,9 @@ fn parse_table_config(
|
||||
flatten_separator,
|
||||
},
|
||||
};
|
||||
let theme =
|
||||
get_theme_flag(call, state, stack)?.unwrap_or_else(|| get_config(state, stack).table_mode);
|
||||
let index = get_index_flag(call, state, stack)?;
|
||||
let theme = get_theme_flag(engine_state, call, state, stack)?
|
||||
.unwrap_or_else(|| get_config(state, stack).table_mode);
|
||||
let index = get_index_flag(engine_state, call, state, stack)?;
|
||||
|
||||
let term_width = get_width_param(width_param);
|
||||
|
||||
@ -285,6 +286,7 @@ fn parse_table_config(
|
||||
}
|
||||
|
||||
fn get_index_flag(
|
||||
engine_state: &EngineState,
|
||||
call: &Call,
|
||||
state: &EngineState,
|
||||
stack: &mut Stack,
|
||||
@ -308,7 +310,7 @@ fn get_index_flag(
|
||||
Err(ShellError::UnsupportedInput {
|
||||
msg: String::from("got a negative integer"),
|
||||
input: val.to_string(),
|
||||
msg_span: call.span(),
|
||||
msg_span: call.span(&engine_state),
|
||||
input_span: internal_span,
|
||||
})
|
||||
} else {
|
||||
@ -319,13 +321,14 @@ fn get_index_flag(
|
||||
_ => Err(ShellError::CantConvert {
|
||||
to_type: String::from("index"),
|
||||
from_type: String::new(),
|
||||
span: call.span(),
|
||||
span: call.span(&engine_state),
|
||||
help: Some(String::from("supported values: [bool, int, nothing]")),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
fn get_theme_flag(
|
||||
engine_state: &EngineState,
|
||||
call: &Call,
|
||||
state: &EngineState,
|
||||
stack: &mut Stack,
|
||||
@ -335,7 +338,7 @@ fn get_theme_flag(
|
||||
TableMode::from_str(&theme).map_err(|err| ShellError::CantConvert {
|
||||
to_type: String::from("theme"),
|
||||
from_type: String::from("string"),
|
||||
span: call.span(),
|
||||
span: call.span(&engine_state),
|
||||
help: Some(format!("{}, but found '{}'.", err, theme)),
|
||||
})
|
||||
})
|
||||
|
Reference in New Issue
Block a user