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

Use copilot's Completion::{range,text} to determine suggestion

Browse source 
Previously, we were using display text, but this isn't always correct. Now,
we just attempt to determine what text Copilot wants to insert by finding
a prefix and suffix in the existing text with the suggested text.

Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
Antonio Scandurra 2023-03-31 17:08:41 +02:00
parent 9b16277cf8
commit 6e43e77c3f
2 changed files with 66 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/copilot/src/copilot.rs
View file

@ -17,6 +17,7 @@ use settings::Settings;
use smol::{fs, io::BufReader, stream::StreamExt};
use std::{
ffi::OsString,
ops::Range,
path::{Path, PathBuf},
sync::Arc,
};
@ -130,7 +131,7 @@ impl Status {
#[derive(Debug, PartialEq, Eq)]
pub struct Completion {
pub position: Anchor,
pub range: Range<Anchor>,
pub text: String,
}
@ -548,10 +549,11 @@ where
}
fn completion_from_lsp(completion: request::Completion, buffer: &BufferSnapshot) -> Completion {
let position = buffer.clip_point_utf16(point_from_lsp(completion.position), Bias::Left);
let start = buffer.clip_point_utf16(point_from_lsp(completion.range.start), Bias::Left);
let end = buffer.clip_point_utf16(point_from_lsp(completion.range.end), Bias::Left);
Completion {
position: buffer.anchor_before(position),
text: completion.display_text,
range: buffer.anchor_before(start)..buffer.anchor_after(end),
text: completion.text,
}
}