6fca1d2b0b
There's still a bit more work to do on this, but this PR is compiling (with warnings) after eliminating the key types. When the tasks below are complete, this will be the new narrative for GPUI: - `Entity<T>` - This replaces `View<T>`/`Model<T>`. It represents a unit of state, and if `T` implements `Render`, then `Entity<T>` implements `Element`. - `&mut App` This replaces `AppContext` and represents the app. - `&mut Context<T>` This replaces `ModelContext` and derefs to `App`. It is provided by the framework when updating an entity. - `&mut Window` Broken out of `&mut WindowContext` which no longer exists. Every method that once took `&mut WindowContext` now takes `&mut Window, &mut App` and every method that took `&mut ViewContext<T>` now takes `&mut Window, &mut Context<T>` Not pictured here are the two other failed attempts. It's been quite a month! Tasks: - [x] Remove `View`, `ViewContext`, `WindowContext` and thread through `Window` - [x] [@cole-miller @mikayla-maki] Redraw window when entities change - [x] [@cole-miller @mikayla-maki] Get examples and Zed running - [x] [@cole-miller @mikayla-maki] Fix Zed rendering - [x] [@mikayla-maki] Fix todo! macros and comments - [x] Fix a bug where the editor would not be redrawn because of view caching - [x] remove publicness window.notify() and replace with `AppContext::notify` - [x] remove `observe_new_window_models`, replace with `observe_new_models` with an optional window - [x] Fix a bug where the project panel would not be redrawn because of the wrong refresh() call being used - [x] Fix the tests - [x] Fix warnings by eliminating `Window` params or using `_` - [x] Fix conflicts - [x] Simplify generic code where possible - [x] Rename types - [ ] Update docs ### issues post merge - [x] Issues switching between normal and insert mode - [x] Assistant re-rendering failure - [x] Vim test failures - [x] Mac build issue Release Notes: - N/A --------- Co-authored-by: Antonio Scandurra <me@as-cii.com> Co-authored-by: Cole Miller <cole@zed.dev> Co-authored-by: Mikayla <mikayla@zed.dev> Co-authored-by: Joseph <joseph@zed.dev> Co-authored-by: max <max@zed.dev> Co-authored-by: Michael Sloan <michael@zed.dev> Co-authored-by: Mikayla Maki <mikaylamaki@Mikaylas-MacBook-Pro.local> Co-authored-by: Mikayla <mikayla.c.maki@gmail.com> Co-authored-by: joão <joao@zed.dev>
459 lines
22 KiB
Rust
459 lines
22 KiB
Rust
mod base_keymap_picker;
|
|
mod base_keymap_setting;
|
|
mod multibuffer_hint;
|
|
|
|
use client::{telemetry::Telemetry, TelemetrySettings};
|
|
use db::kvp::KEY_VALUE_STORE;
|
|
use gpui::{
|
|
actions, svg, Action, App, Context, Entity, EventEmitter, FocusHandle, Focusable,
|
|
InteractiveElement, ParentElement, Render, Styled, Subscription, Task, WeakEntity, Window,
|
|
};
|
|
use settings::{Settings, SettingsStore};
|
|
use std::sync::Arc;
|
|
use ui::{prelude::*, CheckboxWithLabel, ElevationIndex, Tooltip};
|
|
use vim_mode_setting::VimModeSetting;
|
|
use workspace::{
|
|
dock::DockPosition,
|
|
item::{Item, ItemEvent},
|
|
open_new, AppState, Welcome, Workspace, WorkspaceId,
|
|
};
|
|
|
|
pub use base_keymap_setting::BaseKeymap;
|
|
pub use multibuffer_hint::*;
|
|
|
|
actions!(welcome, [ResetHints]);
|
|
|
|
pub const FIRST_OPEN: &str = "first_open";
|
|
pub const DOCS_URL: &str = "https://zed.dev/docs/";
|
|
const BOOK_ONBOARDING: &str = "https://dub.sh/zed-c-onboarding";
|
|
|
|
pub fn init(cx: &mut App) {
|
|
BaseKeymap::register(cx);
|
|
|
|
cx.observe_new(|workspace: &mut Workspace, _, _cx| {
|
|
workspace.register_action(|workspace, _: &Welcome, window, cx| {
|
|
let welcome_page = WelcomePage::new(workspace, cx);
|
|
workspace.add_item_to_active_pane(Box::new(welcome_page), None, true, window, cx)
|
|
});
|
|
workspace
|
|
.register_action(|_workspace, _: &ResetHints, _, cx| MultibufferHint::set_count(0, cx));
|
|
})
|
|
.detach();
|
|
|
|
base_keymap_picker::init(cx);
|
|
}
|
|
|
|
pub fn show_welcome_view(app_state: Arc<AppState>, cx: &mut App) -> Task<anyhow::Result<()>> {
|
|
open_new(
|
|
Default::default(),
|
|
app_state,
|
|
cx,
|
|
|workspace, window, cx| {
|
|
workspace.toggle_dock(DockPosition::Left, window, cx);
|
|
let welcome_page = WelcomePage::new(workspace, cx);
|
|
workspace.add_item_to_center(Box::new(welcome_page.clone()), window, cx);
|
|
|
|
window.focus(&welcome_page.focus_handle(cx));
|
|
|
|
cx.notify();
|
|
|
|
db::write_and_log(cx, || {
|
|
KEY_VALUE_STORE.write_kvp(FIRST_OPEN.to_string(), "false".to_string())
|
|
});
|
|
},
|
|
)
|
|
}
|
|
|
|
pub struct WelcomePage {
|
|
workspace: WeakEntity<Workspace>,
|
|
focus_handle: FocusHandle,
|
|
telemetry: Arc<Telemetry>,
|
|
_settings_subscription: Subscription,
|
|
}
|
|
|
|
impl Render for WelcomePage {
|
|
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
|
|
h_flex()
|
|
.size_full()
|
|
.bg(cx.theme().colors().editor_background)
|
|
.key_context("Welcome")
|
|
.track_focus(&self.focus_handle(cx))
|
|
.child(
|
|
v_flex()
|
|
.gap_8()
|
|
.mx_auto()
|
|
.child(
|
|
v_flex()
|
|
.w_full()
|
|
.child(
|
|
svg()
|
|
.path("icons/logo_96.svg")
|
|
.text_color(cx.theme().colors().icon_disabled)
|
|
.w(px(40.))
|
|
.h(px(40.))
|
|
.mx_auto()
|
|
.mb_4(),
|
|
)
|
|
.child(
|
|
h_flex()
|
|
.w_full()
|
|
.justify_center()
|
|
.child(Headline::new("Welcome to Zed")),
|
|
)
|
|
.child(
|
|
h_flex().w_full().justify_center().child(
|
|
Label::new("The editor for what's next")
|
|
.color(Color::Muted)
|
|
.italic(true),
|
|
),
|
|
),
|
|
)
|
|
.child(
|
|
h_flex()
|
|
.items_start()
|
|
.gap_8()
|
|
.child(
|
|
v_flex()
|
|
.gap_2()
|
|
.pr_8()
|
|
.border_r_1()
|
|
.border_color(cx.theme().colors().border_variant)
|
|
.child(
|
|
self.section_label( cx).child(
|
|
Label::new("Get Started")
|
|
.size(LabelSize::XSmall)
|
|
.color(Color::Muted),
|
|
),
|
|
)
|
|
.child(
|
|
Button::new("choose-theme", "Choose a Theme")
|
|
.icon(IconName::SwatchBook)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.icon_position(IconPosition::Start)
|
|
.on_click(cx.listener(|this, _, window, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: change theme".to_string(),
|
|
);
|
|
this.workspace
|
|
.update(cx, |_workspace, cx| {
|
|
window.dispatch_action(zed_actions::theme_selector::Toggle::default().boxed_clone(), cx);
|
|
})
|
|
.ok();
|
|
})),
|
|
)
|
|
.child(
|
|
Button::new("choose-keymap", "Choose a Keymap")
|
|
.icon(IconName::Keyboard)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.icon_position(IconPosition::Start)
|
|
.on_click(cx.listener(|this, _, window, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: change keymap".to_string(),
|
|
);
|
|
this.workspace
|
|
.update(cx, |workspace, cx| {
|
|
base_keymap_picker::toggle(
|
|
workspace,
|
|
&Default::default(),
|
|
window, cx,
|
|
)
|
|
})
|
|
.ok();
|
|
})),
|
|
)
|
|
.child(
|
|
Button::new(
|
|
"sign-in-to-copilot",
|
|
"Sign in to GitHub Copilot",
|
|
)
|
|
.icon(IconName::Copilot)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.icon_position(IconPosition::Start)
|
|
.on_click(
|
|
cx.listener(|this, _, window, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: sign in to copilot".to_string(),
|
|
);
|
|
copilot::initiate_sign_in(window, cx);
|
|
}),
|
|
),
|
|
)
|
|
.child(
|
|
Button::new("edit settings", "Edit Settings")
|
|
.icon(IconName::Settings)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.icon_position(IconPosition::Start)
|
|
.on_click(cx.listener(|this, _, window, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: edit settings".to_string(),
|
|
);
|
|
window.dispatch_action(Box::new(
|
|
zed_actions::OpenSettings,
|
|
), cx);
|
|
})),
|
|
),
|
|
)
|
|
.child(
|
|
v_flex()
|
|
.gap_2()
|
|
.child(
|
|
self.section_label(cx).child(
|
|
Label::new("Resources")
|
|
.size(LabelSize::XSmall)
|
|
.color(Color::Muted),
|
|
),
|
|
)
|
|
.when(cfg!(target_os = "macos"), |el| {
|
|
el.child(
|
|
Button::new("install-cli", "Install the CLI")
|
|
.icon(IconName::Terminal)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.icon_position(IconPosition::Start)
|
|
.on_click(cx.listener(|this, _, _, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: install cli".to_string(),
|
|
);
|
|
cx
|
|
.spawn(|_, cx| async move {
|
|
install_cli::install_cli(&cx).await
|
|
})
|
|
.detach_and_log_err(cx);
|
|
})),
|
|
)
|
|
})
|
|
.child(
|
|
Button::new("view-docs", "View Documentation")
|
|
.icon(IconName::FileCode)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.icon_position(IconPosition::Start)
|
|
.on_click(cx.listener(|this, _, _, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: view docs".to_string(),
|
|
);
|
|
cx.open_url(DOCS_URL);
|
|
})),
|
|
)
|
|
.child(
|
|
Button::new("explore-extensions", "Explore Extensions")
|
|
.icon(IconName::Blocks)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.icon_position(IconPosition::Start)
|
|
.on_click(cx.listener(|this, _, window, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: open extensions".to_string(),
|
|
);
|
|
window.dispatch_action(Box::new(
|
|
zed_actions::Extensions,
|
|
), cx);
|
|
})),
|
|
)
|
|
.child(
|
|
Button::new("book-onboarding", "Book Onboarding")
|
|
.icon(IconName::PhoneIncoming)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.icon_position(IconPosition::Start)
|
|
.on_click(cx.listener(|_, _, _, cx| {
|
|
cx.open_url(BOOK_ONBOARDING);
|
|
})),
|
|
),
|
|
),
|
|
)
|
|
.child(
|
|
v_group()
|
|
.gap_2()
|
|
.child(
|
|
h_flex()
|
|
.justify_between()
|
|
.child(
|
|
CheckboxWithLabel::new(
|
|
"enable-vim",
|
|
Label::new("Enable Vim Mode"),
|
|
if VimModeSetting::get_global(cx).0 {
|
|
ui::ToggleState::Selected
|
|
} else {
|
|
ui::ToggleState::Unselected
|
|
},
|
|
cx.listener(move |this, selection, _window, cx| {
|
|
this.telemetry
|
|
.report_app_event("welcome page: toggle vim".to_string());
|
|
this.update_settings::<VimModeSetting>(
|
|
selection,
|
|
cx,
|
|
|setting, value| *setting = Some(value),
|
|
);
|
|
}),
|
|
)
|
|
.fill()
|
|
.elevation(ElevationIndex::ElevatedSurface),
|
|
)
|
|
.child(
|
|
IconButton::new("vim-mode", IconName::Info)
|
|
.icon_size(IconSize::XSmall)
|
|
.icon_color(Color::Muted)
|
|
.tooltip(
|
|
Tooltip::text(
|
|
"You can also toggle Vim Mode via the command palette or Editor Controls menu.")
|
|
),
|
|
),
|
|
)
|
|
.child(
|
|
CheckboxWithLabel::new(
|
|
"enable-crash",
|
|
Label::new("Send Crash Reports"),
|
|
if TelemetrySettings::get_global(cx).diagnostics {
|
|
ui::ToggleState::Selected
|
|
} else {
|
|
ui::ToggleState::Unselected
|
|
},
|
|
cx.listener(move |this, selection, _window, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: toggle diagnostic telemetry".to_string(),
|
|
);
|
|
this.update_settings::<TelemetrySettings>(selection, cx, {
|
|
move |settings, value| {
|
|
settings.diagnostics = Some(value);
|
|
telemetry::event!(
|
|
"Settings Changed",
|
|
setting = "diagnostic telemetry",
|
|
value
|
|
);
|
|
}
|
|
});
|
|
}),
|
|
)
|
|
.fill()
|
|
.elevation(ElevationIndex::ElevatedSurface),
|
|
)
|
|
.child(
|
|
CheckboxWithLabel::new(
|
|
"enable-telemetry",
|
|
Label::new("Send Telemetry"),
|
|
if TelemetrySettings::get_global(cx).metrics {
|
|
ui::ToggleState::Selected
|
|
} else {
|
|
ui::ToggleState::Unselected
|
|
},
|
|
cx.listener(move |this, selection, _window, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: toggle metric telemetry".to_string(),
|
|
);
|
|
this.update_settings::<TelemetrySettings>(selection, cx, {
|
|
move |settings, value| {
|
|
settings.metrics = Some(value);
|
|
telemetry::event!(
|
|
"Settings Changed",
|
|
setting = "metric telemetry",
|
|
value
|
|
);
|
|
}
|
|
});
|
|
}),
|
|
)
|
|
.fill()
|
|
.elevation(ElevationIndex::ElevatedSurface),
|
|
),
|
|
),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl WelcomePage {
|
|
pub fn new(workspace: &Workspace, cx: &mut Context<Workspace>) -> Entity<Self> {
|
|
let this = cx.new(|cx| {
|
|
cx.on_release(|this: &mut Self, _| {
|
|
this.telemetry
|
|
.report_app_event("welcome page: close".to_string());
|
|
})
|
|
.detach();
|
|
|
|
WelcomePage {
|
|
focus_handle: cx.focus_handle(),
|
|
workspace: workspace.weak_handle(),
|
|
telemetry: workspace.client().telemetry().clone(),
|
|
_settings_subscription: cx
|
|
.observe_global::<SettingsStore>(move |_, cx| cx.notify()),
|
|
}
|
|
});
|
|
|
|
this
|
|
}
|
|
|
|
fn section_label(&self, cx: &mut App) -> Div {
|
|
div()
|
|
.pl_1()
|
|
.font_buffer(cx)
|
|
.text_color(Color::Muted.color(cx))
|
|
}
|
|
|
|
fn update_settings<T: Settings>(
|
|
&mut self,
|
|
selection: &ToggleState,
|
|
cx: &mut Context<Self>,
|
|
callback: impl 'static + Send + Fn(&mut T::FileContent, bool),
|
|
) {
|
|
if let Some(workspace) = self.workspace.upgrade() {
|
|
let fs = workspace.read(cx).app_state().fs.clone();
|
|
let selection = *selection;
|
|
settings::update_settings_file::<T>(fs, cx, move |settings, _| {
|
|
let value = match selection {
|
|
ToggleState::Unselected => false,
|
|
ToggleState::Selected => true,
|
|
_ => return,
|
|
};
|
|
|
|
callback(settings, value)
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
impl EventEmitter<ItemEvent> for WelcomePage {}
|
|
|
|
impl Focusable for WelcomePage {
|
|
fn focus_handle(&self, _: &App) -> gpui::FocusHandle {
|
|
self.focus_handle.clone()
|
|
}
|
|
}
|
|
|
|
impl Item for WelcomePage {
|
|
type Event = ItemEvent;
|
|
|
|
fn tab_content_text(&self, _window: &Window, _cx: &App) -> Option<SharedString> {
|
|
Some("Welcome".into())
|
|
}
|
|
|
|
fn telemetry_event_text(&self) -> Option<&'static str> {
|
|
Some("welcome page")
|
|
}
|
|
|
|
fn show_toolbar(&self) -> bool {
|
|
false
|
|
}
|
|
|
|
fn clone_on_split(
|
|
&self,
|
|
_workspace_id: Option<WorkspaceId>,
|
|
_: &mut Window,
|
|
cx: &mut Context<Self>,
|
|
) -> Option<Entity<Self>> {
|
|
Some(cx.new(|cx| WelcomePage {
|
|
focus_handle: cx.focus_handle(),
|
|
workspace: self.workspace.clone(),
|
|
telemetry: self.telemetry.clone(),
|
|
_settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()),
|
|
}))
|
|
}
|
|
|
|
fn to_item_events(event: &Self::Event, mut f: impl FnMut(workspace::item::ItemEvent)) {
|
|
f(*event)
|
|
}
|
|
}
|