From 2dd0963c447f2342c7d1cf6fdf8bd002928f3675 Mon Sep 17 00:00:00 2001 From: ysthakur <45539777+ysthakur@users.noreply.github.com> Date: Tue, 25 Jun 2024 19:12:47 -0400 Subject: [PATCH] Remove Completer.get_sort_by() --- crates/nu-cli/src/completions/base.rs | 6 +----- crates/nu-cli/src/completions/command_completions.rs | 8 ++------ crates/nu-cli/src/completions/custom_completions.rs | 10 +--------- crates/nu-cli/src/completions/dotnu_completions.rs | 6 +----- crates/nu-cli/src/completions/flag_completions.rs | 10 ++++------ .../nu-cli/src/completions/variable_completions.rs | 12 +++++++----- 6 files changed, 16 insertions(+), 36 deletions(-) diff --git a/crates/nu-cli/src/completions/base.rs b/crates/nu-cli/src/completions/base.rs index b28623b3e0..edc185d505 100644 --- a/crates/nu-cli/src/completions/base.rs +++ b/crates/nu-cli/src/completions/base.rs @@ -1,4 +1,4 @@ -use crate::completions::{CompletionOptions, SortBy}; +use crate::completions::CompletionOptions; use nu_protocol::{ engine::{Stack, StateWorkingSet}, Span, @@ -19,10 +19,6 @@ pub trait Completer { pos: usize, options: &CompletionOptions, ) -> Vec; - - fn get_sort_by(&self) -> SortBy { - SortBy::Ascending - } } #[derive(Debug, Default, PartialEq)] diff --git a/crates/nu-cli/src/completions/command_completions.rs b/crates/nu-cli/src/completions/command_completions.rs index 1b1fc47763..8a7ac5cef8 100644 --- a/crates/nu-cli/src/completions/command_completions.rs +++ b/crates/nu-cli/src/completions/command_completions.rs @@ -201,7 +201,7 @@ impl Completer for CommandCompletion { return sort_suggestions( &String::from_utf8_lossy(&prefix), subcommands, - self.get_sort_by(), + SortBy::Ascending, ); } @@ -230,13 +230,9 @@ impl Completer for CommandCompletion { sort_suggestions( &String::from_utf8_lossy(&prefix), commands, - self.get_sort_by(), + SortBy::LevenshteinDistance, ) } - - fn get_sort_by(&self) -> SortBy { - SortBy::LevenshteinDistance - } } pub fn find_non_whitespace_index(contents: &[u8], start: usize) -> usize { diff --git a/crates/nu-cli/src/completions/custom_completions.rs b/crates/nu-cli/src/completions/custom_completions.rs index 024ca5e2ff..0d2c674ef9 100644 --- a/crates/nu-cli/src/completions/custom_completions.rs +++ b/crates/nu-cli/src/completions/custom_completions.rs @@ -129,15 +129,7 @@ impl Completer for CustomCompletion { } else { filter(&prefix, suggestions, completion_options) }; - sort_suggestions( - &String::from_utf8_lossy(&prefix), - suggestions, - self.get_sort_by(), - ) - } - - fn get_sort_by(&self) -> SortBy { - self.sort_by + sort_suggestions(&String::from_utf8_lossy(&prefix), suggestions, self.sort_by) } } diff --git a/crates/nu-cli/src/completions/dotnu_completions.rs b/crates/nu-cli/src/completions/dotnu_completions.rs index c939578b41..118827a172 100644 --- a/crates/nu-cli/src/completions/dotnu_completions.rs +++ b/crates/nu-cli/src/completions/dotnu_completions.rs @@ -1,4 +1,4 @@ -use crate::completions::{file_path_completion, Completer, CompletionOptions, SortBy}; +use crate::completions::{file_path_completion, Completer, CompletionOptions}; use nu_protocol::{ engine::{Stack, StateWorkingSet}, Span, @@ -133,8 +133,4 @@ impl Completer for DotNuCompletion { output } - - fn get_sort_by(&self) -> SortBy { - SortBy::LevenshteinDistance - } } diff --git a/crates/nu-cli/src/completions/flag_completions.rs b/crates/nu-cli/src/completions/flag_completions.rs index 9cfa80c8b6..ea4ddd6856 100644 --- a/crates/nu-cli/src/completions/flag_completions.rs +++ b/crates/nu-cli/src/completions/flag_completions.rs @@ -1,4 +1,6 @@ -use crate::completions::{completion_common::sort_suggestions, Completer, CompletionOptions}; +use crate::completions::{ + completion_common::sort_suggestions, Completer, CompletionOptions, SortBy, +}; use nu_protocol::{ ast::{Expr, Expression}, engine::{Stack, StateWorkingSet}, @@ -90,11 +92,7 @@ impl Completer for FlagCompletion { } } - return sort_suggestions( - &String::from_utf8_lossy(&prefix), - output, - self.get_sort_by(), - ); + return sort_suggestions(&String::from_utf8_lossy(&prefix), output, SortBy::Ascending); } vec![] diff --git a/crates/nu-cli/src/completions/variable_completions.rs b/crates/nu-cli/src/completions/variable_completions.rs index e4e13e9826..7316eaa814 100644 --- a/crates/nu-cli/src/completions/variable_completions.rs +++ b/crates/nu-cli/src/completions/variable_completions.rs @@ -9,7 +9,9 @@ use nu_protocol::{ use reedline::Suggestion; use std::str; -use super::completion_common::sort_suggestions; +use super::{completion_common::sort_suggestions, SortBy}; + +const SORT_BY: SortBy = SortBy::Ascending; #[derive(Clone)] pub struct VariableCompletion { @@ -72,7 +74,7 @@ impl Completer for VariableCompletion { } } - return sort_suggestions(&prefix_str, output, self.get_sort_by()); + return sort_suggestions(&prefix_str, output, SORT_BY); } } else { // No nesting provided, return all env vars @@ -96,7 +98,7 @@ impl Completer for VariableCompletion { } } - return sort_suggestions(&prefix_str, output, self.get_sort_by()); + return sort_suggestions(&prefix_str, output, SORT_BY); } } @@ -120,7 +122,7 @@ impl Completer for VariableCompletion { } } - return sort_suggestions(&prefix_str, output, self.get_sort_by()); + return sort_suggestions(&prefix_str, output, SORT_BY); } } @@ -142,7 +144,7 @@ impl Completer for VariableCompletion { } } - return sort_suggestions(&prefix_str, output, self.get_sort_by()); + return sort_suggestions(&prefix_str, output, SORT_BY); } } }