diff --git a/editor/src/dispatcher.rs b/editor/src/dispatcher.rs index 0af0f2e830..8823ca17cc 100644 --- a/editor/src/dispatcher.rs +++ b/editor/src/dispatcher.rs @@ -106,15 +106,15 @@ impl Dispatcher { queue.push_back(FrontendMessage::TriggerFontLoad { font, is_default: true }.into()); } - Broadcast(message) => self.message_handlers.broadcast_message_handler.process_message(message, (), &mut queue), + Broadcast(message) => self.message_handlers.broadcast_message_handler.process_message(message, &mut queue, ()), Debug(message) => { - self.message_handlers.debug_message_handler.process_message(message, (), &mut queue); + self.message_handlers.debug_message_handler.process_message(message, &mut queue, ()); } Dialog(message) => { self.message_handlers.dialog_message_handler.process_message( message, - (&self.message_handlers.portfolio_message_handler, &self.message_handlers.preferences_message_handler), &mut queue, + (&self.message_handlers.portfolio_message_handler, &self.message_handlers.preferences_message_handler), ); } Frontend(message) => { @@ -131,55 +131,53 @@ impl Dispatcher { } } Globals(message) => { - self.message_handlers.globals_message_handler.process_message(message, (), &mut queue); + self.message_handlers.globals_message_handler.process_message(message, &mut queue, ()); } InputMapper(message) => { let actions = self.collect_actions(); self.message_handlers .input_mapper_message_handler - .process_message(message, (&self.message_handlers.input_preprocessor_message_handler, actions), &mut queue); + .process_message(message, &mut queue, (&self.message_handlers.input_preprocessor_message_handler, actions)); } InputPreprocessor(message) => { let keyboard_platform = GLOBAL_PLATFORM.get().copied().unwrap_or_default().as_keyboard_platform_layout(); - self.message_handlers.input_preprocessor_message_handler.process_message(message, keyboard_platform, &mut queue); + self.message_handlers.input_preprocessor_message_handler.process_message(message, &mut queue, keyboard_platform); } Layout(message) => { let action_input_mapping = &|action_to_find: &MessageDiscriminant| self.message_handlers.input_mapper_message_handler.action_input_mapping(action_to_find); - self.message_handlers.layout_message_handler.process_message(message, action_input_mapping, &mut queue); + self.message_handlers.layout_message_handler.process_message(message, &mut queue, action_input_mapping); } Portfolio(message) => { self.message_handlers.portfolio_message_handler.process_message( message, - (&self.message_handlers.input_preprocessor_message_handler, &self.message_handlers.preferences_message_handler), &mut queue, + (&self.message_handlers.input_preprocessor_message_handler, &self.message_handlers.preferences_message_handler), ); } Preferences(message) => { - self.message_handlers.preferences_message_handler.process_message(message, (), &mut queue); + self.message_handlers.preferences_message_handler.process_message(message, &mut queue, ()); } Tool(message) => { if let Some(document) = self.message_handlers.portfolio_message_handler.active_document() { self.message_handlers.tool_message_handler.process_message( message, + &mut queue, ( document, self.message_handlers.portfolio_message_handler.active_document_id().unwrap(), &self.message_handlers.input_preprocessor_message_handler, &self.message_handlers.portfolio_message_handler.persistent_data, ), - &mut queue, ); } else { warn!("Called ToolMessage without an active document.\nGot {:?}", message); } } Workspace(message) => { - self.message_handlers - .workspace_message_handler - .process_message(message, &self.message_handlers.input_preprocessor_message_handler, &mut queue); + self.message_handlers.workspace_message_handler.process_message(message, &mut queue, ()); } } diff --git a/editor/src/generate_ts_types.rs b/editor/src/generate_ts_types.rs index 83b5d922a8..2dcf11da21 100644 --- a/editor/src/generate_ts_types.rs +++ b/editor/src/generate_ts_types.rs @@ -1,6 +1,7 @@ /// Running this test will generate a `types.ts` file at the root of the repo, /// containing every type annotated with `specta::Type` // #[cfg(all(test, feature = "specta-export"))] +#[ignore] #[test] fn generate_ts_types() { use crate::messages::prelude::FrontendMessage; diff --git a/editor/src/messages/broadcast/broadcast_message_handler.rs b/editor/src/messages/broadcast/broadcast_message_handler.rs index c463f72e1c..7bda6f1565 100644 --- a/editor/src/messages/broadcast/broadcast_message_handler.rs +++ b/editor/src/messages/broadcast/broadcast_message_handler.rs @@ -7,7 +7,7 @@ pub struct BroadcastMessageHandler { impl MessageHandler for BroadcastMessageHandler { #[remain::check] - fn process_message(&mut self, message: BroadcastMessage, _data: (), responses: &mut VecDeque) { + fn process_message(&mut self, message: BroadcastMessage, responses: &mut VecDeque, _data: ()) { #[remain::sorted] match message { // Sub-messages diff --git a/editor/src/messages/debug/debug_message_handler.rs b/editor/src/messages/debug/debug_message_handler.rs index 107dfb6391..2c2a4a090d 100644 --- a/editor/src/messages/debug/debug_message_handler.rs +++ b/editor/src/messages/debug/debug_message_handler.rs @@ -8,7 +8,7 @@ pub struct DebugMessageHandler { impl MessageHandler for DebugMessageHandler { #[remain::check] - fn process_message(&mut self, message: DebugMessage, _data: (), responses: &mut VecDeque) { + fn process_message(&mut self, message: DebugMessage, responses: &mut VecDeque, _data: ()) { match message { DebugMessage::ToggleTraceLogs => { if log::max_level() == log::LevelFilter::Debug { diff --git a/editor/src/messages/dialog/dialog_message_handler.rs b/editor/src/messages/dialog/dialog_message_handler.rs index 9d8b4a579b..501f2c2d1d 100644 --- a/editor/src/messages/dialog/dialog_message_handler.rs +++ b/editor/src/messages/dialog/dialog_message_handler.rs @@ -12,15 +12,15 @@ pub struct DialogMessageHandler { impl MessageHandler for DialogMessageHandler { #[remain::check] - fn process_message(&mut self, message: DialogMessage, (portfolio, preferences): (&PortfolioMessageHandler, &PreferencesMessageHandler), responses: &mut VecDeque) { + fn process_message(&mut self, message: DialogMessage, responses: &mut VecDeque, (portfolio, preferences): (&PortfolioMessageHandler, &PreferencesMessageHandler)) { #[remain::sorted] match message { #[remain::unsorted] - DialogMessage::ExportDialog(message) => self.export_dialog.process_message(message, (), responses), + DialogMessage::ExportDialog(message) => self.export_dialog.process_message(message, responses, ()), #[remain::unsorted] - DialogMessage::NewDocumentDialog(message) => self.new_document_dialog.process_message(message, (), responses), + DialogMessage::NewDocumentDialog(message) => self.new_document_dialog.process_message(message, responses, ()), #[remain::unsorted] - DialogMessage::PreferencesDialog(message) => self.preferences_dialog.process_message(message, preferences, responses), + DialogMessage::PreferencesDialog(message) => self.preferences_dialog.process_message(message, responses, preferences), DialogMessage::CloseAllDocumentsWithConfirmation => { let dialog = simple_dialogs::CloseAllDocumentsDialog; diff --git a/editor/src/messages/dialog/export_dialog/export_dialog_message_handler.rs b/editor/src/messages/dialog/export_dialog/export_dialog_message_handler.rs index 9c723ad52f..3ea86815fe 100644 --- a/editor/src/messages/dialog/export_dialog/export_dialog_message_handler.rs +++ b/editor/src/messages/dialog/export_dialog/export_dialog_message_handler.rs @@ -20,7 +20,7 @@ pub struct ExportDialogMessageHandler { } impl MessageHandler for ExportDialogMessageHandler { - fn process_message(&mut self, message: ExportDialogMessage, _data: (), responses: &mut VecDeque) { + fn process_message(&mut self, message: ExportDialogMessage, responses: &mut VecDeque, _data: ()) { match message { ExportDialogMessage::FileName(name) => self.file_name = name, ExportDialogMessage::FileType(export_type) => self.file_type = export_type, diff --git a/editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs b/editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs index f7f5f39be5..73c4af9c1a 100644 --- a/editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs +++ b/editor/src/messages/dialog/new_document_dialog/new_document_dialog_message_handler.rs @@ -16,7 +16,7 @@ pub struct NewDocumentDialogMessageHandler { } impl MessageHandler for NewDocumentDialogMessageHandler { - fn process_message(&mut self, message: NewDocumentDialogMessage, _data: (), responses: &mut VecDeque) { + fn process_message(&mut self, message: NewDocumentDialogMessage, responses: &mut VecDeque, _data: ()) { match message { NewDocumentDialogMessage::Name(name) => self.name = name, NewDocumentDialogMessage::Infinite(infinite) => self.infinite = infinite, diff --git a/editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs b/editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs index 48d40abd2f..58d70553f3 100644 --- a/editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs +++ b/editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs @@ -10,7 +10,7 @@ use crate::messages::prelude::*; pub struct PreferencesDialogMessageHandler {} impl MessageHandler for PreferencesDialogMessageHandler { - fn process_message(&mut self, message: PreferencesDialogMessage, preferences: &PreferencesMessageHandler, responses: &mut VecDeque) { + fn process_message(&mut self, message: PreferencesDialogMessage, responses: &mut VecDeque, preferences: &PreferencesMessageHandler) { match message { PreferencesDialogMessage::Confirm => {} } diff --git a/editor/src/messages/globals/globals_message_handler.rs b/editor/src/messages/globals/globals_message_handler.rs index ebb8137ddb..31edfd3c03 100644 --- a/editor/src/messages/globals/globals_message_handler.rs +++ b/editor/src/messages/globals/globals_message_handler.rs @@ -5,7 +5,7 @@ pub struct GlobalsMessageHandler {} impl MessageHandler for GlobalsMessageHandler { #[remain::check] - fn process_message(&mut self, message: GlobalsMessage, _data: (), _responses: &mut VecDeque) { + fn process_message(&mut self, message: GlobalsMessage, _responses: &mut VecDeque, _data: ()) { match message { GlobalsMessage::SetPlatform { platform } => { if GLOBAL_PLATFORM.get() != Some(&platform) { diff --git a/editor/src/messages/input_mapper/input_mapper_message_handler.rs b/editor/src/messages/input_mapper/input_mapper_message_handler.rs index 3c976f7f2b..016c3feaed 100644 --- a/editor/src/messages/input_mapper/input_mapper_message_handler.rs +++ b/editor/src/messages/input_mapper/input_mapper_message_handler.rs @@ -11,7 +11,7 @@ pub struct InputMapperMessageHandler { } impl MessageHandler for InputMapperMessageHandler { - fn process_message(&mut self, message: InputMapperMessage, (input, actions): (&InputPreprocessorMessageHandler, ActionList), responses: &mut VecDeque) { + fn process_message(&mut self, message: InputMapperMessage, responses: &mut VecDeque, (input, actions): (&InputPreprocessorMessageHandler, ActionList)) { if let Some(message) = self.mapping.match_input_message(message, &input.keyboard, actions) { responses.push_back(message); } diff --git a/editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs b/editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs index 5af48b337e..ca703e7507 100644 --- a/editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs +++ b/editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs @@ -17,9 +17,7 @@ pub struct InputPreprocessorMessageHandler { impl MessageHandler for InputPreprocessorMessageHandler { #[remain::check] - fn process_message(&mut self, message: InputPreprocessorMessage, data: KeyboardPlatformLayout, responses: &mut VecDeque) { - let keyboard_platform = data; - + fn process_message(&mut self, message: InputPreprocessorMessage, responses: &mut VecDeque, keyboard_platform: KeyboardPlatformLayout) { #[remain::sorted] match message { InputPreprocessorMessage::BoundsOfViewports { bounds_of_viewports } => { @@ -197,7 +195,7 @@ mod test { let mut responses = VecDeque::new(); - input_preprocessor.process_message(message, KeyboardPlatformLayout::Standard, &mut responses); + input_preprocessor.process_message(message, &mut responses, KeyboardPlatformLayout::Standard); assert!(input_preprocessor.keyboard.get(Key::Alt as usize)); assert_eq!(responses.pop_front(), Some(InputMapperMessage::KeyDown(Key::Alt).into())); @@ -213,7 +211,7 @@ mod test { let mut responses = VecDeque::new(); - input_preprocessor.process_message(message, KeyboardPlatformLayout::Standard, &mut responses); + input_preprocessor.process_message(message, &mut responses, KeyboardPlatformLayout::Standard); assert!(input_preprocessor.keyboard.get(Key::Control as usize)); assert_eq!(responses.pop_front(), Some(InputMapperMessage::KeyDown(Key::Control).into())); @@ -229,7 +227,7 @@ mod test { let mut responses = VecDeque::new(); - input_preprocessor.process_message(message, KeyboardPlatformLayout::Standard, &mut responses); + input_preprocessor.process_message(message, &mut responses, KeyboardPlatformLayout::Standard); assert!(input_preprocessor.keyboard.get(Key::Shift as usize)); assert_eq!(responses.pop_front(), Some(InputMapperMessage::KeyDown(Key::Shift).into())); @@ -246,7 +244,7 @@ mod test { let mut responses = VecDeque::new(); - input_preprocessor.process_message(message, KeyboardPlatformLayout::Standard, &mut responses); + input_preprocessor.process_message(message, &mut responses, KeyboardPlatformLayout::Standard); assert!(!input_preprocessor.keyboard.get(Key::Control as usize)); assert_eq!(responses.pop_front(), Some(InputMapperMessage::KeyUp(Key::Control).into())); @@ -262,7 +260,7 @@ mod test { let mut responses = VecDeque::new(); - input_preprocessor.process_message(message, KeyboardPlatformLayout::Standard, &mut responses); + input_preprocessor.process_message(message, &mut responses, KeyboardPlatformLayout::Standard); assert!(input_preprocessor.keyboard.get(Key::Control as usize)); assert!(input_preprocessor.keyboard.get(Key::Shift as usize)); diff --git a/editor/src/messages/layout/layout_message_handler.rs b/editor/src/messages/layout/layout_message_handler.rs index 275188201a..eb494aa849 100644 --- a/editor/src/messages/layout/layout_message_handler.rs +++ b/editor/src/messages/layout/layout_message_handler.rs @@ -45,9 +45,7 @@ impl LayoutMessageHandler { impl Vec> MessageHandler for LayoutMessageHandler { #[remain::check] - fn process_message(&mut self, message: LayoutMessage, data: F, responses: &mut std::collections::VecDeque) { - let action_input_mapping = data; - + fn process_message(&mut self, message: LayoutMessage, responses: &mut std::collections::VecDeque, action_input_mapping: F) { use LayoutMessage::*; #[remain::sorted] match message { diff --git a/editor/src/messages/portfolio/document/artboard/artboard_message_handler.rs b/editor/src/messages/portfolio/document/artboard/artboard_message_handler.rs index 92e286ac9c..69a2425803 100644 --- a/editor/src/messages/portfolio/document/artboard/artboard_message_handler.rs +++ b/editor/src/messages/portfolio/document/artboard/artboard_message_handler.rs @@ -20,7 +20,7 @@ pub struct ArtboardMessageHandler { impl MessageHandler for ArtboardMessageHandler { #[remain::check] - fn process_message(&mut self, message: ArtboardMessage, font_cache: &FontCache, responses: &mut VecDeque) { + fn process_message(&mut self, message: ArtboardMessage, responses: &mut VecDeque, font_cache: &FontCache) { use ArtboardMessage::*; #[remain::sorted] diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs index 99740d81e1..acf3d59eca 100644 --- a/editor/src/messages/portfolio/document/document_message_handler.rs +++ b/editor/src/messages/portfolio/document/document_message_handler.rs @@ -109,8 +109,8 @@ impl MessageHandler, + (document_id, ipp, persistent_data, preferences): (u64, &InputPreprocessorMessageHandler, &PersistentData, &PreferencesMessageHandler), ) { use DocumentMessage::*; @@ -177,21 +177,21 @@ impl MessageHandler { - self.artboard_message_handler.process_message(message, &persistent_data.font_cache, responses); + self.artboard_message_handler.process_message(message, responses, &persistent_data.font_cache); } #[remain::unsorted] Navigation(message) => { - self.navigation_handler.process_message(message, (&self.document_legacy, ipp), responses); + self.navigation_handler.process_message(message, responses, (&self.document_legacy, ipp)); } #[remain::unsorted] Overlays(message) => { self.overlays_message_handler - .process_message(message, (self.overlays_visible, &persistent_data.font_cache, ipp), responses); + .process_message(message, responses, (self.overlays_visible, &persistent_data.font_cache, ipp)); } #[remain::unsorted] TransformLayer(message) => { self.transform_layer_handler - .process_message(message, (&mut self.layer_metadata, &mut self.document_legacy, ipp, &persistent_data.font_cache), responses); + .process_message(message, responses, (&mut self.layer_metadata, &mut self.document_legacy, ipp, &persistent_data.font_cache)); } #[remain::unsorted] PropertiesPanel(message) => { @@ -202,12 +202,12 @@ impl MessageHandler { let selected_layers = &mut self.layer_metadata.iter().filter_map(|(path, data)| data.selected.then_some(path.as_slice())); - self.node_graph_handler.process_message(message, (&mut self.document_legacy, selected_layers), responses); + self.node_graph_handler.process_message(message, responses, (&mut self.document_legacy, selected_layers)); } // Messages @@ -1074,7 +1074,7 @@ impl DocumentMessageHandler { .to_cols_array() .iter() .enumerate() - .fold(String::new(), |accum, (i, entry)| accum + &(entry.to_string() + if i == 5 { "" } else { "," })); + .fold(String::new(), |acc, (i, entry)| acc + &(entry.to_string() + if i == 5 { "" } else { "," })); let svg = format!( r#"{}{}{}{}"#, size.x, size.y, "\n", outside_artboards, matrix, artboards, artwork diff --git a/editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs b/editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs index b71e59c77d..73771ae959 100644 --- a/editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs +++ b/editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs @@ -50,7 +50,7 @@ impl Default for NavigationMessageHandler { impl MessageHandler for NavigationMessageHandler { #[remain::check] - fn process_message(&mut self, message: NavigationMessage, (document, ipp): (&Document, &InputPreprocessorMessageHandler), responses: &mut VecDeque) { + fn process_message(&mut self, message: NavigationMessage, responses: &mut VecDeque, (document, ipp): (&Document, &InputPreprocessorMessageHandler)) { use NavigationMessage::*; #[remain::sorted] diff --git a/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs b/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs index 3bab896059..a745f8f30c 100644 --- a/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs +++ b/editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs @@ -184,12 +184,12 @@ impl NodeGraphMessageHandler { let is_hidden = self.selected_nodes.iter().any(|id| network.disabled.contains(id)); // Check if multiple nodes are selected - let mutliple_nodes = selected_nodes.next().is_some(); + let multiple_nodes = selected_nodes.next().is_some(); // Generate the enable or disable button accordingly let hide_button = WidgetHolder::new(Widget::TextButton(TextButton { label: if is_hidden { "Show" } else { "Hide" }.to_string(), - tooltip: if is_hidden { "Show node" } else { "Hide node" }.to_string() + if mutliple_nodes { "s" } else { "" }, + tooltip: if is_hidden { "Show node" } else { "Hide node" }.to_string() + if multiple_nodes { "s" } else { "" }, tooltip_shortcut: action_keys!(NodeGraphMessageDiscriminant::ToggleHidden), on_update: WidgetCallback::new(move |_| NodeGraphMessage::ToggleHidden.into()), ..Default::default() @@ -203,7 +203,7 @@ impl NodeGraphMessageHandler { // Is this node the current output let is_output = network.output == node_id; - // Don't show stop previewing button on the origional output node + // Don't show stop previewing button on the original output node if !(is_output && network.previous_output.filter(|&id| id != self.selected_nodes[0]).is_none()) { let output_button = WidgetHolder::new(Widget::TextButton(TextButton { label: if is_output { "End Preview" } else { "Preview" }.to_string(), @@ -386,7 +386,7 @@ impl NodeGraphMessageHandler { impl MessageHandler)> for NodeGraphMessageHandler { #[remain::check] - fn process_message(&mut self, message: NodeGraphMessage, (document, selected): (&mut Document, &mut dyn Iterator), responses: &mut VecDeque) { + fn process_message(&mut self, message: NodeGraphMessage, responses: &mut VecDeque, (document, selected): (&mut Document, &mut dyn Iterator)) { #[remain::sorted] match message { NodeGraphMessage::CloseNodeGraph => { @@ -416,7 +416,7 @@ impl MessageHandler for OverlaysMessageHandler { #[remain::check] - fn process_message(&mut self, message: OverlaysMessage, (overlays_visible, font_cache, ipp): (bool, &FontCache, &InputPreprocessorMessageHandler), responses: &mut VecDeque) { + fn process_message(&mut self, message: OverlaysMessage, responses: &mut VecDeque, (overlays_visible, font_cache, ipp): (bool, &FontCache, &InputPreprocessorMessageHandler)) { use OverlaysMessage::*; #[remain::sorted] diff --git a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs index 3f5ddc4583..5103c4b066 100644 --- a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs +++ b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message_handler.rs @@ -19,7 +19,7 @@ pub struct PropertiesPanelMessageHandler { impl<'a> MessageHandler)> for PropertiesPanelMessageHandler { #[remain::check] - fn process_message(&mut self, message: PropertiesPanelMessage, (persistent_data, data): (&PersistentData, PropertiesPanelMessageHandlerData), responses: &mut VecDeque) { + fn process_message(&mut self, message: PropertiesPanelMessage, responses: &mut VecDeque, (persistent_data, data): (&PersistentData, PropertiesPanelMessageHandlerData)) { let PropertiesPanelMessageHandlerData { artwork_document, artboard_document, diff --git a/editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs b/editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs index 4805837624..ed784a975a 100644 --- a/editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs +++ b/editor/src/messages/portfolio/document/transform_layer/transform_layer_message_handler.rs @@ -28,7 +28,7 @@ pub struct TransformLayerMessageHandler { type TransformData<'a> = (&'a mut HashMap, LayerMetadata>, &'a mut Document, &'a InputPreprocessorMessageHandler, &'a FontCache); impl<'a> MessageHandler> for TransformLayerMessageHandler { #[remain::check] - fn process_message(&mut self, message: TransformLayerMessage, (layer_metadata, document, ipp, font_cache): TransformData, responses: &mut VecDeque) { + fn process_message(&mut self, message: TransformLayerMessage, responses: &mut VecDeque, (layer_metadata, document, ipp, font_cache): TransformData) { use TransformLayerMessage::*; let selected_layers = layer_metadata.iter().filter_map(|(layer_path, data)| data.selected.then_some(layer_path)).collect::>(); diff --git a/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs b/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs index b2599b15cb..c0181bbd53 100644 --- a/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs +++ b/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs @@ -10,7 +10,7 @@ pub struct MenuBarMessageHandler {} impl MessageHandler for MenuBarMessageHandler { #[remain::check] - fn process_message(&mut self, message: MenuBarMessage, _data: (), responses: &mut VecDeque) { + fn process_message(&mut self, message: MenuBarMessage, responses: &mut VecDeque, _data: ()) { use MenuBarMessage::*; #[remain::sorted] diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs index 9d58129235..ab4a4c3922 100644 --- a/editor/src/messages/portfolio/portfolio_message_handler.rs +++ b/editor/src/messages/portfolio/portfolio_message_handler.rs @@ -36,17 +36,17 @@ pub struct PortfolioMessageHandler { impl MessageHandler for PortfolioMessageHandler { #[remain::check] - fn process_message(&mut self, message: PortfolioMessage, (ipp, preferences): (&InputPreprocessorMessageHandler, &PreferencesMessageHandler), responses: &mut VecDeque) { + fn process_message(&mut self, message: PortfolioMessage, responses: &mut VecDeque, (ipp, preferences): (&InputPreprocessorMessageHandler, &PreferencesMessageHandler)) { #[remain::sorted] match message { // Sub-messages #[remain::unsorted] - PortfolioMessage::MenuBar(message) => self.menu_bar_message_handler.process_message(message, (), responses), + PortfolioMessage::MenuBar(message) => self.menu_bar_message_handler.process_message(message, responses, ()), #[remain::unsorted] PortfolioMessage::Document(message) => { if let Some(document_id) = self.active_document_id { if let Some(document) = self.documents.get_mut(&document_id) { - document.process_message(message, (document_id, ipp, &self.persistent_data, preferences), responses) + document.process_message(message, responses, (document_id, ipp, &self.persistent_data, preferences)) } } } @@ -55,7 +55,7 @@ impl MessageHandler { if let Some(document) = self.documents.get_mut(&document_id) { - document.process_message(message, (document_id, ipp, &self.persistent_data, preferences), responses) + document.process_message(message, responses, (document_id, ipp, &self.persistent_data, preferences)) } } PortfolioMessage::AutoSaveActiveDocument => { @@ -749,7 +749,7 @@ impl PortfolioMessageHandler { let size_estimate = (image_width * image_height * 4) as usize; let mut result_bytes = Vec::with_capacity(size_estimate); - result_bytes.extend(image.data.into_iter().flat_map(|colour| colour.to_rgba8())); + result_bytes.extend(image.data.into_iter().flat_map(|color| color.to_rgba8())); let mut output: ImageBuffer, _> = image::ImageBuffer::from_raw(image_width, image_height, result_bytes).ok_or_else(|| "Invalid image size".to_string())?; if let Some(size) = resize { let size = size.as_uvec2(); diff --git a/editor/src/messages/preferences/preferences_message_handler.rs b/editor/src/messages/preferences/preferences_message_handler.rs index f58f1810f0..26f1e038e9 100644 --- a/editor/src/messages/preferences/preferences_message_handler.rs +++ b/editor/src/messages/preferences/preferences_message_handler.rs @@ -19,7 +19,7 @@ impl Default for PreferencesMessageHandler { impl MessageHandler for PreferencesMessageHandler { #[remain::check] - fn process_message(&mut self, message: PreferencesMessage, _data: (), responses: &mut VecDeque) { + fn process_message(&mut self, message: PreferencesMessage, responses: &mut VecDeque, _data: ()) { match message { PreferencesMessage::Load { preferences } => { if let Ok(deserialized_preferences) = serde_json::from_str::(&preferences) { diff --git a/editor/src/messages/tool/tool_message_handler.rs b/editor/src/messages/tool/tool_message_handler.rs index 8808de1075..0b1ed70498 100644 --- a/editor/src/messages/tool/tool_message_handler.rs +++ b/editor/src/messages/tool/tool_message_handler.rs @@ -18,8 +18,8 @@ impl MessageHandler, + (document, document_id, input, persistent_data): (&DocumentMessageHandler, u64, &InputPreprocessorMessageHandler, &PersistentData), ) { #[remain::sorted] match message { @@ -73,12 +73,12 @@ impl MessageHandler { let tool_data = &mut self.tool_state.tool_data; @@ -196,7 +196,7 @@ impl MessageHandler MessageHandler> for ArtboardTool { - fn process_message(&mut self, message: ToolMessage, transition_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { - self.fsm_state.process_event(message, &mut self.data, transition_data, &(), responses, false); + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { + self.fsm_state.process_event(message, &mut self.data, tool_data, &(), responses, false); } advertise_actions!(ArtboardToolMessageDiscriminant; diff --git a/editor/src/messages/tool/tool_messages/ellipse_tool.rs b/editor/src/messages/tool/tool_messages/ellipse_tool.rs index f0e83d4416..04c8d4f3ca 100644 --- a/editor/src/messages/tool/tool_messages/ellipse_tool.rs +++ b/editor/src/messages/tool/tool_messages/ellipse_tool.rs @@ -50,8 +50,8 @@ impl ToolMetadata for EllipseTool { impl PropertyHolder for EllipseTool {} impl<'a> MessageHandler> for EllipseTool { - fn process_message(&mut self, message: ToolMessage, data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { - self.fsm_state.process_event(message, &mut self.data, data, &(), responses, true); + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { + self.fsm_state.process_event(message, &mut self.data, tool_data, &(), responses, true); } fn actions(&self) -> ActionList { diff --git a/editor/src/messages/tool/tool_messages/eyedropper_tool.rs b/editor/src/messages/tool/tool_messages/eyedropper_tool.rs index edefb10cf9..63f2c509d6 100644 --- a/editor/src/messages/tool/tool_messages/eyedropper_tool.rs +++ b/editor/src/messages/tool/tool_messages/eyedropper_tool.rs @@ -44,8 +44,8 @@ impl ToolMetadata for EyedropperTool { impl PropertyHolder for EyedropperTool {} impl<'a> MessageHandler> for EyedropperTool { - fn process_message(&mut self, message: ToolMessage, data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { - self.fsm_state.process_event(message, &mut self.data, data, &(), responses, true); + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { + self.fsm_state.process_event(message, &mut self.data, tool_data, &(), responses, true); } advertise_actions!(EyedropperToolMessageDiscriminant; diff --git a/editor/src/messages/tool/tool_messages/fill_tool.rs b/editor/src/messages/tool/tool_messages/fill_tool.rs index bfae3f16a0..9d0be13500 100644 --- a/editor/src/messages/tool/tool_messages/fill_tool.rs +++ b/editor/src/messages/tool/tool_messages/fill_tool.rs @@ -47,8 +47,8 @@ impl ToolMetadata for FillTool { impl PropertyHolder for FillTool {} impl<'a> MessageHandler> for FillTool { - fn process_message(&mut self, message: ToolMessage, data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { - self.fsm_state.process_event(message, &mut self.data, data, &(), responses, true); + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { + self.fsm_state.process_event(message, &mut self.data, tool_data, &(), responses, true); } advertise_actions!(FillToolMessageDiscriminant; diff --git a/editor/src/messages/tool/tool_messages/freehand_tool.rs b/editor/src/messages/tool/tool_messages/freehand_tool.rs index 920d482f17..d393b8f0d3 100644 --- a/editor/src/messages/tool/tool_messages/freehand_tool.rs +++ b/editor/src/messages/tool/tool_messages/freehand_tool.rs @@ -83,7 +83,7 @@ impl PropertyHolder for FreehandTool { } impl<'a> MessageHandler> for FreehandTool { - fn process_message(&mut self, message: ToolMessage, data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { if let ToolMessage::Freehand(FreehandToolMessage::UpdateOptions(action)) = message { match action { FreehandToolMessageOptionsUpdate::LineWeight(line_weight) => self.options.line_weight = line_weight, @@ -91,7 +91,7 @@ impl<'a> MessageHandler> for FreehandTool return; } - self.fsm_state.process_event(message, &mut self.data, data, &self.options, responses, true); + self.fsm_state.process_event(message, &mut self.data, tool_data, &self.options, responses, true); } fn actions(&self) -> ActionList { diff --git a/editor/src/messages/tool/tool_messages/gradient_tool.rs b/editor/src/messages/tool/tool_messages/gradient_tool.rs index 65ec7c9f40..c067eb1679 100644 --- a/editor/src/messages/tool/tool_messages/gradient_tool.rs +++ b/editor/src/messages/tool/tool_messages/gradient_tool.rs @@ -77,7 +77,7 @@ impl ToolMetadata for GradientTool { } impl<'a> MessageHandler> for GradientTool { - fn process_message(&mut self, message: ToolMessage, data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { if let ToolMessage::Gradient(GradientToolMessage::UpdateOptions(action)) = message { match action { GradientOptionsUpdate::Type(gradient_type) => { @@ -91,7 +91,7 @@ impl<'a> MessageHandler> for GradientTool return; } - self.fsm_state.process_event(message, &mut self.data, data, &self.options, responses, false); + self.fsm_state.process_event(message, &mut self.data, tool_data, &self.options, responses, false); } advertise_actions!(GradientToolMessageDiscriminant; diff --git a/editor/src/messages/tool/tool_messages/imaginate_tool.rs b/editor/src/messages/tool/tool_messages/imaginate_tool.rs index a663e3d5e7..b6709c7379 100644 --- a/editor/src/messages/tool/tool_messages/imaginate_tool.rs +++ b/editor/src/messages/tool/tool_messages/imaginate_tool.rs @@ -38,7 +38,7 @@ pub enum ImaginateToolMessage { impl PropertyHolder for ImaginateTool {} impl<'a> MessageHandler> for ImaginateTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &(), responses, true); } diff --git a/editor/src/messages/tool/tool_messages/line_tool.rs b/editor/src/messages/tool/tool_messages/line_tool.rs index 7dc8f18d4f..e643827531 100644 --- a/editor/src/messages/tool/tool_messages/line_tool.rs +++ b/editor/src/messages/tool/tool_messages/line_tool.rs @@ -83,7 +83,7 @@ impl PropertyHolder for LineTool { } impl<'a> MessageHandler> for LineTool { - fn process_message(&mut self, message: ToolMessage, transition_data: ToolActionHandlerData<'a>, messages: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, messages: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { if let ToolMessage::Line(LineToolMessage::UpdateOptions(action)) = message { match action { LineOptionsUpdate::LineWeight(line_weight) => self.options.line_weight = line_weight, @@ -91,7 +91,7 @@ impl<'a> MessageHandler> for LineTool { return; } - self.fsm_state.process_event(message, &mut self.tool_data, transition_data, &self.options, messages, true); + self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &self.options, messages, true); } fn actions(&self) -> ActionList { diff --git a/editor/src/messages/tool/tool_messages/navigate_tool.rs b/editor/src/messages/tool/tool_messages/navigate_tool.rs index 701204f56a..a67f128f09 100644 --- a/editor/src/messages/tool/tool_messages/navigate_tool.rs +++ b/editor/src/messages/tool/tool_messages/navigate_tool.rs @@ -51,7 +51,7 @@ impl ToolMetadata for NavigateTool { impl PropertyHolder for NavigateTool {} impl<'a> MessageHandler> for NavigateTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &(), responses, true); } diff --git a/editor/src/messages/tool/tool_messages/node_graph_frame_tool.rs b/editor/src/messages/tool/tool_messages/node_graph_frame_tool.rs index c23efc68a4..910187d620 100644 --- a/editor/src/messages/tool/tool_messages/node_graph_frame_tool.rs +++ b/editor/src/messages/tool/tool_messages/node_graph_frame_tool.rs @@ -37,7 +37,7 @@ pub enum NodeGraphFrameToolMessage { impl PropertyHolder for NodeGraphFrameTool {} impl<'a> MessageHandler> for NodeGraphFrameTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &(), responses, true); } diff --git a/editor/src/messages/tool/tool_messages/path_tool.rs b/editor/src/messages/tool/tool_messages/path_tool.rs index 155a69fcd9..0883f47146 100644 --- a/editor/src/messages/tool/tool_messages/path_tool.rs +++ b/editor/src/messages/tool/tool_messages/path_tool.rs @@ -61,7 +61,7 @@ impl ToolMetadata for PathTool { impl PropertyHolder for PathTool {} impl<'a> MessageHandler> for PathTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &(), responses, true); } diff --git a/editor/src/messages/tool/tool_messages/pen_tool.rs b/editor/src/messages/tool/tool_messages/pen_tool.rs index 9765fc036e..f21b687448 100644 --- a/editor/src/messages/tool/tool_messages/pen_tool.rs +++ b/editor/src/messages/tool/tool_messages/pen_tool.rs @@ -98,7 +98,7 @@ impl PropertyHolder for PenTool { } impl<'a> MessageHandler> for PenTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { if let ToolMessage::Pen(PenToolMessage::UpdateOptions(action)) = message { match action { PenOptionsUpdate::LineWeight(line_weight) => self.options.line_weight = line_weight, diff --git a/editor/src/messages/tool/tool_messages/rectangle_tool.rs b/editor/src/messages/tool/tool_messages/rectangle_tool.rs index 8fe03a168e..795ec791d6 100644 --- a/editor/src/messages/tool/tool_messages/rectangle_tool.rs +++ b/editor/src/messages/tool/tool_messages/rectangle_tool.rs @@ -38,7 +38,7 @@ pub enum RectangleToolMessage { impl PropertyHolder for RectangleTool {} impl<'a> MessageHandler> for RectangleTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &(), responses, true); } diff --git a/editor/src/messages/tool/tool_messages/select_tool.rs b/editor/src/messages/tool/tool_messages/select_tool.rs index a67298b658..90b852624e 100644 --- a/editor/src/messages/tool/tool_messages/select_tool.rs +++ b/editor/src/messages/tool/tool_messages/select_tool.rs @@ -197,7 +197,7 @@ impl PropertyHolder for SelectTool { } impl<'a> MessageHandler> for SelectTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { self.fsm_state.process_event(message, &mut self.tool_data, tool_data, &(), responses, false); if self.tool_data.pivot.should_refresh_pivot_position() { diff --git a/editor/src/messages/tool/tool_messages/shape_tool.rs b/editor/src/messages/tool/tool_messages/shape_tool.rs index 01ac3b8ac6..a51f93a927 100644 --- a/editor/src/messages/tool/tool_messages/shape_tool.rs +++ b/editor/src/messages/tool/tool_messages/shape_tool.rs @@ -81,7 +81,7 @@ impl PropertyHolder for ShapeTool { } impl<'a> MessageHandler> for ShapeTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { if let ToolMessage::Shape(ShapeToolMessage::UpdateOptions(action)) = message { match action { ShapeOptionsUpdate::Vertices(vertices) => self.options.vertices = vertices, diff --git a/editor/src/messages/tool/tool_messages/spline_tool.rs b/editor/src/messages/tool/tool_messages/spline_tool.rs index 28b4ccb2e5..ced62619ee 100644 --- a/editor/src/messages/tool/tool_messages/spline_tool.rs +++ b/editor/src/messages/tool/tool_messages/spline_tool.rs @@ -87,7 +87,7 @@ impl PropertyHolder for SplineTool { } impl<'a> MessageHandler> for SplineTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { if let ToolMessage::Spline(SplineToolMessage::UpdateOptions(action)) = message { match action { SplineOptionsUpdate::LineWeight(line_weight) => self.options.line_weight = line_weight, diff --git a/editor/src/messages/tool/tool_messages/text_tool.rs b/editor/src/messages/tool/tool_messages/text_tool.rs index 4c765bbe90..82f4409ea8 100644 --- a/editor/src/messages/tool/tool_messages/text_tool.rs +++ b/editor/src/messages/tool/tool_messages/text_tool.rs @@ -127,7 +127,7 @@ impl PropertyHolder for TextTool { } impl<'a> MessageHandler> for TextTool { - fn process_message(&mut self, message: ToolMessage, tool_data: ToolActionHandlerData<'a>, responses: &mut VecDeque) { + fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque, tool_data: ToolActionHandlerData<'a>) { if let ToolMessage::Text(TextToolMessage::UpdateOptions(action)) = message { match action { TextOptionsUpdate::Font { family, style } => { diff --git a/editor/src/messages/workspace/workspace_message_handler.rs b/editor/src/messages/workspace/workspace_message_handler.rs index aada39b19a..994d30a10b 100644 --- a/editor/src/messages/workspace/workspace_message_handler.rs +++ b/editor/src/messages/workspace/workspace_message_handler.rs @@ -5,9 +5,9 @@ pub struct WorkspaceMessageHandler { node_graph_visible: bool, } -impl MessageHandler for WorkspaceMessageHandler { +impl MessageHandler for WorkspaceMessageHandler { #[remain::check] - fn process_message(&mut self, message: WorkspaceMessage, _ipp: &InputPreprocessorMessageHandler, responses: &mut VecDeque) { + fn process_message(&mut self, message: WorkspaceMessage, responses: &mut VecDeque, _data: ()) { use WorkspaceMessage::*; #[remain::sorted] diff --git a/editor/src/utility_traits.rs b/editor/src/utility_traits.rs index 3cbd48a278..711a8cc34b 100644 --- a/editor/src/utility_traits.rs +++ b/editor/src/utility_traits.rs @@ -10,7 +10,7 @@ where ::TopParent: TransitiveChild::TopParent, TopParent = ::TopParent> + AsMessage, { /// Return true if the Action is consumed. - fn process_message(&mut self, message: M, data: D, responses: &mut VecDeque); + fn process_message(&mut self, message: M, responses: &mut VecDeque, data: D); fn actions(&self) -> ActionList; }