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

Sketch in core zed actions code

Browse source
This commit is contained in:
Mikayla 2023-11-13 17:34:12 -08:00
parent 58f9ef99f7
commit ec16e70336
No known key found for this signature in database
5 changed files with 274 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

38
crates/Cargo.toml
View file

@ -1,38 +0,0 @@
[package]
name = "ai"
version = "0.1.0"
edition = "2021"
publish = false
[lib]
path = "src/ai.rs"
doctest = false
[features]
test-support = []
[dependencies]
gpui = { path = "../gpui" }
util = { path = "../util" }
language = { path = "../language" }
async-trait.workspace = true
anyhow.workspace = true
futures.workspace = true
lazy_static.workspace = true
ordered-float.workspace = true
parking_lot.workspace = true
isahc.workspace = true
regex.workspace = true
serde.workspace = true
serde_json.workspace = true
postage.workspace = true
rand.workspace = true
log.workspace = true
parse_duration = "2.1.1"
tiktoken-rs = "0.5.0"
matrixmultiply = "0.3.7"
rusqlite = { version = "0.29.0", features = ["blob", "array", "modern_sqlite"] }
bincode = "1.3.3"
[dev-dependencies]
gpui = { path = "../gpui", features = ["test-support"] }

5
crates/workspace2/src/workspace2.rs
View file

@ -72,7 +72,7 @@ pub use toolbar::{ToolbarItemLocation, ToolbarItemView};
use ui::{h_stack, Label};
use util::ResultExt;
use uuid::Uuid;
use workspace_settings::{AutosaveSetting, WorkspaceSettings};
pub use workspace_settings::{AutosaveSetting, WorkspaceSettings};
lazy_static! {
static ref ZED_WINDOW_SIZE: Option<Size<GlobalPixels>> = env::var("ZED_WINDOW_SIZE")
@ -3506,13 +3506,14 @@ impl Workspace {
pub fn register_action<A: Action>(
&mut self,
callback: impl Fn(&mut Self, &A, &mut ViewContext<Self>) + 'static,
) {
) -> &mut Self {
let callback = Arc::new(callback);
self.workspace_actions.push(Box::new(move |div| {
let callback = callback.clone();
div.on_action(move |workspace, event, cx| (callback.clone())(workspace, event, cx))
}));
self
}
fn add_workspace_actions_listeners(

7
crates/zed2/src/main.rs
View file

@ -50,14 +50,16 @@ use util::{
use uuid::Uuid;
use workspace::{AppState, WorkspaceStore};
use zed2::{
build_window_options, ensure_only_instance, handle_cli_connection, initialize_workspace,
languages, Assets, IsOnlyInstance, OpenListener, OpenRequest,
build_window_options, ensure_only_instance, handle_cli_connection, init_zed_actions,
initialize_workspace, languages, Assets, IsOnlyInstance, OpenListener, OpenRequest,
};
mod open_listener;
fn main() {
menu::init();
zed_actions::init();
let http = http::client();
init_paths();
init_logger();
@ -209,6 +211,7 @@ fn main() {
// zed::init(&app_state, cx);
// cx.set_menus(menus::menus());
init_zed_actions(cx);
if stdout_is_a_pty() {
cx.activate(true);

257
crates/zed2/src/zed2.rs
View file

@ -15,6 +15,7 @@ pub use only_instance::*;
pub use open_listener::*;
use anyhow::Result;
use settings::Settings;
use std::sync::Arc;
use uuid::Uuid;
use workspace::{AppState, Workspace};
@ -47,6 +48,214 @@ pub fn build_window_options(
}
}
pub fn init_zed_actions(cx: &mut AppContext) {
cx.observe_new_views(|workspace: &mut Workspace, cx| {
workspace
// cx.add_action(about);
// cx.add_global_action(|_: &Hide, cx: &mut gpui::AppContext| {
// cx.platform().hide();
// });
// cx.add_global_action(|_: &HideOthers, cx: &mut gpui::AppContext| {
// cx.platform().hide_other_apps();
// });
// cx.add_global_action(|_: &ShowAll, cx: &mut gpui::AppContext| {
// cx.platform().unhide_other_apps();
// });
// cx.add_action(
// |_: &mut Workspace, _: &Minimize, cx: &mut ViewContext<Workspace>| {
// cx.minimize_window();
// },
// );
// cx.add_action(
// |_: &mut Workspace, _: &Zoom, cx: &mut ViewContext<Workspace>| {
// cx.zoom_window();
// },
// );
// cx.add_action(
// |_: &mut Workspace, _: &ToggleFullScreen, cx: &mut ViewContext<Workspace>| {
// cx.toggle_full_screen();
// },
// );
.register_action(|workspace, _: &zed_actions::Quit, cx| quit(cx));
// cx.add_global_action(move |action: &OpenZedURL, cx| {
// cx.global::<Arc<OpenListener>>()
// .open_urls(vec![action.url.clone()])
// });
// cx.add_global_action(move |action: &OpenBrowser, cx| cx.platform().open_url(&action.url));
// cx.add_global_action(move |_: &IncreaseBufferFontSize, cx| {
// theme::adjust_font_size(cx, |size| *size += 1.0)
// });
// cx.add_global_action(move |_: &DecreaseBufferFontSize, cx| {
// theme::adjust_font_size(cx, |size| *size -= 1.0)
// });
// cx.add_global_action(move |_: &ResetBufferFontSize, cx| theme::reset_font_size(cx));
// cx.add_global_action(move |_: &install_cli::Install, cx| {
// cx.spawn(|cx| async move {
// install_cli::install_cli(&cx)
// .await
// .context("error creating CLI symlink")
// })
// .detach_and_log_err(cx);
// });
// cx.add_action(
// move |workspace: &mut Workspace, _: &OpenLog, cx: &mut ViewContext<Workspace>| {
// open_log_file(workspace, cx);
// },
// );
// cx.add_action(
// move |workspace: &mut Workspace, _: &OpenLicenses, cx: &mut ViewContext<Workspace>| {
// open_bundled_file(
// workspace,
// asset_str::<Assets>("licenses.md"),
// "Open Source License Attribution",
// "Markdown",
// cx,
// );
// },
// );
// cx.add_action(
// move |workspace: &mut Workspace, _: &OpenTelemetryLog, cx: &mut ViewContext<Workspace>| {
// open_telemetry_log_file(workspace, cx);
// },
// );
// cx.add_action(
// move |_: &mut Workspace, _: &OpenKeymap, cx: &mut ViewContext<Workspace>| {
// create_and_open_local_file(&paths::KEYMAP, cx, Default::default).detach_and_log_err(cx);
// },
// );
// cx.add_action(
// move |_: &mut Workspace, _: &OpenSettings, cx: &mut ViewContext<Workspace>| {
// create_and_open_local_file(&paths::SETTINGS, cx, || {
// settings::initial_user_settings_content().as_ref().into()
// })
// .detach_and_log_err(cx);
// },
// );
// cx.add_action(open_local_settings_file);
// cx.add_action(
// move |workspace: &mut Workspace, _: &OpenDefaultKeymap, cx: &mut ViewContext<Workspace>| {
// open_bundled_file(
// workspace,
// settings::default_keymap(),
// "Default Key Bindings",
// "JSON",
// cx,
// );
// },
// );
// cx.add_action(
// move |workspace: &mut Workspace,
// _: &OpenDefaultSettings,
// cx: &mut ViewContext<Workspace>| {
// open_bundled_file(
// workspace,
// settings::default_settings(),
// "Default Settings",
// "JSON",
// cx,
// );
// },
// );
// cx.add_action({
// move |workspace: &mut Workspace, _: &DebugElements, cx: &mut ViewContext<Workspace>| {
// let app_state = workspace.app_state().clone();
// let markdown = app_state.languages.language_for_name("JSON");
// let window = cx.window();
// cx.spawn(|workspace, mut cx| async move {
// let markdown = markdown.await.log_err();
// let content = to_string_pretty(&window.debug_elements(&cx).ok_or_else(|| {
// anyhow!("could not debug elements for window {}", window.id())
// })?)
// .unwrap();
// workspace
// .update(&mut cx, |workspace, cx| {
// workspace.with_local_workspace(cx, move |workspace, cx| {
// let project = workspace.project().clone();
// let buffer = project
// .update(cx, |project, cx| {
// project.create_buffer(&content, markdown, cx)
// })
// .expect("creating buffers on a local workspace always succeeds");
// let buffer = cx.add_model(|cx| {
// MultiBuffer::singleton(buffer, cx)
// .with_title("Debug Elements".into())
// });
// workspace.add_item(
// Box::new(cx.add_view(|cx| {
// Editor::for_multibuffer(buffer, Some(project.clone()), cx)
// })),
// cx,
// );
// })
// })?
// .await
// })
// .detach_and_log_err(cx);
// }
// });
// cx.add_action(
// |workspace: &mut Workspace,
// _: &project_panel::ToggleFocus,
// cx: &mut ViewContext<Workspace>| {
// workspace.toggle_panel_focus::<ProjectPanel>(cx);
// },
// );
// cx.add_action(
// |workspace: &mut Workspace,
// _: &collab_ui::collab_panel::ToggleFocus,
// cx: &mut ViewContext<Workspace>| {
// workspace.toggle_panel_focus::<collab_ui::collab_panel::CollabPanel>(cx);
// },
// );
// cx.add_action(
// |workspace: &mut Workspace,
// _: &collab_ui::chat_panel::ToggleFocus,
// cx: &mut ViewContext<Workspace>| {
// workspace.toggle_panel_focus::<collab_ui::chat_panel::ChatPanel>(cx);
// },
// );
// cx.add_action(
// |workspace: &mut Workspace,
// _: &collab_ui::notification_panel::ToggleFocus,
// cx: &mut ViewContext<Workspace>| {
// workspace.toggle_panel_focus::<collab_ui::notification_panel::NotificationPanel>(cx);
// },
// );
// cx.add_action(
// |workspace: &mut Workspace,
// _: &terminal_panel::ToggleFocus,
// cx: &mut ViewContext<Workspace>| {
// workspace.toggle_panel_focus::<TerminalPanel>(cx);
// },
// );
// cx.add_global_action({
// let app_state = Arc::downgrade(&app_state);
// move |_: &NewWindow, cx: &mut AppContext| {
// if let Some(app_state) = app_state.upgrade() {
// open_new(&app_state, cx, |workspace, cx| {
// Editor::new_file(workspace, &Default::default(), cx)
// })
// .detach();
// }
// }
// });
// cx.add_global_action({
// let app_state = Arc::downgrade(&app_state);
// move |_: &NewFile, cx: &mut AppContext| {
// if let Some(app_state) = app_state.upgrade() {
// open_new(&app_state, cx, |workspace, cx| {
// Editor::new_file(workspace, &Default::default(), cx)
// })
// .detach();
// }
// }
// });
// load_default_keymap(cx);
})
.detach();
}
pub fn initialize_workspace(
workspace_handle: WeakView<Workspace>,
was_deserialized: bool,
@ -205,3 +414,51 @@ pub fn initialize_workspace(
Ok(())
})
}
fn quit(cx: &mut gpui::AppContext) {
let should_confirm = workspace::WorkspaceSettings::get_global(cx).confirm_quit;
cx.spawn(|mut cx| async move {
// let mut workspace_windows = cx
// .windows()
// .into_iter()
// .filter_map(|window| window.downcast::<Workspace>())
// .collect::<Vec<_>>();
// // If multiple windows have unsaved changes, and need a save prompt,
// // prompt in the active window before switching to a different window.
// workspace_windows.sort_by_key(|window| window.is_active(&cx) == Some(false));
// if let (true, Some(window)) = (should_confirm, workspace_windows.first().copied()) {
// let answer = window.prompt(
// PromptLevel::Info,
// "Are you sure you want to quit?",
// &["Quit", "Cancel"],
// &mut cx,
// );
// if let Some(mut answer) = answer {
// let answer = answer.next().await;
// if answer != Some(0) {
// return Ok(());
// }
// }
// }
// // If the user cancels any save prompt, then keep the app open.
// for window in workspace_windows {
// if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
// workspace.prepare_to_close(true, cx)
// }) {
// if !should_close.await? {
// return Ok(());
// }
// }
// }
cx.update(|cx| {
cx.quit();
})?;
anyhow::Ok(())
})
.detach_and_log_err(cx);
}

9
crates/zed_actions2/src/lib.rs
View file

@ -1,5 +1,14 @@
use gpui::{action, actions};
// If the zed binary doesn't use anything in this crate, it will be optimized away
// and the actions won't initialize. So we just provide an empty initialization function
// to be called from main.
//
// These may provide relevant context:
// https://github.com/rust-lang/rust/issues/47384
// https://github.com/mmastrac/rust-ctor/issues/280
pub fn init() {}
actions!(
About,
DebugElements,