fc4c533d0a
This changes the Zed CLI `zed` to pass along the environment to the Zed project that it opens (if it opens a new one). In projects, this CLI environment will now take precedence over any environment that's acquired by running a login shell in a projects folder. The result is that `zed my/folder` now always behaves as if one would run `zed --foreground` without any previous Zed version running. Closes #7894 Closes #16293 Related issues: - It fixes the issue described in here: https://github.com/zed-industries/zed/issues/4977#issuecomment-2305272027 Release Notes: - Improved the Zed CLI `zed` to pass along the environment as it was on the CLI to the opened Zed project. That environment is then used when opening new terminals, spawning tasks, or language servers. Specifically: - If Zed was started via `zed my-folder`, a terminal spawned with `workspace: new terminal` will inherit these environment variables that existed on the CLI - Specific language servers that allow looking up the language server binary in the environments `$PATH` (such as `gopls`, `zls`, `rust-analyzer` if configured, ...) will look up the language server binary in the CLI environment too and use that environment when starting the process. - Language servers that are _not_ found in the CLI environment (or configured to not be found in there), will be spawned with the CLI environment in case that's set. That means users can do something like `RA_LOG=info zed .` and it will be picked up the rust-analyzer that was spawned. Demo/explanation: https://github.com/user-attachments/assets/455905cc-8b7c-4fc4-b98a-7e027d97cdfa
334 lines
14 KiB
Rust
334 lines
14 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, AppContext, EventEmitter, FocusHandle, FocusableView, InteractiveElement,
|
|
ParentElement, Render, Styled, Subscription, Task, View, ViewContext, VisualContext, WeakView,
|
|
WindowContext,
|
|
};
|
|
use settings::{Settings, SettingsStore};
|
|
use std::sync::Arc;
|
|
use ui::{prelude::*, CheckboxWithLabel};
|
|
use vim::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 fn init(cx: &mut AppContext) {
|
|
BaseKeymap::register(cx);
|
|
|
|
cx.observe_new_views(|workspace: &mut Workspace, _cx| {
|
|
workspace.register_action(|workspace, _: &Welcome, cx| {
|
|
let welcome_page = WelcomePage::new(workspace, cx);
|
|
workspace.add_item_to_active_pane(Box::new(welcome_page), None, true, 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 AppContext,
|
|
) -> Task<anyhow::Result<()>> {
|
|
open_new(Default::default(), app_state, cx, |workspace, cx| {
|
|
workspace.toggle_dock(DockPosition::Left, cx);
|
|
let welcome_page = WelcomePage::new(workspace, cx);
|
|
workspace.add_item_to_center(Box::new(welcome_page.clone()), cx);
|
|
cx.focus_view(&welcome_page);
|
|
cx.notify();
|
|
|
|
db::write_and_log(cx, || {
|
|
KEY_VALUE_STORE.write_kvp(FIRST_OPEN.to_string(), "false".to_string())
|
|
});
|
|
})
|
|
}
|
|
|
|
pub struct WelcomePage {
|
|
workspace: WeakView<Workspace>,
|
|
focus_handle: FocusHandle,
|
|
telemetry: Arc<Telemetry>,
|
|
_settings_subscription: Subscription,
|
|
}
|
|
|
|
impl Render for WelcomePage {
|
|
fn render(&mut self, cx: &mut gpui::ViewContext<Self>) -> impl IntoElement {
|
|
h_flex()
|
|
.size_full()
|
|
.bg(cx.theme().colors().editor_background)
|
|
.track_focus(&self.focus_handle)
|
|
.child(
|
|
v_flex()
|
|
.w_96()
|
|
.gap_4()
|
|
.mx_auto()
|
|
.child(
|
|
svg()
|
|
.path("icons/logo_96.svg")
|
|
.text_color(gpui::white())
|
|
.w(px(96.))
|
|
.h(px(96.))
|
|
.mx_auto(),
|
|
)
|
|
.child(
|
|
h_flex()
|
|
.justify_center()
|
|
.child(Label::new("Code at the speed of thought")),
|
|
)
|
|
.child(
|
|
v_flex()
|
|
.gap_2()
|
|
.child(
|
|
Button::new("choose-theme", "Choose a theme")
|
|
.full_width()
|
|
.on_click(cx.listener(|this, _, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: change theme".to_string(),
|
|
);
|
|
this.workspace
|
|
.update(cx, |workspace, cx| {
|
|
theme_selector::toggle(
|
|
workspace,
|
|
&Default::default(),
|
|
cx,
|
|
)
|
|
})
|
|
.ok();
|
|
})),
|
|
)
|
|
.child(
|
|
Button::new("choose-keymap", "Choose a keymap")
|
|
.full_width()
|
|
.on_click(cx.listener(|this, _, 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(),
|
|
cx,
|
|
)
|
|
})
|
|
.ok();
|
|
})),
|
|
)
|
|
.when(cfg!(target_os = "macos"), |el| {
|
|
el.child(
|
|
Button::new("install-cli", "Install the CLI")
|
|
.full_width()
|
|
.on_click(cx.listener(|this, _, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: install cli".to_string(),
|
|
);
|
|
cx.app_mut()
|
|
.spawn(|cx| async move {
|
|
install_cli::install_cli(&cx).await
|
|
})
|
|
.detach_and_log_err(cx);
|
|
})),
|
|
)
|
|
})
|
|
.child(
|
|
Button::new("sign-in-to-copilot", "Sign in to GitHub Copilot")
|
|
.full_width()
|
|
.on_click(cx.listener(|this, _, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: sign in to copilot".to_string(),
|
|
);
|
|
inline_completion_button::initiate_sign_in(cx);
|
|
})),
|
|
)
|
|
.child(
|
|
Button::new("explore extensions", "Explore extensions")
|
|
.full_width()
|
|
.on_click(cx.listener(|this, _, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: open extensions".to_string(),
|
|
);
|
|
cx.dispatch_action(Box::new(extensions_ui::Extensions));
|
|
})),
|
|
),
|
|
)
|
|
.child(
|
|
v_flex()
|
|
.p_3()
|
|
.gap_2()
|
|
.bg(cx.theme().colors().elevated_surface_background)
|
|
.border_1()
|
|
.border_color(cx.theme().colors().border)
|
|
.rounded_md()
|
|
.child(CheckboxWithLabel::new(
|
|
"enable-vim",
|
|
Label::new("Enable vim mode"),
|
|
if VimModeSetting::get_global(cx).0 {
|
|
ui::Selection::Selected
|
|
} else {
|
|
ui::Selection::Unselected
|
|
},
|
|
cx.listener(move |this, selection, cx| {
|
|
this.telemetry
|
|
.report_app_event("welcome page: toggle vim".to_string());
|
|
this.update_settings::<VimModeSetting>(
|
|
selection,
|
|
cx,
|
|
|setting, value| *setting = Some(value),
|
|
);
|
|
}),
|
|
))
|
|
.child(CheckboxWithLabel::new(
|
|
"enable-telemetry",
|
|
Label::new("Send anonymous usage data"),
|
|
if TelemetrySettings::get_global(cx).metrics {
|
|
ui::Selection::Selected
|
|
} else {
|
|
ui::Selection::Unselected
|
|
},
|
|
cx.listener(move |this, selection, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: toggle metric telemetry".to_string(),
|
|
);
|
|
this.update_settings::<TelemetrySettings>(selection, cx, {
|
|
let telemetry = this.telemetry.clone();
|
|
|
|
move |settings, value| {
|
|
settings.metrics = Some(value);
|
|
|
|
telemetry.report_setting_event(
|
|
"metric telemetry",
|
|
value.to_string(),
|
|
);
|
|
}
|
|
});
|
|
}),
|
|
))
|
|
.child(CheckboxWithLabel::new(
|
|
"enable-crash",
|
|
Label::new("Send crash reports"),
|
|
if TelemetrySettings::get_global(cx).diagnostics {
|
|
ui::Selection::Selected
|
|
} else {
|
|
ui::Selection::Unselected
|
|
},
|
|
cx.listener(move |this, selection, cx| {
|
|
this.telemetry.report_app_event(
|
|
"welcome page: toggle diagnostic telemetry".to_string(),
|
|
);
|
|
this.update_settings::<TelemetrySettings>(selection, cx, {
|
|
let telemetry = this.telemetry.clone();
|
|
|
|
move |settings, value| {
|
|
settings.diagnostics = Some(value);
|
|
|
|
telemetry.report_setting_event(
|
|
"diagnostic telemetry",
|
|
value.to_string(),
|
|
);
|
|
}
|
|
});
|
|
}),
|
|
)),
|
|
),
|
|
)
|
|
}
|
|
}
|
|
|
|
impl WelcomePage {
|
|
pub fn new(workspace: &Workspace, cx: &mut ViewContext<Workspace>) -> View<Self> {
|
|
let this = cx.new_view(|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 update_settings<T: Settings>(
|
|
&mut self,
|
|
selection: &Selection,
|
|
cx: &mut ViewContext<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 {
|
|
Selection::Unselected => false,
|
|
Selection::Selected => true,
|
|
_ => return,
|
|
};
|
|
|
|
callback(settings, value)
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
impl EventEmitter<ItemEvent> for WelcomePage {}
|
|
|
|
impl FocusableView for WelcomePage {
|
|
fn focus_handle(&self, _: &AppContext) -> gpui::FocusHandle {
|
|
self.focus_handle.clone()
|
|
}
|
|
}
|
|
|
|
impl Item for WelcomePage {
|
|
type Event = ItemEvent;
|
|
|
|
fn tab_content_text(&self, _cx: &WindowContext) -> Option<SharedString> {
|
|
Some("Welcome to Zed!".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>,
|
|
cx: &mut ViewContext<Self>,
|
|
) -> Option<View<Self>> {
|
|
Some(cx.new_view(|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)
|
|
}
|
|
}
|