Skip to content

fix: accurately locate the match within the suggestion value #903

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

Merged
merged 7 commits into from
Apr 15, 2025
Merged

fix: accurately locate the match within the suggestion value #903

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
43dac17
fix: accurately locate the match within the suggestion value
divanshu-go Apr 10, 2025
f3eb328
do chnages in ide_menu.rs
divanshu-go Apr 10, 2025
7b9e9c5
fix formating
divanshu-go Apr 10, 2025
31f88ae
fix test
divanshu-go Apr 10, 2025
13f15d5
refactor code
divanshu-go Apr 11, 2025
fbde6f0
make find() case-insensitive
divanshu-go Apr 11, 2025
3841c1c
fix padding in columnar_menu.rs
divanshu-go Apr 11, 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
51 changes: 36 additions & 15 deletions src/menu/columnar_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,15 +307,22 @@ impl ColumnarMenu {
.unwrap_or(shortest_base);
let match_len = shortest_base.len();

// Split string so the match text can be styled
let skip_len = suggestion
// Find match position - look for the base string in the suggestion (case-insensitive)
let match_position = suggestion
.value
.chars()
.take_while(|c| is_quote(*c))
.count();
let (match_str, remaining_str) = suggestion
.value
.split_at((match_len + skip_len).min(suggestion.value.len()));
.to_lowercase()
.find(&shortest_base.to_lowercase())
.unwrap_or(0);

// The match is just the part that matches the shortest_base
let match_str = &suggestion.value[match_position
..match_position + match_len.min(suggestion.value.len() - match_position)];

// Prefix is everything before the match
let prefix = &suggestion.value[..match_position];

// Remaining is everything after the match
let remaining_str = &suggestion.value[match_position + match_str.len()..];

let suggestion_style_prefix = suggestion
.style
Expand All @@ -325,20 +332,24 @@ impl ColumnarMenu {
let left_text_size = self.longest_suggestion + self.default_details.col_padding;
let right_text_size = self.get_width().saturating_sub(left_text_size);

let max_remaining = left_text_size.saturating_sub(match_str.width());
let max_remaining = left_text_size.saturating_sub(match_str.width() + prefix.width());
let max_match = max_remaining.saturating_sub(remaining_str.width());

if index == self.index() {
if let Some(description) = &suggestion.description {
format!(
"{}{}{}{}{}{:max_match$}{:max_remaining$}{}{}{}{}{}{}",
"{}{}{}{}{}{}{}{}{}{:max_match$}{:max_remaining$}{}{}{}{}{}{}",
suggestion_style_prefix,
self.settings.color.selected_text_style.prefix(),
prefix,
RESET,
suggestion_style_prefix,
self.settings.color.selected_match_style.prefix(),
match_str,
RESET,
suggestion_style_prefix,
self.settings.color.selected_text_style.prefix(),
&remaining_str,
remaining_str,
RESET,
self.settings.color.description_style.prefix(),
self.settings.color.selected_text_style.prefix(),
Expand All @@ -352,7 +363,11 @@ impl ColumnarMenu {
)
} else {
format!(
"{}{}{}{}{}{}{}{}{:>empty$}{}",
"{}{}{}{}{}{}{}{}{}{}{}{}{:>empty$}{}",
suggestion_style_prefix,
self.settings.color.selected_text_style.prefix(),
prefix,
RESET,
suggestion_style_prefix,
self.settings.color.selected_match_style.prefix(),
match_str,
Expand All @@ -368,7 +383,10 @@ impl ColumnarMenu {
}
} else if let Some(description) = &suggestion.description {
format!(
"{}{}{}{}{:max_match$}{:max_remaining$}{}{}{}{}{}",
"{}{}{}{}{}{}{}{:max_match$}{:max_remaining$}{}{}{}{}{}",
suggestion_style_prefix,
prefix,
RESET,
suggestion_style_prefix,
self.settings.color.match_style.prefix(),
match_str,
Expand All @@ -387,7 +405,10 @@ impl ColumnarMenu {
)
} else {
format!(
"{}{}{}{}{}{}{}{}{:>empty$}{}{}",
"{}{}{}{}{}{}{}{}{}{}{}{:>empty$}{}{}",
suggestion_style_prefix,
prefix,
RESET,
suggestion_style_prefix,
self.settings.color.match_style.prefix(),
match_str,
Expand Down Expand Up @@ -796,6 +817,6 @@ mod tests {

editor.set_buffer("おは".to_string(), UndoBehavior::CreateUndoPoint);
menu.update_values(&mut editor, &mut completer);
assert!(menu.menu_string(2, true).contains("`おは"));
assert!(menu.menu_string(2, true).contains("おは"));
}
}
33 changes: 26 additions & 7 deletions src/menu/ide_menu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,10 +520,22 @@ impl IdeMenu {
.unwrap_or(shortest_base);
let match_len = shortest_base.len().min(string.len());

// Split string so the match text can be styled
let skip_len = string.chars().take_while(|c| is_quote(*c)).count();
let (match_str, remaining_str) =
string.split_at((match_len + skip_len).min(string.len()));
// Find match position - look for the base string in the suggestion (case-insensitive)
let match_position = suggestion
.value
.to_lowercase()
.find(&shortest_base.to_lowercase())
.unwrap_or(0);

// The match is just the part that matches the shortest_base
let match_str = &string
[match_position..match_position + match_len.min(string.len() - match_position)];

// Prefix is everything before the match
let prefix = &string[..match_position];

// Remaining is everything after the match
let remaining_str = &string[match_position + match_str.len()..];

let suggestion_style_prefix = suggestion
.style
Expand All @@ -532,9 +544,13 @@ impl IdeMenu {

if index == self.index() {
format!(
"{}{}{}{}{}{}{}{}{}{}{}{}",
"{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
vertical_border,
suggestion_style_prefix,
self.settings.color.selected_text_style.prefix(),
prefix,
RESET,
suggestion_style_prefix,
" ".repeat(padding),
self.settings.color.selected_match_style.prefix(),
match_str,
Expand All @@ -548,9 +564,12 @@ impl IdeMenu {
)
} else {
format!(
"{}{}{}{}{}{}{}{}{}{}{}",
"{}{}{}{}{}{}{}{}{}{}{}{}{}{}",
vertical_border,
suggestion_style_prefix,
prefix,
RESET,
suggestion_style_prefix,
" ".repeat(padding),
self.settings.color.match_style.prefix(),
match_str,
Expand Down Expand Up @@ -1466,6 +1485,6 @@ mod tests {

editor.set_buffer("おは".to_string(), UndoBehavior::CreateUndoPoint);
menu.update_values(&mut editor, &mut completer);
assert!(menu.menu_string(2, true).contains("`おは"));
assert!(menu.menu_string(2, true).contains("おは"));
}
}