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

🎨

Browse source
This commit is contained in:
Antonio Scandurra 2023-03-31 18:10:10 +02:00
parent 5f579a4287
commit b208d1a489
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/editor/src/editor.rs
View file

@ -1028,13 +1028,6 @@ impl Default for CopilotState {
} }
} }
fn common_prefix<T1: Iterator<Item = char>, T2: Iterator<Item = char>>(a: T1, b: T2) -> usize {
a.zip(b)
.take_while(|(a, b)| a == b)
.map(|(a, _)| a.len_utf8())
.sum()
}
impl CopilotState { impl CopilotState {
fn text_for_active_completion( fn text_for_active_completion(
&self, &self,
@ -1048,12 +1041,12 @@ impl CopilotState {
let completion_buffer = buffer.buffer_for_excerpt(excerpt_id)?; let completion_buffer = buffer.buffer_for_excerpt(excerpt_id)?;
let mut completion_range = completion.range.to_offset(&completion_buffer); let mut completion_range = completion.range.to_offset(&completion_buffer);
let prefix_len = common_prefix( let prefix_len = Self::common_prefix(
completion_buffer.chars_for_range(completion_range.clone()), completion_buffer.chars_for_range(completion_range.clone()),
completion.text.chars(), completion.text.chars(),
); );
completion_range.start += prefix_len; completion_range.start += prefix_len;
let suffix_len = common_prefix( let suffix_len = Self::common_prefix(
completion_buffer.reversed_chars_for_range(completion_range.clone()), completion_buffer.reversed_chars_for_range(completion_range.clone()),
completion.text[prefix_len..].chars().rev(), completion.text[prefix_len..].chars().rev(),
); );
@ -1076,6 +1069,13 @@ impl CopilotState {
} }
self.completions.push(new_completion); self.completions.push(new_completion);
} }
fn common_prefix<T1: Iterator<Item = char>, T2: Iterator<Item = char>>(a: T1, b: T2) -> usize {
a.zip(b)
.take_while(|(a, b)| a == b)
.map(|(a, _)| a.len_utf8())
.sum()
}
} }
#[derive(Debug)] #[derive(Debug)]