mirror of
https://github.com/nushell/nushell.git
synced 2025-04-11 23:08:20 +02:00
fix(parser): missing span of the entire block of a module file (#14889)
<!-- 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. --> A simple method found by @tmillr to solve [this issue](https://github.com/nushell/nushell/discussions/14854) # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # 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 > ``` --> I didn't find a suitable place in `nu-parser` to add the test case, placed in `nu-lsp` instead. # 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:
parent
9a0ae7c4c0
commit
73c08fcb2b
@ -373,6 +373,8 @@ mod tests {
|
||||
ReferenceContext, ReferenceParams, TextDocumentIdentifier, TextDocumentPositionParams, Uri,
|
||||
WorkDoneProgressParams, WorkspaceFolder,
|
||||
};
|
||||
use nu_parser::parse;
|
||||
use nu_protocol::engine::StateWorkingSet;
|
||||
use nu_test_support::fs::fixtures;
|
||||
|
||||
use crate::path_to_uri;
|
||||
@ -774,4 +776,31 @@ mod tests {
|
||||
panic!()
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn existence_of_module_block() {
|
||||
let mut script_path = fixtures();
|
||||
script_path.push("lsp");
|
||||
script_path.push("workspace");
|
||||
let mut engine_state = nu_cmd_lang::create_default_context();
|
||||
engine_state.add_env_var(
|
||||
"PWD".into(),
|
||||
nu_protocol::Value::test_string(script_path.to_str().unwrap()),
|
||||
);
|
||||
script_path.push("bar.nu");
|
||||
let mut working_set = StateWorkingSet::new(&engine_state);
|
||||
parse(
|
||||
&mut working_set,
|
||||
script_path.to_str(),
|
||||
std::fs::read(script_path.clone()).unwrap().as_slice(),
|
||||
false,
|
||||
);
|
||||
|
||||
script_path.pop();
|
||||
script_path.push("foo.nu");
|
||||
let span_foo = working_set
|
||||
.get_span_for_filename(script_path.to_str().unwrap())
|
||||
.unwrap();
|
||||
assert!(working_set.find_block_by_span(span_foo).is_some())
|
||||
}
|
||||
}
|
||||
|
@ -1742,6 +1742,7 @@ pub fn parse_module_block(
|
||||
let mut module = Module::from_span(module_name.to_vec(), span);
|
||||
|
||||
let mut block = Block::new_with_capacity(output.block.len());
|
||||
block.span = Some(span);
|
||||
|
||||
for pipeline in output.block.iter() {
|
||||
if pipeline.commands.len() == 1 {
|
||||
|
Loading…
Reference in New Issue
Block a user