2022-08-23 16:24:24 +02:00
|
|
|
pub mod support;
|
|
|
|
|
|
|
|
use nu_cli::NuCompleter;
|
2024-04-21 07:03:33 +02:00
|
|
|
use nu_engine::eval_block;
|
2022-08-23 16:24:24 +02:00
|
|
|
use nu_parser::parse;
|
2024-04-21 07:03:33 +02:00
|
|
|
use nu_protocol::{debugger::WithoutDebug, engine::StateWorkingSet, PipelineData};
|
2022-08-23 16:24:24 +02:00
|
|
|
use reedline::{Completer, Suggestion};
|
|
|
|
use rstest::{fixture, rstest};
|
2024-05-09 07:38:24 +02:00
|
|
|
use std::{
|
|
|
|
path::{PathBuf, MAIN_SEPARATOR},
|
|
|
|
sync::Arc,
|
|
|
|
};
|
2023-10-02 19:44:51 +02:00
|
|
|
use support::{
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
completions_helpers::{new_dotnu_engine, new_partial_engine, new_quote_engine},
|
2023-10-02 19:44:51 +02:00
|
|
|
file, folder, match_suggestions, new_engine,
|
|
|
|
};
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
#[fixture]
|
|
|
|
fn completer() -> NuCompleter {
|
|
|
|
// Create a new engine
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Add record value as example
|
|
|
|
let record = "def tst [--mod -s] {}";
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
NuCompleter::new(Arc::new(engine), Arc::new(stack))
|
2022-08-23 16:24:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[fixture]
|
|
|
|
fn completer_strings() -> NuCompleter {
|
|
|
|
// Create a new engine
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Add record value as example
|
|
|
|
let record = r#"def animals [] { ["cat", "dog", "eel" ] }
|
|
|
|
def my-command [animal: string@animals] { print $animal }"#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
NuCompleter::new(Arc::new(engine), Arc::new(stack))
|
2022-08-23 16:24:24 +02:00
|
|
|
}
|
|
|
|
|
2022-12-21 23:33:26 +01:00
|
|
|
#[fixture]
|
|
|
|
fn extern_completer() -> NuCompleter {
|
|
|
|
// Create a new engine
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2022-12-21 23:33:26 +01:00
|
|
|
|
|
|
|
// Add record value as example
|
|
|
|
let record = r#"
|
|
|
|
def animals [] { [ "cat", "dog", "eel" ] }
|
|
|
|
extern spam [
|
|
|
|
animal: string@animals
|
|
|
|
--foo (-f): string@animals
|
|
|
|
-b: string@animals
|
|
|
|
]
|
|
|
|
"#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2022-12-21 23:33:26 +01:00
|
|
|
|
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
NuCompleter::new(Arc::new(engine), Arc::new(stack))
|
2022-12-21 23:33:26 +01:00
|
|
|
}
|
|
|
|
|
2023-11-29 23:17:06 +01:00
|
|
|
#[fixture]
|
|
|
|
fn custom_completer() -> NuCompleter {
|
|
|
|
// Create a new engine
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2023-11-29 23:17:06 +01:00
|
|
|
|
|
|
|
// Add record value as example
|
|
|
|
let record = r#"
|
2024-01-17 16:40:59 +01:00
|
|
|
let external_completer = {|spans|
|
2023-11-29 23:17:06 +01:00
|
|
|
$spans
|
|
|
|
}
|
|
|
|
|
|
|
|
$env.config.completions.external = {
|
|
|
|
enable: true
|
|
|
|
max_results: 100
|
|
|
|
completer: $external_completer
|
|
|
|
}
|
|
|
|
"#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2023-11-29 23:17:06 +01:00
|
|
|
|
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
NuCompleter::new(Arc::new(engine), Arc::new(stack))
|
2023-11-29 23:17:06 +01:00
|
|
|
}
|
|
|
|
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
#[fixture]
|
|
|
|
fn subcommand_completer() -> NuCompleter {
|
|
|
|
// Create a new engine
|
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
|
|
|
|
|
|
|
// Use fuzzy matching, because subcommands are sorted by Levenshtein distance,
|
|
|
|
// and that's not very useful with prefix matching
|
|
|
|
let commands = r#"
|
|
|
|
$env.config.completions.algorithm = "fuzzy"
|
|
|
|
def foo [] {}
|
|
|
|
def "foo bar" [] {}
|
|
|
|
def "foo abaz" [] {}
|
|
|
|
def "foo aabrr" [] {}
|
|
|
|
def food [] {}
|
|
|
|
"#;
|
|
|
|
assert!(support::merge_input(commands.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
|
|
|
|
|
|
|
// Instantiate a new completer
|
|
|
|
NuCompleter::new(Arc::new(engine), Arc::new(stack))
|
|
|
|
}
|
|
|
|
|
2022-09-22 20:50:16 +02:00
|
|
|
#[test]
|
2024-07-06 00:58:35 +02:00
|
|
|
fn variables_dollar_sign_with_variablecompletion() {
|
2022-09-22 20:50:16 +02:00
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-09-22 20:50:16 +02:00
|
|
|
|
|
|
|
let target_dir = "$ ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
2023-12-19 10:14:34 +01:00
|
|
|
assert_eq!(8, suggestions.len());
|
2022-09-22 20:50:16 +02:00
|
|
|
}
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
#[rstest]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn variables_double_dash_argument_with_flagcompletion(mut completer: NuCompleter) {
|
2022-08-23 16:24:24 +02:00
|
|
|
let suggestions = completer.complete("tst --", 6);
|
|
|
|
let expected: Vec<String> = vec!["--help".into(), "--mod".into()];
|
|
|
|
// dbg!(&expected, &suggestions);
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn variables_single_dash_argument_with_flagcompletion(mut completer: NuCompleter) {
|
2022-08-23 16:24:24 +02:00
|
|
|
let suggestions = completer.complete("tst -", 5);
|
|
|
|
let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn variables_command_with_commandcompletion(mut completer_strings: NuCompleter) {
|
2022-09-29 10:43:58 +02:00
|
|
|
let suggestions = completer_strings.complete("my-c ", 4);
|
2022-08-23 16:24:24 +02:00
|
|
|
let expected: Vec<String> = vec!["my-command".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn variables_subcommands_with_customcompletion(mut completer_strings: NuCompleter) {
|
2022-08-23 16:24:24 +02:00
|
|
|
let suggestions = completer_strings.complete("my-command ", 11);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn variables_customcompletion_subcommands_with_customcompletion_2(
|
|
|
|
mut completer_strings: NuCompleter,
|
|
|
|
) {
|
2022-08-23 16:24:24 +02:00
|
|
|
let suggestions = completer_strings.complete("my-command ", 11);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn dotnu_completions() {
|
|
|
|
// Create a new engine
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
let (_, _, engine, stack) = new_dotnu_engine();
|
2022-08-23 16:24:24 +02:00
|
|
|
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 08:31:26 +01:00
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
let expected = vec![
|
|
|
|
"asdf.nu".into(),
|
|
|
|
"bar.nu".into(),
|
|
|
|
"bat.nu".into(),
|
|
|
|
"baz.nu".into(),
|
|
|
|
#[cfg(windows)]
|
|
|
|
"dir_module\\".into(),
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
"dir_module/".into(),
|
|
|
|
"foo.nu".into(),
|
|
|
|
"spam.nu".into(),
|
|
|
|
"xyzzy.nu".into(),
|
|
|
|
];
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
// Test source completion
|
2022-08-31 22:32:56 +02:00
|
|
|
let completion_str = "source-env ".to_string();
|
2022-08-23 16:24:24 +02:00
|
|
|
let suggestions = completer.complete(&completion_str, completion_str.len());
|
|
|
|
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
match_suggestions(expected.clone(), suggestions);
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Test use completion
|
|
|
|
let completion_str = "use ".to_string();
|
|
|
|
let suggestions = completer.complete(&completion_str, completion_str.len());
|
|
|
|
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
match_suggestions(expected.clone(), suggestions);
|
2023-12-19 10:14:34 +01:00
|
|
|
|
|
|
|
// Test overlay use completion
|
|
|
|
let completion_str = "overlay use ".to_string();
|
|
|
|
let suggestions = completer.complete(&completion_str, completion_str.len());
|
|
|
|
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
match_suggestions(expected, suggestions);
|
2022-08-23 16:24:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
#[ignore]
|
|
|
|
fn external_completer_trailing_space() {
|
|
|
|
// https://github.com/nushell/nushell/issues/6378
|
2024-04-21 07:03:33 +02:00
|
|
|
let block = "{|spans| $spans}";
|
2022-08-23 16:24:24 +02:00
|
|
|
let input = "gh alias ".to_string();
|
|
|
|
|
2022-09-25 22:06:13 +02:00
|
|
|
let suggestions = run_external_completion(block, &input);
|
2022-08-23 16:24:24 +02:00
|
|
|
assert_eq!(3, suggestions.len());
|
2023-11-17 16:15:55 +01:00
|
|
|
assert_eq!("gh", suggestions.first().unwrap().value);
|
2022-08-23 16:24:24 +02:00
|
|
|
assert_eq!("alias", suggestions.get(1).unwrap().value);
|
|
|
|
assert_eq!("", suggestions.get(2).unwrap().value);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn external_completer_no_trailing_space() {
|
2023-07-03 07:45:10 +02:00
|
|
|
let block = "{|spans| $spans}";
|
2022-08-23 16:24:24 +02:00
|
|
|
let input = "gh alias".to_string();
|
|
|
|
|
2022-09-25 22:06:13 +02:00
|
|
|
let suggestions = run_external_completion(block, &input);
|
2022-08-23 16:24:24 +02:00
|
|
|
assert_eq!(2, suggestions.len());
|
2023-11-17 16:15:55 +01:00
|
|
|
assert_eq!("gh", suggestions.first().unwrap().value);
|
2022-08-23 16:24:24 +02:00
|
|
|
assert_eq!("alias", suggestions.get(1).unwrap().value);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn external_completer_pass_flags() {
|
2023-07-03 07:45:10 +02:00
|
|
|
let block = "{|spans| $spans}";
|
2022-08-23 16:24:24 +02:00
|
|
|
let input = "gh api --".to_string();
|
|
|
|
|
2022-09-25 22:06:13 +02:00
|
|
|
let suggestions = run_external_completion(block, &input);
|
2022-08-23 16:24:24 +02:00
|
|
|
assert_eq!(3, suggestions.len());
|
2023-11-17 16:15:55 +01:00
|
|
|
assert_eq!("gh", suggestions.first().unwrap().value);
|
2022-08-23 16:24:24 +02:00
|
|
|
assert_eq!("api", suggestions.get(1).unwrap().value);
|
|
|
|
assert_eq!("--", suggestions.get(2).unwrap().value);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn file_completions() {
|
|
|
|
// Create a new engine
|
|
|
|
let (dir, dir_str, engine, stack) = new_engine();
|
|
|
|
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 08:31:26 +01:00
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Test completions for the current folder
|
Migrate to a new PWD API (#12603)
This is the first PR towards migrating to a new `$env.PWD` API that
returns potentially un-canonicalized paths. Refer to PR #12515 for
motivations.
## New API: `EngineState::cwd()`
The goal of the new API is to cover both parse-time and runtime use
case, and avoid unintentional misuse. It takes an `Option<Stack>` as
argument, which if supplied, will search for `$env.PWD` on the stack in
additional to the engine state. I think with this design, there's less
confusion over parse-time and runtime environments. If you have access
to a stack, just supply it; otherwise supply `None`.
## Deprecation of other PWD-related APIs
Other APIs are re-implemented using `EngineState::cwd()` and properly
documented. They're marked deprecated, but their behavior is unchanged.
Unused APIs are deleted, and code that accesses `$env.PWD` directly
without using an API is rewritten.
Deprecated APIs:
* `EngineState::current_work_dir()`
* `StateWorkingSet::get_cwd()`
* `env::current_dir()`
* `env::current_dir_str()`
* `env::current_dir_const()`
* `env::current_dir_str_const()`
Other changes:
* `EngineState::get_cwd()` (deleted)
* `StateWorkingSet::list_env()` (deleted)
* `repl::do_run_cmd()` (rewritten with `env::current_dir_str()`)
## `cd` and `pwd` now use logical paths by default
This pulls the changes from PR #12515. It's currently somewhat broken
because using non-canonicalized paths exposed a bug in our path
normalization logic (Issue #12602). Once that is fixed, this should
work.
## Future plans
This PR needs some tests. Which test helpers should I use, and where
should I put those tests?
I noticed that unquoted paths are expanded within `eval_filepath()` and
`eval_directory()` before they even reach the `cd` command. This means
every paths is expanded twice. Is this intended?
Once this PR lands, the plan is to review all usages of the deprecated
APIs and migrate them to `EngineState::cwd()`. In the meantime, these
usages are annotated with `#[allow(deprecated)]` to avoid breaking CI.
---------
Co-authored-by: Jakub Žádník <kubouch@gmail.com>
2024-05-03 13:33:09 +02:00
|
|
|
let target_dir = format!("cp {dir_str}{MAIN_SEPARATOR}");
|
2022-08-23 16:24:24 +02:00
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
folder(dir.join("another")),
|
|
|
|
file(dir.join("custom_completion.nu")),
|
2023-12-19 10:14:34 +01:00
|
|
|
folder(dir.join("directory_completion")),
|
2022-08-23 16:24:24 +02:00
|
|
|
file(dir.join("nushell")),
|
|
|
|
folder(dir.join("test_a")),
|
|
|
|
folder(dir.join("test_b")),
|
|
|
|
file(dir.join(".hidden_file")),
|
|
|
|
folder(dir.join(".hidden_folder")),
|
|
|
|
];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
// Test completions for a file
|
|
|
|
let target_dir = format!("cp {}", folder(dir.join("another")));
|
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![file(dir.join("another").join("newfile"))];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
2024-02-26 19:14:19 +01:00
|
|
|
|
|
|
|
// Test completions for hidden files
|
|
|
|
let target_dir = format!("ls {}/.", folder(dir.join(".hidden_folder")));
|
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
let expected_paths: Vec<String> =
|
|
|
|
vec![file(dir.join(".hidden_folder").join(".hidden_subfile"))];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
2022-08-23 16:24:24 +02:00
|
|
|
}
|
|
|
|
|
2023-10-02 19:44:51 +02:00
|
|
|
#[test]
|
|
|
|
fn partial_completions() {
|
|
|
|
// Create a new engine
|
|
|
|
let (dir, _, engine, stack) = new_partial_engine();
|
|
|
|
|
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2023-10-02 19:44:51 +02:00
|
|
|
|
|
|
|
// Test completions for a folder's name
|
|
|
|
let target_dir = format!("cd {}", file(dir.join("pa")));
|
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
folder(dir.join("partial")),
|
|
|
|
folder(dir.join("partial-a")),
|
|
|
|
folder(dir.join("partial-b")),
|
|
|
|
folder(dir.join("partial-c")),
|
2023-10-02 19:44:51 +02:00
|
|
|
];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
// Test completions for the files whose name begin with "h"
|
|
|
|
// and are present under directories whose names begin with "pa"
|
|
|
|
let dir_str = file(dir.join("pa").join("h"));
|
|
|
|
let target_dir = format!("cp {dir_str}");
|
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
file(dir.join("partial").join("hello.txt")),
|
|
|
|
file(dir.join("partial-a").join("have_ext.exe")),
|
|
|
|
file(dir.join("partial-a").join("have_ext.txt")),
|
|
|
|
file(dir.join("partial-a").join("hello")),
|
|
|
|
file(dir.join("partial-a").join("hola")),
|
|
|
|
file(dir.join("partial-b").join("hello_b")),
|
|
|
|
file(dir.join("partial-b").join("hi_b")),
|
|
|
|
file(dir.join("partial-c").join("hello_c")),
|
2023-10-02 19:44:51 +02:00
|
|
|
];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
// Test completion for all files under directories whose names begin with "pa"
|
|
|
|
let dir_str = folder(dir.join("pa"));
|
|
|
|
let target_dir = format!("ls {dir_str}");
|
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
file(dir.join("partial").join("hello.txt")),
|
|
|
|
file(dir.join("partial-a").join("anotherfile")),
|
|
|
|
file(dir.join("partial-a").join("have_ext.exe")),
|
|
|
|
file(dir.join("partial-a").join("have_ext.txt")),
|
|
|
|
file(dir.join("partial-a").join("hello")),
|
|
|
|
file(dir.join("partial-a").join("hola")),
|
|
|
|
file(dir.join("partial-b").join("hello_b")),
|
|
|
|
file(dir.join("partial-b").join("hi_b")),
|
|
|
|
file(dir.join("partial-c").join("hello_c")),
|
2023-10-02 19:44:51 +02:00
|
|
|
];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
// Test completion for a single file
|
|
|
|
let dir_str = file(dir.join("fi").join("so"));
|
|
|
|
let target_dir = format!("rm {dir_str}");
|
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![file(dir.join("final_partial").join("somefile"))];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
// Test completion where there is a sneaky `..` in the path
|
|
|
|
let dir_str = file(dir.join("par").join("..").join("fi").join("so"));
|
|
|
|
let target_dir = format!("rm {dir_str}");
|
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
2024-05-04 03:17:50 +02:00
|
|
|
let expected_paths: Vec<String> = vec![
|
|
|
|
file(
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
dir.join("partial")
|
|
|
|
.join("..")
|
|
|
|
.join("final_partial")
|
|
|
|
.join("somefile"),
|
|
|
|
),
|
|
|
|
file(
|
|
|
|
dir.join("partial-a")
|
2024-05-04 03:17:50 +02:00
|
|
|
.join("..")
|
|
|
|
.join("final_partial")
|
|
|
|
.join("somefile"),
|
|
|
|
),
|
|
|
|
file(
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
dir.join("partial-b")
|
2024-05-04 03:17:50 +02:00
|
|
|
.join("..")
|
|
|
|
.join("final_partial")
|
|
|
|
.join("somefile"),
|
|
|
|
),
|
|
|
|
file(
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
dir.join("partial-c")
|
2024-05-04 03:17:50 +02:00
|
|
|
.join("..")
|
|
|
|
.join("final_partial")
|
|
|
|
.join("somefile"),
|
|
|
|
),
|
|
|
|
];
|
2023-10-02 19:44:51 +02:00
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
2024-05-23 04:47:06 +02:00
|
|
|
|
|
|
|
// Test completion for all files under directories whose names begin with "pa"
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
let file_str = file(dir.join("partial-a").join("have"));
|
2024-05-23 04:47:06 +02:00
|
|
|
let target_file = format!("rm {file_str}");
|
|
|
|
let suggestions = completer.complete(&target_file, target_file.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
file(dir.join("partial-a").join("have_ext.exe")),
|
|
|
|
file(dir.join("partial-a").join("have_ext.txt")),
|
2024-05-23 04:47:06 +02:00
|
|
|
];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
// Test completion for all files under directories whose names begin with "pa"
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
let file_str = file(dir.join("partial-a").join("have_ext."));
|
2024-05-23 04:47:06 +02:00
|
|
|
let file_dir = format!("rm {file_str}");
|
|
|
|
let suggestions = completer.complete(&file_dir, file_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
file(dir.join("partial-a").join("have_ext.exe")),
|
|
|
|
file(dir.join("partial-a").join("have_ext.txt")),
|
2024-05-23 04:47:06 +02:00
|
|
|
];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
2023-10-02 19:44:51 +02:00
|
|
|
}
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
#[test]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn command_ls_with_filecompletion() {
|
2022-08-23 16:24:24 +02:00
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let target_dir = "ls ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
2024-05-23 04:47:06 +02:00
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
let target_dir = "ls custom_completion.";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
let expected_paths: Vec<String> = vec!["custom_completion.nu".to_string()];
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
#[test]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn command_open_with_filecompletion() {
|
2022-08-23 16:24:24 +02:00
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let target_dir = "open ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
2024-05-23 04:47:06 +02:00
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
let target_dir = "open custom_completion.";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
let expected_paths: Vec<String> = vec!["custom_completion.nu".to_string()];
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn command_rm_with_globcompletion() {
|
2022-08-23 16:24:24 +02:00
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let target_dir = "rm ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn command_cp_with_globcompletion() {
|
2022-08-23 16:24:24 +02:00
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let target_dir = "cp ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn command_save_with_filecompletion() {
|
2022-08-23 16:24:24 +02:00
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let target_dir = "save ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn command_touch_with_filecompletion() {
|
2022-08-23 16:24:24 +02:00
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let target_dir = "touch ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn command_watch_with_filecompletion() {
|
2022-08-23 16:24:24 +02:00
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let target_dir = "watch ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
#[rstest]
|
|
|
|
fn subcommand_completions(mut subcommand_completer: NuCompleter) {
|
|
|
|
let prefix = "foo br";
|
|
|
|
let suggestions = subcommand_completer.complete(prefix, prefix.len());
|
|
|
|
match_suggestions(
|
|
|
|
vec!["foo bar".to_string(), "foo aabrr".to_string()],
|
|
|
|
suggestions,
|
|
|
|
);
|
|
|
|
|
|
|
|
let prefix = "foo b";
|
|
|
|
let suggestions = subcommand_completer.complete(prefix, prefix.len());
|
|
|
|
match_suggestions(
|
|
|
|
vec![
|
|
|
|
"foo bar".to_string(),
|
|
|
|
"foo abaz".to_string(),
|
|
|
|
"foo aabrr".to_string(),
|
|
|
|
],
|
|
|
|
suggestions,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2022-12-08 21:37:10 +01:00
|
|
|
#[test]
|
|
|
|
fn file_completion_quoted() {
|
|
|
|
let (_, _, engine, stack) = new_quote_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-12-08 21:37:10 +01:00
|
|
|
|
|
|
|
let target_dir = "open ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-10-18 23:02:11 +02:00
|
|
|
"`--help`".to_string(),
|
|
|
|
"`-42`".to_string(),
|
|
|
|
"`-inf`".to_string(),
|
|
|
|
"`4.2`".to_string(),
|
Force completers to sort in fetch() (#13242)
<!--
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 fixes the problem pointed out in
https://github.com/nushell/nushell/issues/13204, where the Fish-like
completions aren't sorted properly (this PR doesn't close that issue
because the author there wants more than just fixed sort order).
The cause is all of the file/directory completions being fetched first
and then sorted all together while being treated as strings. Instead,
this PR sorts completions within each individual directory, avoiding
treating `/` as part of the path.
To do this, I removed the `sort` method from the completer trait (as
well as `get_sort_by`) and made all completers sort within the `fetch`
method itself. A generic `sort_completions` helper has been added to
sort lists of completions, and a more specific `sort_suggestions` helper
has been added to sort `Vec<Suggestion>`s.
As for the actual change that fixes the sort order for file/directory
completions, the `complete_rec` helper now sorts the children of each
directory before visiting their children. The file and directory
completers don't bother sorting at the end (except to move hidden files
down).
To reviewers: don't let the 29 changed files scare you, most of those
are just the test fixtures :)
# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->
This is the current behavior with prefix matching:
![image](https://github.com/nushell/nushell/assets/45539777/6a36e003-8405-45b5-8cbe-d771e0592709)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/f2cbfdb2-b8fd-491b-a378-779147291d2a)
Notice how `partial/hello.txt` is the last suggestion, even though it
should come before `partial-a`. This is because the ASCII code for `/`
is greater than that of `-`, so `partial-` is put before `partial/`.
This is this PR's behavior with prefix matching (`partial/hello.txt` is
at the start):
![image](https://github.com/nushell/nushell/assets/45539777/3fcea7c9-e017-428f-aa9c-1707e3ab32e0)
And with fuzzy matching:
![image](https://github.com/nushell/nushell/assets/45539777/d55635d4-cdb8-440a-84d6-41111499f9f8)
# 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
> ```
-->
- Modified the partial completions test fixture to test whether this PR
even fixed anything
- Modified fixture to test sort order of .nu completions (a previous
version of my changes didn't sort all the completions at the end but
there were no tests catching that)
- Added a test for making sure subcommand completions are sorted by
Levenshtein distance (a previous version of my changes sorted in
alphabetical order but there were no tests catching that)
# 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.
-->
2024-07-03 13:48:06 +02:00
|
|
|
"\'[a] bc.txt\'".to_string(),
|
2022-12-08 21:37:10 +01:00
|
|
|
"`te st.txt`".to_string(),
|
|
|
|
"`te#st.txt`".to_string(),
|
|
|
|
"`te'st.txt`".to_string(),
|
2023-01-10 20:41:54 +01:00
|
|
|
"`te(st).txt`".to_string(),
|
2023-10-06 18:45:30 +02:00
|
|
|
format!("`{}`", folder("test dir".into())),
|
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
|
|
|
|
let dir: PathBuf = "test dir".into();
|
|
|
|
let target_dir = format!("open '{}'", folder(dir.clone()));
|
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
let expected_paths: Vec<String> = vec![
|
|
|
|
format!("`{}`", file(dir.join("double quote"))),
|
|
|
|
format!("`{}`", file(dir.join("single quote"))),
|
2022-12-08 21:37:10 +01:00
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
#[test]
|
|
|
|
fn flag_completions() {
|
|
|
|
// Create a new engine
|
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 08:31:26 +01:00
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
// Test completions for the 'ls' flags
|
|
|
|
let suggestions = completer.complete("ls -", 4);
|
|
|
|
|
2022-12-27 19:46:23 +01:00
|
|
|
assert_eq!(16, suggestions.len());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let expected: Vec<String> = vec![
|
|
|
|
"--all".into(),
|
|
|
|
"--directory".into(),
|
|
|
|
"--du".into(),
|
|
|
|
"--full-paths".into(),
|
|
|
|
"--help".into(),
|
|
|
|
"--long".into(),
|
2022-12-27 19:46:23 +01:00
|
|
|
"--mime-type".into(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"--short-names".into(),
|
|
|
|
"-D".into(),
|
|
|
|
"-a".into(),
|
|
|
|
"-d".into(),
|
|
|
|
"-f".into(),
|
|
|
|
"-h".into(),
|
|
|
|
"-l".into(),
|
2022-12-27 19:46:23 +01:00
|
|
|
"-m".into(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"-s".into(),
|
|
|
|
];
|
|
|
|
|
|
|
|
// Match results
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2022-09-22 20:50:16 +02:00
|
|
|
fn folder_with_directorycompletions() {
|
2022-08-23 16:24:24 +02:00
|
|
|
// Create a new engine
|
|
|
|
let (dir, dir_str, engine, stack) = new_engine();
|
|
|
|
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 08:31:26 +01:00
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Test completions for the current folder
|
Migrate to a new PWD API (#12603)
This is the first PR towards migrating to a new `$env.PWD` API that
returns potentially un-canonicalized paths. Refer to PR #12515 for
motivations.
## New API: `EngineState::cwd()`
The goal of the new API is to cover both parse-time and runtime use
case, and avoid unintentional misuse. It takes an `Option<Stack>` as
argument, which if supplied, will search for `$env.PWD` on the stack in
additional to the engine state. I think with this design, there's less
confusion over parse-time and runtime environments. If you have access
to a stack, just supply it; otherwise supply `None`.
## Deprecation of other PWD-related APIs
Other APIs are re-implemented using `EngineState::cwd()` and properly
documented. They're marked deprecated, but their behavior is unchanged.
Unused APIs are deleted, and code that accesses `$env.PWD` directly
without using an API is rewritten.
Deprecated APIs:
* `EngineState::current_work_dir()`
* `StateWorkingSet::get_cwd()`
* `env::current_dir()`
* `env::current_dir_str()`
* `env::current_dir_const()`
* `env::current_dir_str_const()`
Other changes:
* `EngineState::get_cwd()` (deleted)
* `StateWorkingSet::list_env()` (deleted)
* `repl::do_run_cmd()` (rewritten with `env::current_dir_str()`)
## `cd` and `pwd` now use logical paths by default
This pulls the changes from PR #12515. It's currently somewhat broken
because using non-canonicalized paths exposed a bug in our path
normalization logic (Issue #12602). Once that is fixed, this should
work.
## Future plans
This PR needs some tests. Which test helpers should I use, and where
should I put those tests?
I noticed that unquoted paths are expanded within `eval_filepath()` and
`eval_directory()` before they even reach the `cd` command. This means
every paths is expanded twice. Is this intended?
Once this PR lands, the plan is to review all usages of the deprecated
APIs and migrate them to `EngineState::cwd()`. In the meantime, these
usages are annotated with `#[allow(deprecated)]` to avoid breaking CI.
---------
Co-authored-by: Jakub Žádník <kubouch@gmail.com>
2024-05-03 13:33:09 +02:00
|
|
|
let target_dir = format!("cd {dir_str}{MAIN_SEPARATOR}");
|
2022-08-23 16:24:24 +02:00
|
|
|
let suggestions = completer.complete(&target_dir, target_dir.len());
|
|
|
|
|
|
|
|
// Create the expected values
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
folder(dir.join("another")),
|
2023-12-19 10:14:34 +01:00
|
|
|
folder(dir.join("directory_completion")),
|
2022-08-23 16:24:24 +02:00
|
|
|
folder(dir.join("test_a")),
|
|
|
|
folder(dir.join("test_b")),
|
|
|
|
folder(dir.join(".hidden_folder")),
|
|
|
|
];
|
|
|
|
|
|
|
|
// Match the results
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn variables_completions() {
|
|
|
|
// Create a new engine
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Add record value as example
|
|
|
|
let record = "let actor = { name: 'Tom Hardy', age: 44 }";
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(record.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 08:31:26 +01:00
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Test completions for $nu
|
|
|
|
let suggestions = completer.complete("$nu.", 4);
|
|
|
|
|
add a system level folder for future autoloading (#13180)
# Description
This PR adds a directory to the `$nu` constant that shows where the
system level autoload directory is located at. This folder is modifiable
at compile time with environment variables.
```rust
// Create a system level directory for nushell scripts, modules, completions, etc
// that can be changed by setting the NU_VENDOR_AUTOLOAD_DIR env var on any platform
// before nushell is compiled OR if NU_VENDOR_AUTOLOAD_DIR is not set for non-windows
// systems, the PREFIX env var can be set before compile and used as PREFIX/nushell/vendor/autoload
// pseudo code
// if env var NU_VENDOR_AUTOLOAD_DIR is set, in any platform, use it
// if not, if windows, use ALLUSERPROFILE\nushell\vendor\autoload
// if not, if non-windows, if env var PREFIX is set, use PREFIX/share/nushell/vendor/autoload
// if not, use the default /usr/share/nushell/vendor/autoload
```
### Windows default
```nushell
❯ $nu.vendor-autoload-dir
C:\ProgramData\nushell\vendor\autoload
```
### Non-Windows default
```nushell
❯ $nu.vendor-autoload-dir
/usr/local/share/nushell/vendor/autoload
```
### Non-Windows with PREFIX set
```nushell
❯ PREFIX=/usr/bob cargo r
❯ $nu.vendor-autoload-dir
/usr/bob/share/nushell/vendor/autoload
```
### Non-Windows with NU_VENDOR_AUTOLOAD_DIR set
```nushell
❯ NU_VENDOR_AUTOLOAD_DIR=/some/other/path/nushell/stuff cargo r
❯ $nu.vendor-autoload-dir
/some/other/path/nushell/stuff
```
> [!IMPORTANT]
To be clear, this PR does not do the auto-loading, it just sets up the
folder to support that functionality that can be added in a later PR.
The PR also does not create the folder defined. It's just setting the
$nu constant.
# 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
> ```
-->
# 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.
-->
2024-06-20 13:30:43 +02:00
|
|
|
assert_eq!(18, suggestions.len());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let expected: Vec<String> = vec![
|
2024-06-11 21:10:31 +02:00
|
|
|
"cache-dir".into(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"config-path".into(),
|
2023-04-07 20:51:09 +02:00
|
|
|
"current-exe".into(),
|
2024-06-11 21:10:31 +02:00
|
|
|
"data-dir".into(),
|
2023-04-14 22:16:00 +02:00
|
|
|
"default-config-dir".into(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"env-path".into(),
|
2024-01-17 16:40:59 +01:00
|
|
|
"history-enabled".into(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"history-path".into(),
|
|
|
|
"home-path".into(),
|
2023-03-09 03:59:33 +01:00
|
|
|
"is-interactive".into(),
|
|
|
|
"is-login".into(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"loginshell-path".into(),
|
|
|
|
"os-info".into(),
|
|
|
|
"pid".into(),
|
2023-06-20 23:33:01 +02:00
|
|
|
"plugin-path".into(),
|
FEATURE: add the startup time to `$nu` (#8353)
# Description
in https://github.com/nushell/nushell/issues/8311 and the discord
server, the idea of moving the default banner from the `rust` source to
the `nushell` standar library has emerged :yum:
however, in order to do this, one need to have access to all the
variables used in the default banner => all of them are accessible
because known constants, except for the startup time of the shell, which
is not anywhere in the shell...
#### this PR adds exactly this, i.e. the new `startup_time` to the `$nu`
variable, which is computed to have the exact same value as the value
shown in the banner.
## the changes
in order to achieve this, i had to
- add `startup_time` as an `i64` to the `EngineState` => this is, to the
best of my knowledge, the easiest way to pass such an information around
down to where the banner startup time is computed and where the `$nu`
variable is evaluated
- add `startup-time` to the `$nu` variable and use the `EngineState`
getter for `startup_time` to show it as a `Value::Duration`
- pass `engine_state` as a `&mut`able argument from `main.rs` down to
`repl.rs` to allow the setter to change the value of `startup_time` =>
without this, the value would not change and would show `-1ns` as the
default value...
- the value of the startup time is computed in `evaluate_repl` in
`repl.rs`, only once at the beginning, and the same value is used in the
default banner :ok_hand:
# User-Facing Changes
one can now access to the same time as shown in the default banner with
```bash
$nu.startup-time
```
# Tests + Formatting
- :green_circle: `cargo fmt --all`
- :green_circle: `cargo clippy --workspace -- -D warnings -D
clippy::unwrap_used -A clippy::needless_collect`
- :green_circle: `cargo test --workspace`
# After Submitting
```
$nothing
```
2023-03-09 21:18:58 +01:00
|
|
|
"startup-time".into(),
|
2022-08-23 16:24:24 +02:00
|
|
|
"temp-path".into(),
|
add a system level folder for future autoloading (#13180)
# Description
This PR adds a directory to the `$nu` constant that shows where the
system level autoload directory is located at. This folder is modifiable
at compile time with environment variables.
```rust
// Create a system level directory for nushell scripts, modules, completions, etc
// that can be changed by setting the NU_VENDOR_AUTOLOAD_DIR env var on any platform
// before nushell is compiled OR if NU_VENDOR_AUTOLOAD_DIR is not set for non-windows
// systems, the PREFIX env var can be set before compile and used as PREFIX/nushell/vendor/autoload
// pseudo code
// if env var NU_VENDOR_AUTOLOAD_DIR is set, in any platform, use it
// if not, if windows, use ALLUSERPROFILE\nushell\vendor\autoload
// if not, if non-windows, if env var PREFIX is set, use PREFIX/share/nushell/vendor/autoload
// if not, use the default /usr/share/nushell/vendor/autoload
```
### Windows default
```nushell
❯ $nu.vendor-autoload-dir
C:\ProgramData\nushell\vendor\autoload
```
### Non-Windows default
```nushell
❯ $nu.vendor-autoload-dir
/usr/local/share/nushell/vendor/autoload
```
### Non-Windows with PREFIX set
```nushell
❯ PREFIX=/usr/bob cargo r
❯ $nu.vendor-autoload-dir
/usr/bob/share/nushell/vendor/autoload
```
### Non-Windows with NU_VENDOR_AUTOLOAD_DIR set
```nushell
❯ NU_VENDOR_AUTOLOAD_DIR=/some/other/path/nushell/stuff cargo r
❯ $nu.vendor-autoload-dir
/some/other/path/nushell/stuff
```
> [!IMPORTANT]
To be clear, this PR does not do the auto-loading, it just sets up the
folder to support that functionality that can be added in a later PR.
The PR also does not create the folder defined. It's just setting the
$nu constant.
# 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
> ```
-->
# 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.
-->
2024-06-20 13:30:43 +02:00
|
|
|
"vendor-autoload-dir".into(),
|
2022-08-23 16:24:24 +02:00
|
|
|
];
|
|
|
|
|
|
|
|
// Match results
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
|
|
|
|
// Test completions for $nu.h (filter)
|
|
|
|
let suggestions = completer.complete("$nu.h", 5);
|
|
|
|
|
2024-01-17 16:40:59 +01:00
|
|
|
assert_eq!(3, suggestions.len());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
2024-01-17 16:40:59 +01:00
|
|
|
let expected: Vec<String> = vec![
|
|
|
|
"history-enabled".into(),
|
|
|
|
"history-path".into(),
|
|
|
|
"home-path".into(),
|
|
|
|
];
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Match results
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
|
2023-04-26 16:15:27 +02:00
|
|
|
// Test completions for $nu.os-info
|
|
|
|
let suggestions = completer.complete("$nu.os-info.", 12);
|
|
|
|
assert_eq!(4, suggestions.len());
|
|
|
|
let expected: Vec<String> = vec![
|
|
|
|
"arch".into(),
|
|
|
|
"family".into(),
|
|
|
|
"kernel_version".into(),
|
|
|
|
"name".into(),
|
|
|
|
];
|
|
|
|
// Match results
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
// Test completions for custom var
|
|
|
|
let suggestions = completer.complete("$actor.", 7);
|
|
|
|
|
|
|
|
assert_eq!(2, suggestions.len());
|
|
|
|
|
|
|
|
let expected: Vec<String> = vec!["age".into(), "name".into()];
|
|
|
|
|
|
|
|
// Match results
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
|
|
|
|
// Test completions for custom var (filtering)
|
|
|
|
let suggestions = completer.complete("$actor.n", 8);
|
|
|
|
|
|
|
|
assert_eq!(1, suggestions.len());
|
|
|
|
|
|
|
|
let expected: Vec<String> = vec!["name".into()];
|
|
|
|
|
|
|
|
// Match results
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
|
|
|
|
// Test completions for $env
|
|
|
|
let suggestions = completer.complete("$env.", 5);
|
|
|
|
|
2023-02-09 03:53:46 +01:00
|
|
|
assert_eq!(3, suggestions.len());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
2023-02-09 03:53:46 +01:00
|
|
|
#[cfg(windows)]
|
|
|
|
let expected: Vec<String> = vec!["PWD".into(), "Path".into(), "TEST".into()];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected: Vec<String> = vec!["PATH".into(), "PWD".into(), "TEST".into()];
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Match results
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
|
|
|
|
// Test completions for $env
|
|
|
|
let suggestions = completer.complete("$env.T", 6);
|
|
|
|
|
|
|
|
assert_eq!(1, suggestions.len());
|
|
|
|
|
|
|
|
let expected: Vec<String> = vec!["TEST".into()];
|
|
|
|
|
|
|
|
// Match results
|
|
|
|
match_suggestions(expected, suggestions);
|
2024-07-06 00:58:35 +02:00
|
|
|
|
|
|
|
let suggestions = completer.complete("$", 1);
|
|
|
|
let expected: Vec<String> = vec!["$actor".into(), "$env".into(), "$in".into(), "$nu".into()];
|
|
|
|
|
|
|
|
match_suggestions(expected, suggestions);
|
2022-08-23 16:24:24 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn alias_of_command_and_flags() {
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Create an alias
|
|
|
|
let alias = r#"alias ll = ls -l"#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let suggestions = completer.complete("ll t", 4);
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn alias_of_basic_command() {
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Create an alias
|
|
|
|
let alias = r#"alias ll = ls "#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let suggestions = completer.complete("ll t", 4);
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn alias_of_another_alias() {
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
// Create an alias
|
|
|
|
let alias = r#"alias ll = ls -la"#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir.clone()).is_ok());
|
2022-08-23 16:24:24 +02:00
|
|
|
// Create the second alias
|
|
|
|
let alias = r#"alias lf = ll -f"#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
let suggestions = completer.complete("lf t", 4);
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec!["test_a\\".to_string(), "test_b\\".to_string()];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec!["test_a/".to_string(), "test_b/".to_string()];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
|
|
|
|
2024-04-21 07:03:33 +02:00
|
|
|
fn run_external_completion(completer: &str, input: &str) -> Vec<Suggestion> {
|
|
|
|
let completer = format!("$env.config.completions.external.completer = {completer}");
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
// Create a new engine
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine_state, mut stack) = new_engine();
|
2024-04-21 07:03:33 +02:00
|
|
|
let (block, delta) = {
|
2022-08-23 16:24:24 +02:00
|
|
|
let mut working_set = StateWorkingSet::new(&engine_state);
|
2024-04-21 07:03:33 +02:00
|
|
|
let block = parse(&mut working_set, None, completer.as_bytes(), false);
|
2023-04-07 02:35:45 +02:00
|
|
|
assert!(working_set.parse_errors.is_empty());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
|
|
|
(block, working_set.render())
|
|
|
|
};
|
|
|
|
|
|
|
|
assert!(engine_state.merge_delta(delta).is_ok());
|
|
|
|
|
2024-04-21 07:03:33 +02:00
|
|
|
assert!(
|
|
|
|
eval_block::<WithoutDebug>(&engine_state, &mut stack, &block, PipelineData::Empty).is_ok()
|
|
|
|
);
|
|
|
|
|
2022-08-23 16:24:24 +02:00
|
|
|
// Merge environment into the permanent state
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(engine_state.merge_env(&mut stack, &dir).is_ok());
|
2022-08-23 16:24:24 +02:00
|
|
|
|
Fix typos by codespell (#7600)
# Description
Found via `codespell -S target -L
crate,ser,numer,falsy,ro,te,nd,bu,ndoes,statics,ons,fo,rouge,pard`
# User-Facing Changes
None.
# Tests + Formatting
None and done.
# After Submitting
None.
2022-12-26 08:31:26 +01:00
|
|
|
// Instantiate a new completer
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine_state), Arc::new(stack));
|
2022-08-23 16:24:24 +02:00
|
|
|
|
2022-09-25 22:06:13 +02:00
|
|
|
completer.complete(input, input.len())
|
2022-08-23 16:24:24 +02:00
|
|
|
}
|
2022-08-24 21:46:00 +02:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn unknown_command_completion() {
|
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-08-24 21:46:00 +02:00
|
|
|
|
|
|
|
let target_dir = "thiscommanddoesnotexist ";
|
|
|
|
let suggestions = completer.complete(target_dir, target_dir.len());
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-08-24 21:46:00 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-08-24 21:46:00 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions)
|
|
|
|
}
|
2022-09-29 10:43:58 +02:00
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn flagcompletion_triggers_after_cursor(mut completer: NuCompleter) {
|
|
|
|
let suggestions = completer.complete("tst -h", 5);
|
|
|
|
let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn customcompletion_triggers_after_cursor(mut completer_strings: NuCompleter) {
|
|
|
|
let suggestions = completer_strings.complete("my-command c", 11);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn customcompletion_triggers_after_cursor_piped(mut completer_strings: NuCompleter) {
|
|
|
|
let suggestions = completer_strings.complete("my-command c | ls", 11);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn flagcompletion_triggers_after_cursor_piped(mut completer: NuCompleter) {
|
|
|
|
let suggestions = completer.complete("tst -h | ls", 5);
|
|
|
|
let expected: Vec<String> = vec!["--help".into(), "--mod".into(), "-h".into(), "-s".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn filecompletions_triggers_after_cursor() {
|
|
|
|
let (_, _, engine, stack) = new_engine();
|
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2022-09-29 10:43:58 +02:00
|
|
|
|
|
|
|
let suggestions = completer.complete("cp test_c", 3);
|
|
|
|
|
|
|
|
#[cfg(windows)]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another\\".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion\\".to_string(),
|
2022-09-29 10:43:58 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a\\".to_string(),
|
|
|
|
"test_b\\".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder\\".to_string(),
|
|
|
|
];
|
|
|
|
#[cfg(not(windows))]
|
|
|
|
let expected_paths: Vec<String> = vec![
|
2023-02-22 14:03:48 +01:00
|
|
|
"another/".to_string(),
|
|
|
|
"custom_completion.nu".to_string(),
|
2023-12-19 10:14:34 +01:00
|
|
|
"directory_completion/".to_string(),
|
2022-09-29 10:43:58 +02:00
|
|
|
"nushell".to_string(),
|
|
|
|
"test_a/".to_string(),
|
|
|
|
"test_b/".to_string(),
|
|
|
|
".hidden_file".to_string(),
|
|
|
|
".hidden_folder/".to_string(),
|
|
|
|
];
|
|
|
|
|
|
|
|
match_suggestions(expected_paths, suggestions);
|
|
|
|
}
|
2022-12-21 23:33:26 +01:00
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn extern_custom_completion_positional(mut extern_completer: NuCompleter) {
|
|
|
|
let suggestions = extern_completer.complete("spam ", 5);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn extern_custom_completion_long_flag_1(mut extern_completer: NuCompleter) {
|
|
|
|
let suggestions = extern_completer.complete("spam --foo=", 11);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn extern_custom_completion_long_flag_2(mut extern_completer: NuCompleter) {
|
|
|
|
let suggestions = extern_completer.complete("spam --foo ", 11);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn extern_custom_completion_long_flag_short(mut extern_completer: NuCompleter) {
|
|
|
|
let suggestions = extern_completer.complete("spam -f ", 8);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn extern_custom_completion_short_flag(mut extern_completer: NuCompleter) {
|
|
|
|
let suggestions = extern_completer.complete("spam -b ", 8);
|
|
|
|
let expected: Vec<String> = vec!["cat".into(), "dog".into(), "eel".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn extern_complete_flags(mut extern_completer: NuCompleter) {
|
|
|
|
let suggestions = extern_completer.complete("spam -", 6);
|
|
|
|
let expected: Vec<String> = vec!["--foo".into(), "-b".into(), "-f".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
2023-01-17 07:30:00 +01:00
|
|
|
|
2023-11-29 23:17:06 +01:00
|
|
|
#[rstest]
|
|
|
|
fn custom_completer_triggers_cursor_before_word(mut custom_completer: NuCompleter) {
|
|
|
|
let suggestions = custom_completer.complete("cmd foo bar", 8);
|
|
|
|
let expected: Vec<String> = vec!["cmd".into(), "foo".into(), "".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn custom_completer_triggers_cursor_on_word_left_boundary(mut custom_completer: NuCompleter) {
|
|
|
|
let suggestions = custom_completer.complete("cmd foo bar", 8);
|
|
|
|
let expected: Vec<String> = vec!["cmd".into(), "foo".into(), "".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn custom_completer_triggers_cursor_next_to_word(mut custom_completer: NuCompleter) {
|
|
|
|
let suggestions = custom_completer.complete("cmd foo bar", 11);
|
|
|
|
let expected: Vec<String> = vec!["cmd".into(), "foo".into(), "bar".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[rstest]
|
|
|
|
fn custom_completer_triggers_cursor_after_word(mut custom_completer: NuCompleter) {
|
|
|
|
let suggestions = custom_completer.complete("cmd foo bar ", 12);
|
|
|
|
let expected: Vec<String> = vec!["cmd".into(), "foo".into(), "bar".into(), "".into()];
|
|
|
|
match_suggestions(expected, suggestions);
|
|
|
|
}
|
|
|
|
|
2023-02-18 18:38:29 +01:00
|
|
|
#[ignore = "was reverted, still needs fixing"]
|
2023-01-17 07:30:00 +01:00
|
|
|
#[rstest]
|
2023-02-18 18:38:29 +01:00
|
|
|
fn alias_offset_bug_7648() {
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2023-01-17 07:30:00 +01:00
|
|
|
|
|
|
|
// Create an alias
|
|
|
|
let alias = r#"alias ea = ^$env.EDITOR /tmp/test.s"#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2023-01-17 07:30:00 +01:00
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2023-01-17 07:30:00 +01:00
|
|
|
|
2023-02-18 18:38:29 +01:00
|
|
|
// Issue #7648
|
2023-01-17 07:30:00 +01:00
|
|
|
// Nushell crashes when an alias name is shorter than the alias command
|
|
|
|
// and the alias command is a external command
|
|
|
|
// This happens because of offset is not correct.
|
|
|
|
// This crashes before PR #7779
|
|
|
|
let _suggestions = completer.complete("e", 1);
|
|
|
|
}
|
2023-01-19 11:19:27 +01:00
|
|
|
|
2023-02-18 18:38:29 +01:00
|
|
|
#[ignore = "was reverted, still needs fixing"]
|
2023-01-19 11:19:27 +01:00
|
|
|
#[rstest]
|
|
|
|
fn alias_offset_bug_7754() {
|
2024-05-24 18:09:59 +02:00
|
|
|
let (dir, _, mut engine, mut stack) = new_engine();
|
2023-01-19 11:19:27 +01:00
|
|
|
|
|
|
|
// Create an alias
|
|
|
|
let alias = r#"alias ll = ls -l"#;
|
2024-05-24 18:09:59 +02:00
|
|
|
assert!(support::merge_input(alias.as_bytes(), &mut engine, &mut stack, dir).is_ok());
|
2023-01-19 11:19:27 +01:00
|
|
|
|
2024-05-09 07:38:24 +02:00
|
|
|
let mut completer = NuCompleter::new(Arc::new(engine), Arc::new(stack));
|
2023-01-19 11:19:27 +01:00
|
|
|
|
|
|
|
// Issue #7754
|
|
|
|
// Nushell crashes when an alias name is shorter than the alias command
|
|
|
|
// and the alias command contains pipes.
|
|
|
|
// This crashes before PR #7756
|
|
|
|
let _suggestions = completer.complete("ll -a | c", 9);
|
|
|
|
}
|
2023-02-09 03:53:46 +01:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn get_path_env_var_8003() {
|
|
|
|
// Create a new engine
|
|
|
|
let (_, _, engine, _) = new_engine();
|
|
|
|
// Get the path env var in a platform agnostic way
|
|
|
|
let the_path = engine.get_path_env_var();
|
|
|
|
// Make sure it's not empty
|
|
|
|
assert!(the_path.is_some());
|
|
|
|
}
|