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

Signed out state is looking good

Browse source
This commit is contained in:
Piotr Osiewicz 2023-12-06 13:00:57 +01:00
parent b73ccc8180
commit 3f9fe58c48
4 changed files with 164 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -2121,6 +2121,7 @@ dependencies = [
"settings2", "settings2",
"smol", "smol",
"theme2", "theme2",
"ui2",
"util", "util",
] ]

1
crates/copilot2/Cargo.toml
View file

@ -28,6 +28,7 @@ theme = { package = "theme2", path = "../theme2" }
lsp = { package = "lsp2", path = "../lsp2" } lsp = { package = "lsp2", path = "../lsp2" }
node_runtime = { path = "../node_runtime"} node_runtime = { path = "../node_runtime"}
util = { path = "../util" } util = { path = "../util" }
ui = { package = "ui2", path = "../ui2" }
async-compression = { version = "0.3", features = ["gzip", "futures-bufread"] } async-compression = { version = "0.3", features = ["gzip", "futures-bufread"] }
async-tar = "0.4.2" async-tar = "0.4.2"
anyhow.workspace = true anyhow.workspace = true

278
crates/copilot2/src/sign_in.rs
View file

@ -11,11 +11,15 @@
const COPILOT_SIGN_UP_URL: &'static str = "https://github.com/features/copilot"; const COPILOT_SIGN_UP_URL: &'static str = "https://github.com/features/copilot";
use crate::{Copilot, Status}; use crate::{request::PromptUserDeviceFlow, Copilot, Status};
use gpui::{ use gpui::{
px, size, AppContext, Bounds, Div, GlobalPixels, Point, Render, ViewContext, VisualContext, div, px, red, size, AnyElement, AppContext, Bounds, ClipboardItem, Div, Element, GlobalPixels,
WindowBounds, WindowHandle, WindowKind, WindowOptions, InteractiveElement, IntoElement, MouseButton, ParentElement, Point, Render, Stateful,
StatefulInteractiveElement, Styled, ViewContext, VisualContext, WindowBounds, WindowHandle,
WindowKind, WindowOptions,
}; };
use theme::ActiveTheme;
use ui::{h_stack, v_stack, Button, Clickable, Icon, IconElement, Label};
pub fn init(cx: &mut AppContext) { pub fn init(cx: &mut AppContext) {
if let Some(copilot) = Copilot::global(cx) { if let Some(copilot) = Copilot::global(cx) {
@ -72,13 +76,14 @@ fn create_copilot_auth_window(
center: true, center: true,
focus: true, focus: true,
show: true, show: true,
kind: WindowKind::Normal, kind: WindowKind::PopUp,
is_movable: true, is_movable: true,
display_id: None, display_id: None,
}; };
cx.open_window(window_options, |cx| { let window = cx.open_window(window_options, |cx| {
cx.build_view(|_| CopilotCodeVerification::new(status.clone())) cx.build_view(|_| CopilotCodeVerification::new(status.clone()))
}) });
window
} }
pub struct CopilotCodeVerification { pub struct CopilotCodeVerification {
@ -99,119 +104,138 @@ impl CopilotCodeVerification {
cx.notify(); cx.notify();
} }
// fn render_device_code( fn render_device_code(
// data: &PromptUserDeviceFlow, data: &PromptUserDeviceFlow,
// style: &theme::Copilot, cx: &mut ViewContext<Self>,
// cx: &mut ViewContext<Self>, ) -> impl IntoElement {
// ) -> impl IntoAnyElement<Self> { let copied = cx
// let copied = cx .read_from_clipboard()
// .read_from_clipboard() .map(|item| item.text() == &data.user_code)
// .map(|item| item.text() == &data.user_code) .unwrap_or(false);
// .unwrap_or(false); h_stack()
.cursor_pointer()
.justify_between()
.on_mouse_down(gpui::MouseButton::Left, {
let user_code = data.user_code.clone();
move |_, cx| {
dbg!("Copied");
cx.write_to_clipboard(ClipboardItem::new(user_code.clone()));
cx.notify();
}
})
.child(Label::new(data.user_code.clone()))
.child(Label::new(if copied { "Copied!" } else { "Copy" }))
// let device_code_style = &style.auth.prompting.device_code; // MouseEventHandler::new::<Self, _>(0, cx, |state, _cx| {
// Flex::row()
// .with_child(
// Label::new(data.user_code.clone(), device_code_style.text.clone())
// .aligned()
// .contained()
// .with_style(device_code_style.left_container)
// .constrained()
// .with_width(device_code_style.left),
// )
// .with_child(
// Label::new(
// if copied { "Copied!" } else { "Copy" },
// device_code_style.cta.style_for(state).text.clone(),
// )
// .aligned()
// .contained()
// .with_style(*device_code_style.right_container.style_for(state))
// .constrained()
// .with_width(device_code_style.right),
// )
// .contained()
// .with_style(device_code_style.cta.style_for(state).container)
// })
// .on_click(gpui::platform::MouseButton::Left, {
//
// move |_, _, cx| {
//
// }
// })
// .with_cursor_style(gpui::platform::CursorStyle::PointingHand)
}
// MouseEventHandler::new::<Self, _>(0, cx, |state, _cx| { fn render_prompting_modal(
// Flex::row() connect_clicked: bool,
// .with_child( data: &PromptUserDeviceFlow,
// Label::new(data.user_code.clone(), device_code_style.text.clone()) cx: &mut ViewContext<Self>,
// .aligned() ) -> impl Element {
// .contained() let connect_button_label = if connect_clicked {
// .with_style(device_code_style.left_container) "Waiting for connection..."
// .constrained() } else {
// .with_width(device_code_style.left), "Connect to Github"
// ) };
// .with_child( v_stack()
// Label::new( .child(
// if copied { "Copied!" } else { "Copy" }, v_stack()
// device_code_style.cta.style_for(state).text.clone(), .flex_1()
// ) .w_full()
// .aligned() .items_center()
// .contained() .justify_between()
// .with_style(*device_code_style.right_container.style_for(state)) .children([
// .constrained() h_stack()
// .with_width(device_code_style.right), .items_center()
// ) .child(Label::new("Enable Copilot by connecting")),
// .contained() h_stack()
// .with_style(device_code_style.cta.style_for(state).container) .items_center()
// }) .child(Label::new("your existing license")),
// .on_click(gpui::platform::MouseButton::Left, { ]),
// let user_code = data.user_code.clone(); )
// move |_, _, cx| { .child(Self::render_device_code(data, cx))
// cx.platform() .child(Label::new("Paste this code into GitHub after").size(ui::LabelSize::Small))
// .write_to_clipboard(ClipboardItem::new(user_code.clone())); .child(Label::new("clicking the button below.").size(ui::LabelSize::Small))
// cx.notify(); .child(
// } Button::new("connect-button", connect_button_label).on_click({
// }) let verification_uri = data.verification_uri.clone();
// .with_cursor_style(gpui::platform::CursorStyle::PointingHand) cx.listener(move |this, _, cx| {
// } cx.open_url(&verification_uri);
this.connect_clicked = true;
// fn render_prompting_modal( })
// connect_clicked: bool, }),
// data: &PromptUserDeviceFlow, )
// style: &theme::Copilot, // Flex::column()
// cx: &mut ViewContext<Self>, // .with_child(Self::render_device_code(data, &style, cx))
// ) -> AnyElement<Self> { // .with_child(
// enum ConnectButton {} // Flex::column()
// .with_children([
// Flex::column() // Label::new(
// .with_child( // "Paste this code into GitHub after",
// Flex::column() // style.auth.prompting.hint.text.clone(),
// .with_children([ // )
// Label::new( // .aligned(),
// "Enable Copilot by connecting", // Label::new(
// style.auth.prompting.subheading.text.clone(), // "clicking the button below.",
// ) // style.auth.prompting.hint.text.clone(),
// .aligned(), // )
// Label::new( // .aligned(),
// "your existing license.", // ])
// style.auth.prompting.subheading.text.clone(), // .align_children_center()
// ) // .contained()
// .aligned(), // .with_style(style.auth.prompting.hint.container.clone()),
// ]) // )
// .align_children_center() // .with_child(theme::ui::cta_button::<ConnectButton, _, _, _>(
// .contained() // if connect_clicked {
// .with_style(style.auth.prompting.subheading.container), // "Waiting for connection..."
// ) // } else {
// .with_child(Self::render_device_code(data, &style, cx)) // "Connect to GitHub"
// .with_child( // },
// Flex::column() // style.auth.content_width,
// .with_children([ // &style.auth.cta_button,
// Label::new( // cx,
// "Paste this code into GitHub after", // {
// style.auth.prompting.hint.text.clone(), // let verification_uri = data.verification_uri.clone();
// ) // move |_, verification, cx| {
// .aligned(), // cx.platform().open_url(&verification_uri);
// Label::new( // verification.connect_clicked = true;
// "clicking the button below.", // }
// style.auth.prompting.hint.text.clone(), // },
// ) // ))
// .aligned(), // .align_children_center()
// ]) }
// .align_children_center()
// .contained()
// .with_style(style.auth.prompting.hint.container.clone()),
// )
// .with_child(theme::ui::cta_button::<ConnectButton, _, _, _>(
// if connect_clicked {
// "Waiting for connection..."
// } else {
// "Connect to GitHub"
// },
// style.auth.content_width,
// &style.auth.cta_button,
// cx,
// {
// let verification_uri = data.verification_uri.clone();
// move |_, verification, cx| {
// cx.platform().open_url(&verification_uri);
// verification.connect_clicked = true;
// }
// },
// ))
// .align_children_center()
// .into_any()
// }
// fn render_enabled_modal( // fn render_enabled_modal(
// style: &theme::Copilot, // style: &theme::Copilot,
@ -316,10 +340,26 @@ impl CopilotCodeVerification {
} }
impl Render for CopilotCodeVerification { impl Render for CopilotCodeVerification {
type Element = Div; type Element = Stateful<Div>;
fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element { fn render(&mut self, cx: &mut ViewContext<Self>) -> Self::Element {
todo!() let prompt = match &self.status {
Status::SigningIn { prompt } => prompt.as_ref(),
_ => None,
};
div()
.id("copilot code verification")
.flex()
.flex_col()
.size_full()
.items_center()
.p_10()
.bg(cx.theme().colors().element_background)
.child(ui::Label::new("Connect Copilot to Zed"))
.child(IconElement::new(Icon::ZedXCopilot))
.children(
prompt.map(|data| Self::render_prompting_modal(self.connect_clicked, data, cx)),
)
} }
} }

3
crates/ui2/src/components/icon.rs
View file

@ -81,6 +81,7 @@ pub enum Icon {
Shift, Shift,
Option, Option,
Return, Return,
ZedXCopilot,
} }
impl Icon { impl Icon {
@ -109,6 +110,7 @@ impl Icon {
Icon::Close => "icons/x.svg", Icon::Close => "icons/x.svg",
Icon::Collab => "icons/user_group_16.svg", Icon::Collab => "icons/user_group_16.svg",
Icon::Copilot => "icons/copilot.svg", Icon::Copilot => "icons/copilot.svg",
Icon::CopilotInit => "icons/copilot_init.svg", Icon::CopilotInit => "icons/copilot_init.svg",
Icon::CopilotError => "icons/copilot_error.svg", Icon::CopilotError => "icons/copilot_error.svg",
Icon::CopilotDisabled => "icons/copilot_disabled.svg", Icon::CopilotDisabled => "icons/copilot_disabled.svg",
@ -155,6 +157,7 @@ impl Icon {
Icon::Shift => "icons/shift.svg", Icon::Shift => "icons/shift.svg",
Icon::Option => "icons/option.svg", Icon::Option => "icons/option.svg",
Icon::Return => "icons/return.svg", Icon::Return => "icons/return.svg",
Icon::ZedXCopilot => "icons/zed_x_copilot.svg",
} }
} }
} }