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

Make copilot::SignIn open sign-in modal when needed (#30239)

Browse source 
Also:

* Makes sign out show status notifications and errors.
* Reinstall now prompts for sign-in after start.

Addresses some of #29250, but not all of it.

Release Notes:

- N/A
This commit is contained in:
Michael Sloan 2025-05-08 16:52:07 +02:00 • committed by GitHub
parent 203cb7a7a2
commit e9a756b5fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 142 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,6 +3,7 @@ mod copilot_completion_provider;
pub mod request;
mod sign_in;
use crate::sign_in::initiate_sign_in_within_workspace;
use ::fs::Fs;
use anyhow::{Result, anyhow};
use collections::{HashMap, HashSet};
@ -24,6 +25,7 @@ use node_runtime::NodeRuntime;
use parking_lot::Mutex;
use request::StatusNotification;
use settings::SettingsStore;
use sign_in::{reinstall_and_sign_in_within_workspace, sign_out_within_workspace};
use std::{
any::TypeId,
env,
@ -34,9 +36,10 @@ use std::{
sync::Arc,
};
use util::{ResultExt, fs::remove_matching};
use workspace::Workspace;
pub use crate::copilot_completion_provider::CopilotCompletionProvider;
pub use crate::sign_in::{CopilotCodeVerification, initiate_sign_in};
pub use crate::sign_in::{CopilotCodeVerification, initiate_sign_in, reinstall_and_sign_in};
actions!(
copilot,
@ -99,27 +102,25 @@ pub fn init(
})
.detach();
cx.on_action(|_: &SignIn, cx| {
if let Some(copilot) = Copilot::global(cx) {
copilot
.update(cx, |copilot, cx| copilot.sign_in(cx))
.detach_and_log_err(cx);
}
});
cx.on_action(|_: &SignOut, cx| {
if let Some(copilot) = Copilot::global(cx) {
copilot
.update(cx, |copilot, cx| copilot.sign_out(cx))
.detach_and_log_err(cx);
}
});
cx.on_action(|_: &Reinstall, cx| {
if let Some(copilot) = Copilot::global(cx) {
copilot
.update(cx, |copilot, cx| copilot.reinstall(cx))
.detach();
}
});
cx.observe_new(|workspace: &mut Workspace, _window, _cx| {
workspace.register_action(|workspace, _: &SignIn, window, cx| {
if let Some(copilot) = Copilot::global(cx) {
let is_reinstall = false;
initiate_sign_in_within_workspace(workspace, copilot, is_reinstall, window, cx);
}
});
workspace.register_action(|workspace, _: &Reinstall, window, cx| {
if let Some(copilot) = Copilot::global(cx) {
reinstall_and_sign_in_within_workspace(workspace, copilot, window, cx);
}
});
workspace.register_action(|workspace, _: &SignOut, _window, cx| {
if let Some(copilot) = Copilot::global(cx) {
sign_out_within_workspace(workspace, copilot, cx);
}
});
})
.detach();
}
enum CopilotServer {
@ -563,7 +564,7 @@ impl Copilot {
.ok();
}
pub fn sign_in(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
pub(crate) fn sign_in(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
if let CopilotServer::Running(server) = &mut self.server {
let task = match &server.sign_in_status {
SignInStatus::Authorized { .. } => Task::ready(Ok(())).shared(),
@ -647,7 +648,7 @@ impl Copilot {
}
}
pub fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
pub(crate) fn sign_out(&mut self, cx: &mut Context<Self>) -> Task<Result<()>> {
self.update_sign_in_status(request::SignInStatus::NotSignedIn, cx);
match &self.server {
CopilotServer::Running(RunningCopilotServer { lsp: server, .. }) => {
@ -667,7 +668,7 @@ impl Copilot {
}
}
pub fn reinstall(&mut self, cx: &mut Context<Self>) -> Task<()> {
pub(crate) fn reinstall(&mut self, cx: &mut Context<Self>) -> Shared<Task<()>> {
let language_settings = all_language_settings(None, cx);
let env = self.build_env(&language_settings.edit_predictions.copilot);
let start_task = cx
@ -689,7 +690,7 @@ impl Copilot {
cx.notify();
cx.background_spawn(start_task)
start_task
}
pub fn language_server(&self) -> Option<&Arc<LanguageServer>> {