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

Add copilot settings

Browse source 
Add copilot pause / resume
Add copilot statusbar item stub
This commit is contained in:
Mikayla Maki 2023-03-29 16:40:52 -07:00
parent f812796283
commit ebd06b43f5
9 changed files with 368 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/copilot/Cargo.toml
View file

@ -10,6 +10,7 @@ doctest = false
[dependencies]
collections = { path = "../collections" }
context_menu = { path = "../context_menu" }
gpui = { path = "../gpui" }
language = { path = "../language" }
settings = { path = "../settings" }

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

@ -1,3 +1,4 @@
pub mod copilot_button;
mod request;
mod sign_in;
@ -24,7 +25,7 @@ const COPILOT_AUTH_NAMESPACE: &'static str = "copilot_auth";
actions!(copilot_auth, [SignIn, SignOut]);
const COPILOT_NAMESPACE: &'static str = "copilot";
actions!(copilot, [NextSuggestion]);
actions!(copilot, [NextSuggestion, PreviousSuggestion, Toggle]);
pub fn init(client: Arc<Client>, node_runtime: Arc<NodeRuntime>, cx: &mut MutableAppContext) {
let copilot = cx.add_model(|cx| Copilot::start(client.http_client(), node_runtime, cx));
@ -67,9 +68,11 @@ pub fn init(client: Arc<Client>, node_runtime: Arc<NodeRuntime>, cx: &mut Mutabl
}
enum CopilotServer {
Downloading,
Error(Arc<str>),
Disabled,
Starting {
_task: Shared<Task<()>>,
},
Error(Arc<str>),
Started {
server: Arc<LanguageServer>,
status: SignInStatus,
@ -93,7 +96,7 @@ enum SignInStatus {
#[derive(Debug, PartialEq, Eq)]
pub enum Status {
Downloading,
Starting,
Error(Arc<str>),
Disabled,
SignedOut,
@ -138,45 +141,46 @@ impl Copilot {
node_runtime: Arc<NodeRuntime>,
cx: &mut ModelContext<Self>,
) -> Self {
// TODO: Make this task resilient to users thrashing the copilot setting
cx.observe_global::<Settings, _>({
let http = http.clone();
let node_runtime = node_runtime.clone();
move |this, cx| {
if cx.global::<Settings>().copilot.as_bool() {
if cx.global::<Settings>().enable_copilot_integration {
if matches!(this.server, CopilotServer::Disabled) {
cx.spawn({
let http = http.clone();
let node_runtime = node_runtime.clone();
move |this, cx| {
Self::start_language_server(http, node_runtime, this, cx)
}
})
.detach();
let start_task = cx
.spawn({
let http = http.clone();
let node_runtime = node_runtime.clone();
move |this, cx| {
Self::start_language_server(http, node_runtime, this, cx)
}
})
.shared();
this.server = CopilotServer::Starting { _task: start_task }
}
} else {
// TODO: What else needs to be turned off here?
this.server = CopilotServer::Disabled
}
}
})
.detach();
if !cx.global::<Settings>().copilot.as_bool() {
return Self {
if cx.global::<Settings>().enable_copilot_integration {
let start_task = cx
.spawn({
let http = http.clone();
let node_runtime = node_runtime.clone();
move |this, cx| Self::start_language_server(http, node_runtime, this, cx)
})
.shared();
Self {
server: CopilotServer::Starting { _task: start_task },
}
} else {
Self {
server: CopilotServer::Disabled,
};
}
cx.spawn({
let http = http.clone();
let node_runtime = node_runtime.clone();
move |this, cx| Self::start_language_server(http, node_runtime, this, cx)
})
.detach();
Self {
server: CopilotServer::Downloading,
}
}
}
@ -216,6 +220,7 @@ impl Copilot {
}
Err(error) => {
this.server = CopilotServer::Error(error.to_string().into());
cx.notify()
}
}
})
@ -226,11 +231,10 @@ impl Copilot {
if let CopilotServer::Started { server, status } = &mut self.server {
let task = match status {
SignInStatus::Authorized { .. } | SignInStatus::Unauthorized { .. } => {
cx.notify();
Task::ready(Ok(())).shared()
}
SignInStatus::SigningIn { task, .. } => {
cx.notify(); // To re-show the prompt, just in case.
cx.notify();
task.clone()
}
SignInStatus::SignedOut => {
@ -382,7 +386,7 @@ impl Copilot {
pub fn status(&self) -> Status {
match &self.server {
CopilotServer::Downloading => Status::Downloading,
CopilotServer::Starting { .. } => Status::Starting,
CopilotServer::Disabled => Status::Disabled,
CopilotServer::Error(error) => Status::Error(error.clone()),
CopilotServer::Started { status, .. } => match status {
@ -403,13 +407,15 @@ impl Copilot {
) {
if let CopilotServer::Started { status, .. } = &mut self.server {
*status = match lsp_status {
request::SignInStatus::Ok { user } | request::SignInStatus::MaybeOk { user } => {
request::SignInStatus::Ok { user }
| request::SignInStatus::MaybeOk { user }
| request::SignInStatus::AlreadySignedIn { user } => {
SignInStatus::Authorized { _user: user }
}
request::SignInStatus::NotAuthorized { user } => {
SignInStatus::Unauthorized { _user: user }
}
_ => SignInStatus::SignedOut,
request::SignInStatus::NotSignedIn => SignInStatus::SignedOut,
};
cx.notify();
}
@ -417,7 +423,7 @@ impl Copilot {
fn authorized_server(&self) -> Result<Arc<LanguageServer>> {
match &self.server {
CopilotServer::Downloading => Err(anyhow!("copilot is still downloading")),
CopilotServer::Starting { .. } => Err(anyhow!("copilot is still starting")),
CopilotServer::Disabled => Err(anyhow!("copilot is disabled")),
CopilotServer::Error(error) => Err(anyhow!(
"copilot was not started because of an error: {}",

172
crates/copilot/src/copilot_button.rs Normal file
View file

@ -0,0 +1,172 @@
// use context_menu::{ContextMenu, ContextMenuItem};
// use gpui::{
// elements::*, impl_internal_actions, CursorStyle, Element, ElementBox, Entity, MouseButton,
// MutableAppContext, RenderContext, View, ViewContext, ViewHandle, WeakModelHandle,
// WeakViewHandle,
// };
// use settings::Settings;
// use std::any::TypeId;
// use workspace::{dock::FocusDock, item::ItemHandle, NewTerminal, StatusItemView, Workspace};
// #[derive(Clone, PartialEq)]
// pub struct DeployTerminalMenu;
// impl_internal_actions!(terminal, [DeployTerminalMenu]);
// pub fn init(cx: &mut MutableAppContext) {
// cx.add_action(CopilotButton::deploy_terminal_menu);
// }
// pub struct CopilotButton {
// workspace: WeakViewHandle<Workspace>,
// popup_menu: ViewHandle<ContextMenu>,
// }
// impl Entity for CopilotButton {
// type Event = ();
// }
// impl View for CopilotButton {
// fn ui_name() -> &'static str {
// "TerminalButton"
// }
// fn render(&mut self, cx: &mut RenderContext<'_, Self>) -> ElementBox {
// let workspace = self.workspace.upgrade(cx);
// let project = match workspace {
// Some(workspace) => workspace.read(cx).project().read(cx),
// None => return Empty::new().boxed(),
// };
// let focused_view = cx.focused_view_id(cx.window_id());
// let active = focused_view
// .map(|view_id| {
// cx.view_type_id(cx.window_id(), view_id) == Some(TypeId::of::<TerminalView>())
// })
// .unwrap_or(false);
// let has_terminals = !project.local_terminal_handles().is_empty();
// let terminal_count = project.local_terminal_handles().len() as i32;
// let theme = cx.global::<Settings>().theme.clone();
// Stack::new()
// .with_child(
// MouseEventHandler::<Self>::new(0, cx, {
// let theme = theme.clone();
// move |state, _cx| {
// let style = theme
// .workspace
// .status_bar
// .sidebar_buttons
// .item
// .style_for(state, active);
// Flex::row()
// .with_child(
// Svg::new("icons/terminal_12.svg")
// .with_color(style.icon_color)
// .constrained()
// .with_width(style.icon_size)
// .aligned()
// .named("terminals-icon"),
// )
// .with_children(has_terminals.then(|| {
// Label::new(terminal_count.to_string(), style.label.text.clone())
// .contained()
// .with_style(style.label.container)
// .aligned()
// .boxed()
// }))
// .constrained()
// .with_height(style.icon_size)
// .contained()
// .with_style(style.container)
// .boxed()
// }
// })
// .with_cursor_style(CursorStyle::PointingHand)
// .on_click(MouseButton::Left, move |_, cx| {
// if has_terminals {
// cx.dispatch_action(DeployTerminalMenu);
// } else {
// if !active {
// cx.dispatch_action(FocusDock);
// }
// };
// })
// .with_tooltip::<Self, _>(
// 0,
// "Show Terminal".into(),
// Some(Box::new(FocusDock)),
// theme.tooltip.clone(),
// cx,
// )
// .boxed(),
// )
// .with_child(
// ChildView::new(&self.popup_menu, cx)
// .aligned()
// .top()
// .right()
// .boxed(),
// )
// .boxed()
// }
// }
// impl CopilotButton {
// pub fn new(workspace: ViewHandle<Workspace>, cx: &mut ViewContext<Self>) -> Self {
// cx.observe(&workspace, |_, _, cx| cx.notify()).detach();
// Self {
// workspace: workspace.downgrade(),
// popup_menu: cx.add_view(|cx| {
// let mut menu = ContextMenu::new(cx);
// menu.set_position_mode(OverlayPositionMode::Local);
// menu
// }),
// }
// }
// pub fn deploy_terminal_menu(
// &mut self,
// _action: &DeployTerminalMenu,
// cx: &mut ViewContext<Self>,
// ) {
// let mut menu_options = vec![ContextMenuItem::item("New Terminal", NewTerminal)];
// if let Some(workspace) = self.workspace.upgrade(cx) {
// let project = workspace.read(cx).project().read(cx);
// let local_terminal_handles = project.local_terminal_handles();
// if !local_terminal_handles.is_empty() {
// menu_options.push(ContextMenuItem::Separator)
// }
// for local_terminal_handle in local_terminal_handles {
// if let Some(terminal) = local_terminal_handle.upgrade(cx) {
// menu_options.push(ContextMenuItem::item(
// terminal.read(cx).title(),
// // FocusTerminal {
// // terminal_handle: local_terminal_handle.clone(),
// // },
// ))
// }
// }
// }
// self.popup_menu.update(cx, |menu, cx| {
// menu.show(
// Default::default(),
// AnchorCorner::BottomRight,
// menu_options,
// cx,
// );
// });
// }
// }
// impl StatusItemView for CopilotButton {
// fn set_active_pane_item(&mut self, _: Option<&dyn ItemHandle>, cx: &mut ViewContext<Self>) {
// cx.notify();
// }
// }

6
crates/copilot/src/sign_in.rs
View file

@ -1,9 +1,7 @@
use crate::{request::PromptUserDeviceFlow, Copilot, Status};
use gpui::{
elements::*,
geometry::{rect::RectF, vector::vec2f},
ClipboardItem, Element, Entity, MutableAppContext, View, ViewContext, ViewHandle, WindowKind,
WindowOptions,
elements::*, geometry::rect::RectF, ClipboardItem, Element, Entity, MutableAppContext, View,
ViewContext, ViewHandle, WindowKind, WindowOptions,
};
use settings::Settings;