Skip to content

Handle suggestions that are substrings of first suggestion #913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Handle suggestions that are substrings of first suggestion #913

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa01bb4
Handle substrings of first sugg in find_common_string
ysthakur Jun 3, 2025
e299251
Add another suggestion to test case
ysthakur Jun 3, 2025
318e41b
Obey clippy's will
ysthakur Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
93 changes: 30 additions & 63 deletions src/menu/menu_functions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,38 +162,23 @@ pub fn parse_selection_char(buffer: &str, marker: char) -> ParseResult {

/// Finds index for the common string in a list of suggestions
pub fn find_common_string(values: &[Suggestion]) -> (Option<&Suggestion>, Option<usize>) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Side note: I would much rather this returned a single Option<(Suggestion, usize)> (or actually, an Option<&str>/Option<usize> would be even better, since callers can just get the first suggestion themselves). Didn't modify it in this PR because even though this helper's only used in one place in Reedline, consumers of Reedline might be using it for their menus.

let first = values.iter().next();

let index = first.and_then(|first| {
values.iter().skip(1).fold(None, |index, suggestion| {
if suggestion.value.starts_with(&first.value) {
Some(first.value.len())
} else {
first
.value
.char_indices()
.zip(suggestion.value.char_indices())
.find(|((_, mut lhs), (_, mut rhs))| {
lhs.make_ascii_lowercase();
rhs.make_ascii_lowercase();

lhs != rhs
})
.map(|((new_index, _), _)| match index {
Some(index) => {
if index <= new_index {
index
} else {
new_index
}
}
None => new_index,
})
}
})
});

(first, index)
let Some(first) = values.iter().next() else {
return (None, None);
};

let index = values
.iter()
.skip(1)
.fold(first.value.len(), |index, suggestion| {
first.value[0..index]
.char_indices()
.zip(suggestion.value.char_indices())
.find(|((_, lhs), (_, rhs))| !lhs.eq_ignore_ascii_case(rhs))
.map(|((new_index, _), _)| new_index)
.unwrap_or(first.value.len().min(suggestion.value.len()))
});

(Some(first), Some(index))
}

/// Finds different string between two strings
Expand Down Expand Up @@ -599,44 +584,26 @@ mod tests {
assert_eq!(res, (1, "e"));
}

#[test]
fn find_common_string_with_ansi() {
use crate::Span;

let input: Vec<_> = ["nushell", "null"]
.into_iter()
.map(|s| Suggestion {
value: s.into(),
description: None,
style: None,
extra: None,
span: Span::new(0, s.len()),
append_whitespace: false,
})
.collect();
let res = find_common_string(&input);

assert!(matches!(res, (Some(elem), Some(2)) if elem == &input[0]));
}

#[test]
fn find_common_string_with_non_ansi() {
#[rstest]
#[case(&["nushell", "nush", "NULL"], 2)]
#[case(&["ｎｕｓｈｅｌｌ", "ｎｕｌｌ"], 6)]
#[case(&["nushell", "nu"], 2)]
#[case(&["nu", "nushell"], 2)]
fn test_find_common_string(#[case] input: &[&str], #[case] expected: usize) {
use crate::Span;

let input: Vec<_> = ["ｎｕｓｈｅｌｌ", "ｎｕｌｌ"]
.into_iter()
let input: Vec<_> = input
.iter()
.map(|s| Suggestion {
value: s.into(),
description: None,
style: None,
extra: None,
value: (*s).into(),
span: Span::new(0, s.len()),
append_whitespace: false,
..Default::default()
})
.collect();
let res = find_common_string(&input);
let (first, index) = find_common_string(&input);

assert!(matches!(res, (Some(elem), Some(6)) if elem == &input[0]));
assert_eq!(Some(&input[0].value), first.map(|s| &s.value));
assert_eq!(Some(expected), index);
}

#[rstest]
Expand Down
Loading