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

Fix variable names

Browse source
This commit is contained in:
Joseph Lyons 2023-02-07 21:08:07 -05:00
parent 7cef4a5d40
commit 317eb7535c
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/feedback/src/feedback_editor.rs
View file

@ -45,8 +45,8 @@ pub fn init(system_specs: SystemSpecs, app_state: Arc<AppState>, cx: &mut Mutabl
}); });
cx.add_async_action( cx.add_async_action(
|toolbar_button: &mut ToolbarButton, _: &SubmitFeedback, cx| { |submit_feedback_button: &mut SubmitFeedbackButton, _: &SubmitFeedback, cx| {
if let Some(active_item) = toolbar_button.active_item.as_ref() { if let Some(active_item) = submit_feedback_button.active_item.as_ref() {
Some(active_item.update(cx, |feedback_editor, cx| feedback_editor.handle_save(cx))) Some(active_item.update(cx, |feedback_editor, cx| feedback_editor.handle_save(cx)))
} else { } else {
None None
@ -55,15 +55,15 @@ pub fn init(system_specs: SystemSpecs, app_state: Arc<AppState>, cx: &mut Mutabl
); );
} }
pub struct StatusBarButton; pub struct DeployFeedbackButton;
impl Entity for StatusBarButton { impl Entity for DeployFeedbackButton {
type Event = (); type Event = ();
} }
impl View for StatusBarButton { impl View for DeployFeedbackButton {
fn ui_name() -> &'static str { fn ui_name() -> &'static str {
"StatusBarButton" "DeployFeedbackButton"
} }
fn render(&mut self, cx: &mut RenderContext<'_, Self>) -> ElementBox { fn render(&mut self, cx: &mut RenderContext<'_, Self>) -> ElementBox {
@ -87,7 +87,7 @@ impl View for StatusBarButton {
} }
} }
impl StatusItemView for StatusBarButton { impl StatusItemView for DeployFeedbackButton {
fn set_active_pane_item(&mut self, _: Option<&dyn ItemHandle>, _: &mut ViewContext<Self>) {} fn set_active_pane_item(&mut self, _: Option<&dyn ItemHandle>, _: &mut ViewContext<Self>) {}
} }
@ -442,11 +442,11 @@ impl SearchableItem for FeedbackEditor {
} }
} }
pub struct ToolbarButton { pub struct SubmitFeedbackButton {
active_item: Option<ViewHandle<FeedbackEditor>>, active_item: Option<ViewHandle<FeedbackEditor>>,
} }
impl ToolbarButton { impl SubmitFeedbackButton {
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
active_item: Default::default(), active_item: Default::default(),
@ -454,13 +454,13 @@ impl ToolbarButton {
} }
} }
impl Entity for ToolbarButton { impl Entity for SubmitFeedbackButton {
type Event = (); type Event = ();
} }
impl View for ToolbarButton { impl View for SubmitFeedbackButton {
fn ui_name() -> &'static str { fn ui_name() -> &'static str {
"ToolbarButton" "SubmitFeedbackButton"
} }
fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox { fn render(&mut self, cx: &mut RenderContext<Self>) -> ElementBox {
@ -484,7 +484,7 @@ impl View for ToolbarButton {
} }
} }
impl ToolbarItemView for ToolbarButton { impl ToolbarItemView for SubmitFeedbackButton {
fn set_active_pane_item( fn set_active_pane_item(
&mut self, &mut self,
active_pane_item: Option<&dyn ItemHandle>, active_pane_item: Option<&dyn ItemHandle>,

6
crates/zed/src/zed.rs
View file

@ -11,7 +11,7 @@ use collections::VecDeque;
pub use editor; pub use editor;
use editor::{Editor, MultiBuffer}; use editor::{Editor, MultiBuffer};
use feedback::feedback_editor::ToolbarButton; use feedback::feedback_editor::SubmitFeedbackButton;
use futures::StreamExt; use futures::StreamExt;
use gpui::{ use gpui::{
actions, actions,
@ -288,7 +288,7 @@ pub fn initialize_workspace(
toolbar.add_item(buffer_search_bar, cx); toolbar.add_item(buffer_search_bar, cx);
let project_search_bar = cx.add_view(|_| ProjectSearchBar::new()); let project_search_bar = cx.add_view(|_| ProjectSearchBar::new());
toolbar.add_item(project_search_bar, cx); toolbar.add_item(project_search_bar, cx);
let submit_feedback_button = cx.add_view(|_| ToolbarButton::new()); let submit_feedback_button = cx.add_view(|_| SubmitFeedbackButton::new());
toolbar.add_item(submit_feedback_button, cx); toolbar.add_item(submit_feedback_button, cx);
}) })
}); });
@ -347,7 +347,7 @@ pub fn initialize_workspace(
let activity_indicator = let activity_indicator =
activity_indicator::ActivityIndicator::new(workspace, app_state.languages.clone(), cx); activity_indicator::ActivityIndicator::new(workspace, app_state.languages.clone(), cx);
let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new()); let cursor_position = cx.add_view(|_| editor::items::CursorPosition::new());
let feedback_button = cx.add_view(|_| feedback::feedback_editor::StatusBarButton {}); let feedback_button = cx.add_view(|_| feedback::feedback_editor::DeployFeedbackButton {});
workspace.status_bar().update(cx, |status_bar, cx| { workspace.status_bar().update(cx, |status_bar, cx| {
status_bar.add_left_item(diagnostic_summary, cx); status_bar.add_left_item(diagnostic_summary, cx);
status_bar.add_left_item(activity_indicator, cx); status_bar.add_left_item(activity_indicator, cx);