mirror of
https://github.com/nushell/nushell.git
synced 2025-01-19 12:51:23 +01:00
fix: unknown span for special variables $in/$it
(#14789)
<!-- 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 addresses the issue of inconsistent spans of special variables of `$in/$in`, as discussed in https://github.com/nushell/nushell/pull/14770#discussion_r1908729364. Instead of making the `declaration_span` to be Option, which will cause too many changes that we may want to avoid, this PR set the spans to be `unknown`. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> No # 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:
parent
b9b3101bd9
commit
827e31191d
@ -118,10 +118,6 @@ impl SymbolCache {
|
||||
}
|
||||
let range = span_to_range(&span, doc, doc_span.start);
|
||||
let name = doc.get_content(Some(range));
|
||||
// TODO: better way to filter closures with type any
|
||||
if name.contains('\r') || name.contains('\n') || name.contains('{') {
|
||||
return None;
|
||||
}
|
||||
Some(Symbol {
|
||||
name: name.to_string(),
|
||||
kind: SymbolKind::VARIABLE,
|
||||
@ -343,6 +339,29 @@ mod tests {
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
#[test]
|
||||
// for variable `$in/$it`, should not appear in symbols
|
||||
fn document_symbol_special_variables() {
|
||||
let (client_connection, _recv) = initialize_language_server();
|
||||
|
||||
let mut script = fixtures();
|
||||
script.push("lsp");
|
||||
script.push("symbols");
|
||||
script.push("span.nu");
|
||||
let script = path_to_uri(&script);
|
||||
|
||||
open_unchecked(&client_connection, script.clone());
|
||||
|
||||
let resp = document_symbol_test(&client_connection, script.clone());
|
||||
let result = if let Message::Response(response) = resp {
|
||||
response.result
|
||||
} else {
|
||||
panic!()
|
||||
};
|
||||
|
||||
assert_json_eq!(result, serde_json::json!([]));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn document_symbol_basic() {
|
||||
let (client_connection, _recv) = initialize_language_server();
|
||||
|
@ -3435,7 +3435,7 @@ pub fn parse_full_signature(working_set: &mut StateWorkingSet, spans: &[Span]) -
|
||||
}
|
||||
|
||||
pub fn parse_row_condition(working_set: &mut StateWorkingSet, spans: &[Span]) -> Expression {
|
||||
let var_id = working_set.add_variable(b"$it".to_vec(), Span::concat(spans), Type::Any, false);
|
||||
let var_id = working_set.add_variable(b"$it".to_vec(), Span::unknown(), Type::Any, false);
|
||||
let expression = parse_math_expression(working_set, spans, Some(var_id));
|
||||
let span = Span::concat(spans);
|
||||
|
||||
@ -6633,7 +6633,7 @@ fn wrap_expr_with_collect(working_set: &mut StateWorkingSet, expr: Expression) -
|
||||
|
||||
// IN_VARIABLE_ID should get replaced with a unique variable, so that we don't have to
|
||||
// execute as a closure
|
||||
let var_id = working_set.add_variable(b"$in".into(), expr.span, Type::Any, false);
|
||||
let var_id = working_set.add_variable(b"$in".into(), Span::unknown(), Type::Any, false);
|
||||
let mut expr = expr.clone();
|
||||
expr.replace_in_variable(working_set, var_id);
|
||||
|
||||
|
3
tests/fixtures/lsp/symbols/span.nu
vendored
Normal file
3
tests/fixtures/lsp/symbols/span.nu
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
ls | where name != foo
|
||||
ls | each { $in }
|
||||
ls | $in.name
|
Loading…
Reference in New Issue
Block a user