Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

editor: Improve code completions by prioritizing prefix matching (#29456)

Browse source 
- Use common prefix length-based matching as primary criteria.
- Test added for multiple cases.

Before:
<img width="500" alt="image"
src="https://github.com/user-attachments/assets/8c653225-cac2-41bd-95f0-0fb8724284c9"
/>

After:
<img width="500" alt="image"
src="https://github.com/user-attachments/assets/a3d59399-cff2-435d-9b56-69a530f35da4"
/>

Release Notes:

- Fixed issues with code completions where they wouldn't show
completions with matched prefix at top.
This commit is contained in:
Smit Barmase 2025-04-26 17:15:48 +05:30 • committed by GitHub
parent ec5821f76d
commit f2b4004c00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 220 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

42
crates/editor/src/code_context_menus.rs
View file

@ -673,9 +673,10 @@ impl CompletionsMenu {
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord)]
enum MatchTier<'a> {
WordStartMatch {
sort_bucket: Reverse<i32>,
sort_prefix: Reverse<usize>,
sort_snippet: Reverse<i32>,
sort_text: Option<&'a str>,
sort_score: Reverse<OrderedFloat<f64>>,
sort_key: (usize, &'a str),
},
OtherMatch {
@ -685,10 +686,6 @@ impl CompletionsMenu {
// Our goal here is to intelligently sort completion suggestions. We want to
// balance the raw fuzzy match score with hints from the language server
//
// We first primary sort using fuzzy score by putting matches into multiple
// buckets. Among these buckets matches are then compared by
// various criteria like snippet, LSP hints, kind, label text etc.
let query_start_lower = query
.and_then(|q| q.chars().next())
@ -696,8 +693,9 @@ impl CompletionsMenu {
matches.sort_unstable_by_key(|mat| {
let score = mat.string_match.score;
let sort_score = Reverse(OrderedFloat(score));
let is_other_match = query_start_lower
let query_start_doesnt_match_split_words = query_start_lower
.map(|query_char| {
!split_words(&mat.string_match.string).any(|word| {
word.chars()
@ -708,26 +706,38 @@ impl CompletionsMenu {
})
.unwrap_or(false);
if is_other_match {
let sort_score = Reverse(OrderedFloat(score));
if query_start_doesnt_match_split_words {
MatchTier::OtherMatch { sort_score }
} else {
// Convert fuzzy match score (0.0-1.0) to a priority bucket (0-3)
let sort_bucket = Reverse(match (score * 10.0).floor() as i32 {
s if s >= 7 => 3,
s if s >= 1 => 2,
s if s > 0 => 1,
_ => 0,
});
let sort_snippet = match snippet_sort_order {
SnippetSortOrder::Top => Reverse(if mat.is_snippet { 1 } else { 0 }),
SnippetSortOrder::Bottom => Reverse(if mat.is_snippet { 0 } else { 1 }),
SnippetSortOrder::Inline => Reverse(0),
};
let mixed_case_prefix_length = Reverse(
query
.map(|q| {
q.chars()
.zip(mat.string_match.string.chars())
.enumerate()
.take_while(|(i, (q_char, match_char))| {
if *i == 0 {
// Case-sensitive comparison for first character
q_char == match_char
} else {
// Case-insensitive comparison for other characters
q_char.to_lowercase().eq(match_char.to_lowercase())
}
})
.count()
})
.unwrap_or(0),
);
MatchTier::WordStartMatch {
sort_bucket,
sort_prefix: mixed_case_prefix_length,
sort_snippet,
sort_text: mat.sort_text,
sort_score,
sort_key: mat.sort_key,
}
}