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

Fix crash on initiating copilot during collaboration. Copilot is now disabled when collaborating.

Browse source
This commit is contained in:
Mikayla Maki 2023-03-31 12:28:58 -07:00
parent b6882f0cbf
commit 57b5c1ee20
1 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
mod request; mod request;
mod sign_in; mod sign_in;
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, bail, Context, Result};
use async_compression::futures::bufread::GzipDecoder; use async_compression::futures::bufread::GzipDecoder;
use async_tar::Archive; use async_tar::Archive;
use client::Client; use client::Client;
@ -424,9 +424,16 @@ impl Copilot {
Err(error) => return Task::ready(Err(error)), Err(error) => return Task::ready(Err(error)),
}; };
let buffer = buffer.read(cx).snapshot(); let buffer = buffer.read(cx);
let request = server
.request::<request::GetCompletions>(build_completion_params(&buffer, position, cx)); if !buffer.file().map(|file| file.is_local()).unwrap_or(true) {
return Task::ready(Err(anyhow!("Copilot only works locally")));
}
let buffer = buffer.snapshot();
let request = server.request::<request::GetCompletions>(
build_completion_params(&buffer, position, cx).unwrap(),
);
cx.background().spawn(async move { cx.background().spawn(async move {
let result = request.await?; let result = request.await?;
let completion = result let completion = result
@ -452,10 +459,16 @@ impl Copilot {
Err(error) => return Task::ready(Err(error)), Err(error) => return Task::ready(Err(error)),
}; };
let buffer = buffer.read(cx).snapshot(); let buffer = buffer.read(cx);
let request = server.request::<request::GetCompletionsCycling>(build_completion_params(
&buffer, position, cx, if !buffer.file().map(|file| file.is_local()).unwrap_or(true) {
)); return Task::ready(Err(anyhow!("Copilot only works locally")));
}
let buffer = buffer.snapshot();
let request = server.request::<request::GetCompletionsCycling>(
build_completion_params(&buffer, position, cx).unwrap(),
);
cx.background().spawn(async move { cx.background().spawn(async move {
let result = request.await?; let result = request.await?;
let completions = result let completions = result
@ -527,7 +540,7 @@ fn build_completion_params<T>(
buffer: &BufferSnapshot, buffer: &BufferSnapshot,
position: T, position: T,
cx: &AppContext, cx: &AppContext,
) -> request::GetCompletionsParams ) -> anyhow::Result<request::GetCompletionsParams>
where where
T: ToPointUtf16, T: ToPointUtf16,
{ {
@ -555,20 +568,25 @@ where
Some(language_name) => language_name.to_lowercase(), Some(language_name) => language_name.to_lowercase(),
None => "plaintext".to_string(), None => "plaintext".to_string(),
}; };
request::GetCompletionsParams {
let Ok(uri) = lsp::Url::from_file_path(&path) else {
bail!("Failed convert file path")
};
Ok(request::GetCompletionsParams {
doc: request::GetCompletionsDocument { doc: request::GetCompletionsDocument {
source: buffer.text(), source: buffer.text(),
tab_size: settings.tab_size(language_name).into(), tab_size: settings.tab_size(language_name).into(),
indent_size: 1, indent_size: 1,
insert_spaces: !settings.hard_tabs(language_name), insert_spaces: !settings.hard_tabs(language_name),
uri: lsp::Url::from_file_path(&path).unwrap(), uri,
path: path.to_string_lossy().into(), path: path.to_string_lossy().into(),
relative_path: relative_path.to_string_lossy().into(), relative_path: relative_path.to_string_lossy().into(),
language_id, language_id,
position: point_to_lsp(position), position: point_to_lsp(position),
version: 0, version: 0,
}, },
} })
} }
fn completion_from_lsp(completion: request::Completion, buffer: &BufferSnapshot) -> Completion { fn completion_from_lsp(completion: request::Completion, buffer: &BufferSnapshot) -> Completion {