diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs index 9215f92b15..0a516c63fa 100644 --- a/crates/nu-cli/src/completions/custom_completions.rs +++ b/crates/nu-cli/src/completions/custom_completions.rs @@ -109,7 +109,7 @@ impl Completer for CustomCompletion { None => completion_options.match_algorithm, }, sort: if should_sort { - CompletionSort::Alpha + CompletionSort::Alphabetical } else { CompletionSort::Default }, diff --git a/crates/nu-cli/tests/completions/mod.rs b/crates/nu-cli/tests/completions/mod.rs index 0cf2d0117e..453832ab0c 100644 --- a/crates/nu-cli/tests/completions/mod.rs +++ b/crates/nu-cli/tests/completions/mod.rs @@ -112,7 +112,7 @@ fn fuzzy_alpha_sort_completer() -> NuCompleter { let config = r#" $env.config.completions.algorithm = "fuzzy" - $env.config.completions.sort = "alpha" + $env.config.completions.sort = "alphabetical" "#; assert!(support::merge_input(config.as_bytes(), &mut engine, &mut stack, dir).is_ok()); diff --git a/crates/nu-protocol/src/config/completer.rs b/crates/nu-protocol/src/config/completer.rs index 92e7fac73f..b2f7ccb3c3 100644 --- a/crates/nu-protocol/src/config/completer.rs +++ b/crates/nu-protocol/src/config/completer.rs @@ -39,7 +39,7 @@ impl ReconstructVal for CompletionAlgorithm { pub enum CompletionSort { #[default] Default, - Alpha, + Alphabetical, } impl FromStr for CompletionSort { @@ -48,7 +48,7 @@ impl FromStr for CompletionSort { fn from_str(s: &str) -> Result { match s.to_ascii_lowercase().as_str() { "default" => Ok(Self::Default), - "alpha" => Ok(Self::Alpha), + "alphabetical" => Ok(Self::Alphabetical), _ => Err("expected either 'default' or 'alpha'"), } } @@ -58,7 +58,7 @@ impl ReconstructVal for CompletionSort { fn reconstruct_value(&self, span: Span) -> Value { let str = match self { Self::Default => "default", - Self::Alpha => "alpha", + Self::Alphabetical => "alphabetical", }; Value::string(str, span) } diff --git a/crates/nu-utils/src/sample_config/default_config.nu b/crates/nu-utils/src/sample_config/default_config.nu index fd86d0ef0f..3b4fbe0dc7 100644 --- a/crates/nu-utils/src/sample_config/default_config.nu +++ b/crates/nu-utils/src/sample_config/default_config.nu @@ -205,7 +205,7 @@ $env.config = { quick: true # set this to false to prevent auto-selecting completions when only one remains partial: true # set this to false to prevent partial filling of the prompt algorithm: "prefix" # prefix or fuzzy - sort: "default" # default (choose based on algorithm) or alpha (always sort alphabetically) + sort: "default" # "default" (choose based on algorithm) or "alphabetical" external: { enable: true # set to false to prevent nushell looking into $env.PATH to find more suggestions, `false` recommended for WSL users as this look up may be very slow max_results: 100 # setting it lower can improve completion performance at the cost of omitting some options