Merge branch 'main' into project-panel-context-menu
This commit is contained in:
Max Brunsfeld
@@ -0,0 +1,208 @@
|
||||
use super::base_keymap_setting::BaseKeymap;
|
||||
use fuzzy::{match_strings, StringMatch, StringMatchCandidate};
|
||||
use gpui::{
|
||||
actions, AppContext, DismissEvent, EventEmitter, FocusableView, ParentElement, Render, Task,
|
||||
View, ViewContext, VisualContext, WeakView,
|
||||
};
|
||||
use picker::{Picker, PickerDelegate};
|
||||
use project::Fs;
|
||||
use settings::{update_settings_file, Settings};
|
||||
use std::sync::Arc;
|
||||
use ui::ListItem;
|
||||
use util::ResultExt;
|
||||
use workspace::{ui::HighlightedLabel, Workspace};
|
||||
|
||||
actions!(ToggleBaseKeymapSelector);
|
||||
|
||||
pub fn init(cx: &mut AppContext) {
|
||||
cx.observe_new_views(|workspace: &mut Workspace, _cx| {
|
||||
workspace.register_action(toggle);
|
||||
})
|
||||
.detach();
|
||||
}
|
||||
|
||||
pub fn toggle(
|
||||
workspace: &mut Workspace,
|
||||
_: &ToggleBaseKeymapSelector,
|
||||
cx: &mut ViewContext<Workspace>,
|
||||
) {
|
||||
let fs = workspace.app_state().fs.clone();
|
||||
workspace.toggle_modal(cx, |cx| {
|
||||
BaseKeymapSelector::new(
|
||||
BaseKeymapSelectorDelegate::new(cx.view().downgrade(), fs, cx),
|
||||
cx,
|
||||
)
|
||||
});
|
||||
}
|
||||
|
||||
pub struct BaseKeymapSelector {
|
||||
focus_handle: gpui::FocusHandle,
|
||||
picker: View<Picker<BaseKeymapSelectorDelegate>>,
|
||||
}
|
||||
|
||||
impl FocusableView for BaseKeymapSelector {
|
||||
fn focus_handle(&self, _cx: &AppContext) -> gpui::FocusHandle {
|
||||
self.focus_handle.clone()
|
||||
}
|
||||
}
|
||||
|
||||
impl EventEmitter<DismissEvent> for BaseKeymapSelector {}
|
||||
|
||||
impl BaseKeymapSelector {
|
||||
pub fn new(
|
||||
delegate: BaseKeymapSelectorDelegate,
|
||||
cx: &mut ViewContext<BaseKeymapSelector>,
|
||||
) -> Self {
|
||||
let picker = cx.build_view(|cx| Picker::new(delegate, cx));
|
||||
let focus_handle = cx.focus_handle();
|
||||
Self {
|
||||
focus_handle,
|
||||
picker,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Render for BaseKeymapSelector {
|
||||
type Element = View<Picker<BaseKeymapSelectorDelegate>>;
|
||||
|
||||
fn render(&mut self, _cx: &mut ViewContext<Self>) -> Self::Element {
|
||||
self.picker.clone()
|
||||
}
|
||||
}
|
||||
|
||||
pub struct BaseKeymapSelectorDelegate {
|
||||
view: WeakView<BaseKeymapSelector>,
|
||||
matches: Vec<StringMatch>,
|
||||
selected_index: usize,
|
||||
fs: Arc<dyn Fs>,
|
||||
}
|
||||
|
||||
impl BaseKeymapSelectorDelegate {
|
||||
fn new(
|
||||
weak_view: WeakView<BaseKeymapSelector>,
|
||||
fs: Arc<dyn Fs>,
|
||||
cx: &mut ViewContext<BaseKeymapSelector>,
|
||||
) -> Self {
|
||||
let base = BaseKeymap::get(None, cx);
|
||||
let selected_index = BaseKeymap::OPTIONS
|
||||
.iter()
|
||||
.position(|(_, value)| value == base)
|
||||
.unwrap_or(0);
|
||||
Self {
|
||||
view: weak_view,
|
||||
matches: Vec::new(),
|
||||
selected_index,
|
||||
fs,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl PickerDelegate for BaseKeymapSelectorDelegate {
|
||||
type ListItem = ui::ListItem;
|
||||
|
||||
fn placeholder_text(&self) -> Arc<str> {
|
||||
"Select a base keymap...".into()
|
||||
}
|
||||
|
||||
fn match_count(&self) -> usize {
|
||||
self.matches.len()
|
||||
}
|
||||
|
||||
fn selected_index(&self) -> usize {
|
||||
self.selected_index
|
||||
}
|
||||
|
||||
fn set_selected_index(
|
||||
&mut self,
|
||||
ix: usize,
|
||||
_: &mut ViewContext<Picker<BaseKeymapSelectorDelegate>>,
|
||||
) {
|
||||
self.selected_index = ix;
|
||||
}
|
||||
|
||||
fn update_matches(
|
||||
&mut self,
|
||||
query: String,
|
||||
cx: &mut ViewContext<Picker<BaseKeymapSelectorDelegate>>,
|
||||
) -> Task<()> {
|
||||
let background = cx.background_executor().clone();
|
||||
let candidates = BaseKeymap::names()
|
||||
.enumerate()
|
||||
.map(|(id, name)| StringMatchCandidate {
|
||||
id,
|
||||
char_bag: name.into(),
|
||||
string: name.into(),
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
|
||||
cx.spawn(|this, mut cx| async move {
|
||||
let matches = if query.is_empty() {
|
||||
candidates
|
||||
.into_iter()
|
||||
.enumerate()
|
||||
.map(|(index, candidate)| StringMatch {
|
||||
candidate_id: index,
|
||||
string: candidate.string,
|
||||
positions: Vec::new(),
|
||||
score: 0.0,
|
||||
})
|
||||
.collect()
|
||||
} else {
|
||||
match_strings(
|
||||
&candidates,
|
||||
&query,
|
||||
false,
|
||||
100,
|
||||
&Default::default(),
|
||||
background,
|
||||
)
|
||||
.await
|
||||
};
|
||||
|
||||
this.update(&mut cx, |this, _| {
|
||||
this.delegate.matches = matches;
|
||||
this.delegate.selected_index = this
|
||||
.delegate
|
||||
.selected_index
|
||||
.min(this.delegate.matches.len().saturating_sub(1));
|
||||
})
|
||||
.log_err();
|
||||
})
|
||||
}
|
||||
|
||||
fn confirm(&mut self, _: bool, cx: &mut ViewContext<Picker<BaseKeymapSelectorDelegate>>) {
|
||||
if let Some(selection) = self.matches.get(self.selected_index) {
|
||||
let base_keymap = BaseKeymap::from_names(&selection.string);
|
||||
update_settings_file::<BaseKeymap>(self.fs.clone(), cx, move |setting| {
|
||||
*setting = Some(base_keymap)
|
||||
});
|
||||
}
|
||||
|
||||
self.view
|
||||
.update(cx, |_, cx| {
|
||||
cx.emit(DismissEvent);
|
||||
})
|
||||
.ok();
|
||||
}
|
||||
|
||||
fn dismissed(&mut self, _cx: &mut ViewContext<Picker<BaseKeymapSelectorDelegate>>) {}
|
||||
|
||||
fn render_match(
|
||||
&self,
|
||||
ix: usize,
|
||||
selected: bool,
|
||||
_cx: &mut gpui::ViewContext<Picker<Self>>,
|
||||
) -> Option<Self::ListItem> {
|
||||
let keymap_match = &self.matches[ix];
|
||||
|
||||
Some(
|
||||
ListItem::new(ix)
|
||||
.selected(selected)
|
||||
.inset(true)
|
||||
.child(HighlightedLabel::new(
|
||||
keymap_match.string.clone(),
|
||||
keymap_match.positions.clone(),
|
||||
)),
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
use schemars::JsonSchema;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use settings::Settings;
|
||||
|
||||
#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema, PartialEq, Eq, Default)]
|
||||
pub enum BaseKeymap {
|
||||
#[default]
|
||||
VSCode,
|
||||
JetBrains,
|
||||
SublimeText,
|
||||
Atom,
|
||||
TextMate,
|
||||
}
|
||||
|
||||
impl BaseKeymap {
|
||||
pub const OPTIONS: [(&'static str, Self); 5] = [
|
||||
("VSCode (Default)", Self::VSCode),
|
||||
("Atom", Self::Atom),
|
||||
("JetBrains", Self::JetBrains),
|
||||
("Sublime Text", Self::SublimeText),
|
||||
("TextMate", Self::TextMate),
|
||||
];
|
||||
|
||||
pub fn asset_path(&self) -> Option<&'static str> {
|
||||
match self {
|
||||
BaseKeymap::JetBrains => Some("keymaps/jetbrains.json"),
|
||||
BaseKeymap::SublimeText => Some("keymaps/sublime_text.json"),
|
||||
BaseKeymap::Atom => Some("keymaps/atom.json"),
|
||||
BaseKeymap::TextMate => Some("keymaps/textmate.json"),
|
||||
BaseKeymap::VSCode => None,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn names() -> impl Iterator<Item = &'static str> {
|
||||
Self::OPTIONS.iter().map(|(name, _)| *name)
|
||||
}
|
||||
|
||||
pub fn from_names(option: &str) -> BaseKeymap {
|
||||
Self::OPTIONS
|
||||
.iter()
|
||||
.copied()
|
||||
.find_map(|(name, value)| (name == option).then(|| value))
|
||||
.unwrap_or_default()
|
||||
}
|
||||
}
|
||||
|
||||
impl Settings for BaseKeymap {
|
||||
const KEY: Option<&'static str> = Some("base_keymap");
|
||||
|
||||
type FileContent = Option<Self>;
|
||||
|
||||
fn load(
|
||||
default_value: &Self::FileContent,
|
||||
user_values: &[&Self::FileContent],
|
||||
_: &mut gpui::AppContext,
|
||||
) -> anyhow::Result<Self>
|
||||
where
|
||||
Self: Sized,
|
||||
{
|
||||
Ok(user_values
|
||||
.first()
|
||||
.and_then(|v| **v)
|
||||
.unwrap_or(default_value.unwrap()))
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,281 @@
|
||||
mod base_keymap_picker;
|
||||
mod base_keymap_setting;
|
||||
|
||||
use db::kvp::KEY_VALUE_STORE;
|
||||
use gpui::{
|
||||
div, red, AnyElement, AppContext, Div, Element, EventEmitter, FocusHandle, Focusable,
|
||||
FocusableView, InteractiveElement, ParentElement, Render, Styled, Subscription, View,
|
||||
ViewContext, VisualContext, WeakView, WindowContext,
|
||||
};
|
||||
use settings::{Settings, SettingsStore};
|
||||
use std::sync::Arc;
|
||||
use workspace::{
|
||||
dock::DockPosition,
|
||||
item::{Item, ItemEvent},
|
||||
open_new, AppState, Welcome, Workspace, WorkspaceId,
|
||||
};
|
||||
|
||||
pub use base_keymap_setting::BaseKeymap;
|
||||
|
||||
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 = cx.build_view(|cx| WelcomePage::new(workspace, cx));
|
||||
workspace.add_item(Box::new(welcome_page), cx)
|
||||
});
|
||||
})
|
||||
.detach();
|
||||
|
||||
base_keymap_picker::init(cx);
|
||||
}
|
||||
|
||||
pub fn show_welcome_experience(app_state: &Arc<AppState>, cx: &mut AppContext) {
|
||||
open_new(&app_state, cx, |workspace, cx| {
|
||||
workspace.toggle_dock(DockPosition::Left, cx);
|
||||
let welcome_page = cx.build_view(|cx| WelcomePage::new(workspace, cx));
|
||||
workspace.add_item_to_center(Box::new(welcome_page.clone()), cx);
|
||||
cx.focus_view(&welcome_page);
|
||||
cx.notify();
|
||||
})
|
||||
.detach();
|
||||
|
||||
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,
|
||||
_settings_subscription: Subscription,
|
||||
}
|
||||
|
||||
impl Render for WelcomePage {
|
||||
type Element = Focusable<Div>;
|
||||
|
||||
fn render(&mut self, _cx: &mut gpui::ViewContext<Self>) -> Self::Element {
|
||||
// todo!(welcome_ui)
|
||||
// let self_handle = cx.handle();
|
||||
// let theme = cx.theme();
|
||||
// let width = theme.welcome.page_width;
|
||||
|
||||
// let telemetry_settings = TelemetrySettings::get(None, cx);
|
||||
// let vim_mode_setting = VimModeSettings::get(cx);
|
||||
|
||||
div()
|
||||
.track_focus(&self.focus_handle)
|
||||
.child(div().size_full().bg(red()).child("Welcome!"))
|
||||
//todo!()
|
||||
// PaneBackdrop::new(
|
||||
// self_handle.id(),
|
||||
// Flex::column()
|
||||
// .with_child(
|
||||
// Flex::column()
|
||||
// .with_child(
|
||||
// theme::ui::svg(&theme.welcome.logo)
|
||||
// .aligned()
|
||||
// .contained()
|
||||
// .aligned(),
|
||||
// )
|
||||
// .with_child(
|
||||
// Label::new(
|
||||
// "Code at the speed of thought",
|
||||
// theme.welcome.logo_subheading.text.clone(),
|
||||
// )
|
||||
// .aligned()
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.logo_subheading.container),
|
||||
// )
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.heading_group)
|
||||
// .constrained()
|
||||
// .with_width(width),
|
||||
// )
|
||||
// .with_child(
|
||||
// Flex::column()
|
||||
// .with_child(theme::ui::cta_button::<theme_selector::Toggle, _, _, _>(
|
||||
// "Choose a theme",
|
||||
// width,
|
||||
// &theme.welcome.button,
|
||||
// cx,
|
||||
// |_, this, cx| {
|
||||
// if let Some(workspace) = this.workspace.upgrade(cx) {
|
||||
// workspace.update(cx, |workspace, cx| {
|
||||
// theme_selector::toggle(workspace, &Default::default(), cx)
|
||||
// })
|
||||
// }
|
||||
// },
|
||||
// ))
|
||||
// .with_child(theme::ui::cta_button::<ToggleBaseKeymapSelector, _, _, _>(
|
||||
// "Choose a keymap",
|
||||
// width,
|
||||
// &theme.welcome.button,
|
||||
// cx,
|
||||
// |_, this, cx| {
|
||||
// if let Some(workspace) = this.workspace.upgrade(cx) {
|
||||
// workspace.update(cx, |workspace, cx| {
|
||||
// base_keymap_picker::toggle(
|
||||
// workspace,
|
||||
// &Default::default(),
|
||||
// cx,
|
||||
// )
|
||||
// })
|
||||
// }
|
||||
// },
|
||||
// ))
|
||||
// .with_child(theme::ui::cta_button::<install_cli::Install, _, _, _>(
|
||||
// "Install the CLI",
|
||||
// width,
|
||||
// &theme.welcome.button,
|
||||
// cx,
|
||||
// |_, _, cx| {
|
||||
// cx.app_context()
|
||||
// .spawn(|cx| async move { install_cli::install_cli(&cx).await })
|
||||
// .detach_and_log_err(cx);
|
||||
// },
|
||||
// ))
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.button_group)
|
||||
// .constrained()
|
||||
// .with_width(width),
|
||||
// )
|
||||
// .with_child(
|
||||
// Flex::column()
|
||||
// .with_child(
|
||||
// theme::ui::checkbox::<Diagnostics, Self, _>(
|
||||
// "Enable vim mode",
|
||||
// &theme.welcome.checkbox,
|
||||
// vim_mode_setting,
|
||||
// 0,
|
||||
// cx,
|
||||
// |this, checked, cx| {
|
||||
// if let Some(workspace) = this.workspace.upgrade(cx) {
|
||||
// let fs = workspace.read(cx).app_state().fs.clone();
|
||||
// update_settings_file::<VimModeSetting>(
|
||||
// fs,
|
||||
// cx,
|
||||
// move |setting| *setting = Some(checked),
|
||||
// )
|
||||
// }
|
||||
// },
|
||||
// )
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.checkbox_container),
|
||||
// )
|
||||
// .with_child(
|
||||
// theme::ui::checkbox_with_label::<Metrics, _, Self, _>(
|
||||
// Flex::column()
|
||||
// .with_child(
|
||||
// Label::new(
|
||||
// "Send anonymous usage data",
|
||||
// theme.welcome.checkbox.label.text.clone(),
|
||||
// )
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.checkbox.label.container),
|
||||
// )
|
||||
// .with_child(
|
||||
// Label::new(
|
||||
// "Help > View Telemetry",
|
||||
// theme.welcome.usage_note.text.clone(),
|
||||
// )
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.usage_note.container),
|
||||
// ),
|
||||
// &theme.welcome.checkbox,
|
||||
// telemetry_settings.metrics,
|
||||
// 0,
|
||||
// cx,
|
||||
// |this, checked, cx| {
|
||||
// if let Some(workspace) = this.workspace.upgrade(cx) {
|
||||
// let fs = workspace.read(cx).app_state().fs.clone();
|
||||
// update_settings_file::<TelemetrySettings>(
|
||||
// fs,
|
||||
// cx,
|
||||
// move |setting| setting.metrics = Some(checked),
|
||||
// )
|
||||
// }
|
||||
// },
|
||||
// )
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.checkbox_container),
|
||||
// )
|
||||
// .with_child(
|
||||
// theme::ui::checkbox::<Diagnostics, Self, _>(
|
||||
// "Send crash reports",
|
||||
// &theme.welcome.checkbox,
|
||||
// telemetry_settings.diagnostics,
|
||||
// 1,
|
||||
// cx,
|
||||
// |this, checked, cx| {
|
||||
// if let Some(workspace) = this.workspace.upgrade(cx) {
|
||||
// let fs = workspace.read(cx).app_state().fs.clone();
|
||||
// update_settings_file::<TelemetrySettings>(
|
||||
// fs,
|
||||
// cx,
|
||||
// move |setting| setting.diagnostics = Some(checked),
|
||||
// )
|
||||
// }
|
||||
// },
|
||||
// )
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.checkbox_container),
|
||||
// )
|
||||
// .contained()
|
||||
// .with_style(theme.welcome.checkbox_group)
|
||||
// .constrained()
|
||||
// .with_width(width),
|
||||
// )
|
||||
// .constrained()
|
||||
// .with_max_width(width)
|
||||
// .contained()
|
||||
// .with_uniform_padding(10.)
|
||||
// .aligned()
|
||||
// .into_any(),
|
||||
// )
|
||||
// .into_any_named("welcome page")
|
||||
}
|
||||
}
|
||||
|
||||
impl WelcomePage {
|
||||
pub fn new(workspace: &Workspace, cx: &mut ViewContext<Self>) -> Self {
|
||||
WelcomePage {
|
||||
focus_handle: cx.focus_handle(),
|
||||
workspace: workspace.weak_handle(),
|
||||
_settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl EventEmitter<ItemEvent> for WelcomePage {}
|
||||
|
||||
impl FocusableView for WelcomePage {
|
||||
fn focus_handle(&self, _: &AppContext) -> gpui::FocusHandle {
|
||||
self.focus_handle.clone()
|
||||
}
|
||||
}
|
||||
|
||||
impl Item for WelcomePage {
|
||||
fn tab_content(&self, _: Option<usize>, _: &WindowContext) -> AnyElement {
|
||||
"Welcome to Zed!".into_any()
|
||||
}
|
||||
|
||||
fn show_toolbar(&self) -> bool {
|
||||
false
|
||||
}
|
||||
|
||||
fn clone_on_split(
|
||||
&self,
|
||||
_workspace_id: WorkspaceId,
|
||||
cx: &mut ViewContext<Self>,
|
||||
) -> Option<View<Self>> {
|
||||
Some(cx.build_view(|cx| WelcomePage {
|
||||
focus_handle: cx.focus_handle(),
|
||||
workspace: self.workspace.clone(),
|
||||
_settings_subscription: cx.observe_global::<SettingsStore>(move |_, cx| cx.notify()),
|
||||
}))
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user