diff --git a/crates/recent_projects2/src/projects.rs b/crates/recent_projects2/src/projects.rs new file mode 100644 index 0000000000000000000000000000000000000000..2c4809dbd7635cf619002ffcac15d5feb3a1c3c2 --- /dev/null +++ b/crates/recent_projects2/src/projects.rs @@ -0,0 +1 @@ +gpui::actions!(OpenRecent); diff --git a/crates/recent_projects2/src/recent_projects.rs b/crates/recent_projects2/src/recent_projects.rs index 0c11f2b9c7d9d579aa5de810078236bccec432f4..d2c13b40a33645f14060cc421a8c43c2b19b7c8f 100644 --- a/crates/recent_projects2/src/recent_projects.rs +++ b/crates/recent_projects2/src/recent_projects.rs @@ -1,9 +1,10 @@ mod highlighted_workspace_location; +mod projects; use fuzzy::{StringMatch, StringMatchCandidate}; use gpui::{ - actions, AppContext, DismissEvent, Div, EventEmitter, FocusHandle, FocusableView, Result, Task, - View, ViewContext, WeakView, + AppContext, DismissEvent, Div, EventEmitter, FocusHandle, FocusableView, Result, Task, View, + ViewContext, WeakView, }; use highlighted_workspace_location::HighlightedWorkspaceLocation; use ordered_float::OrderedFloat; @@ -16,7 +17,7 @@ use workspace::{ WORKSPACE_DB, }; -actions!(OpenRecent); +pub use projects::OpenRecent; pub fn init(cx: &mut AppContext) { cx.observe_new_views(RecentProjects::register).detach(); diff --git a/crates/terminal2/src/terminal2.rs b/crates/terminal2/src/terminal2.rs index 6036d65d6e8c59d3aff234952980564ec9f71bec..b429bda710aa09d61fe26ba259353f55ab64d5ec 100644 --- a/crates/terminal2/src/terminal2.rs +++ b/crates/terminal2/src/terminal2.rs @@ -50,7 +50,7 @@ use std::{ use thiserror::Error; use gpui::{ - px, AnyWindowHandle, AppContext, Bounds, ClipboardItem, EventEmitter, Hsla, Keystroke, + actions, px, AnyWindowHandle, AppContext, Bounds, ClipboardItem, EventEmitter, Hsla, Keystroke, ModelContext, Modifiers, MouseButton, MouseDownEvent, MouseMoveEvent, MouseUpEvent, Pixels, Point, ScrollWheelEvent, Size, Task, TouchPhase, }; @@ -58,6 +58,16 @@ use gpui::{ use crate::mappings::{colors::to_alac_rgb, keys::to_esc_str}; use lazy_static::lazy_static; +actions!( + Clear, + Copy, + Paste, + ShowCharacterPalette, + SearchTest, + SendText, + SendKeystroke, +); + ///Scrolling is unbearably sluggish by default. Alacritty supports a configurable ///Scroll multiplier that is set to 3 by default. This will be removed when I ///Implement scroll bars. diff --git a/crates/terminal_view2/src/terminal_view.rs b/crates/terminal_view2/src/terminal_view.rs index 75b019f2ef24639d12577854c59ceedb48607669..5a81b494b300a09a947b4012f2e7460859df996c 100644 --- a/crates/terminal_view2/src/terminal_view.rs +++ b/crates/terminal_view2/src/terminal_view.rs @@ -9,9 +9,9 @@ pub mod terminal_panel; // use crate::terminal_element::TerminalElement; use editor::{scroll::autoscroll::Autoscroll, Editor}; use gpui::{ - actions, div, Action, AnyElement, AppContext, Div, EventEmitter, FocusEvent, FocusHandle, - Focusable, FocusableElement, FocusableView, KeyContext, KeyDownEvent, Keystroke, Model, - MouseButton, MouseDownEvent, Pixels, Render, Subscription, Task, View, VisualContext, WeakView, + div, Action, AnyElement, AppContext, Div, EventEmitter, FocusEvent, FocusHandle, Focusable, + FocusableElement, FocusableView, KeyContext, KeyDownEvent, Keystroke, Model, MouseButton, + MouseDownEvent, Pixels, Render, Subscription, Task, View, VisualContext, WeakView, }; use language::Bias; use persistence::TERMINAL_DB; @@ -22,7 +22,7 @@ use terminal::{ term::{search::RegexSearch, TermMode}, }, terminal_settings::{TerminalBlink, TerminalSettings, WorkingDirectory}, - Event, MaybeNavigationTarget, Terminal, + Clear, Copy, Event, MaybeNavigationTarget, Paste, ShowCharacterPalette, Terminal, }; use terminal_element::TerminalElement; use ui::{h_stack, prelude::*, ContextMenu, Icon, IconElement, Label}; @@ -60,8 +60,6 @@ pub struct SendText(String); #[derive(Clone, Debug, Default, Deserialize, PartialEq, Action)] pub struct SendKeystroke(String); -actions!(Clear, Copy, Paste, ShowCharacterPalette, SearchTest); - pub fn init(cx: &mut AppContext) { terminal_panel::init(cx); terminal::init(cx);