diff --git a/Cargo.lock b/Cargo.lock index 17c3e2fe..c14d70e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2453,7 +2453,6 @@ dependencies = [ "log", "num_enum 0.6.1", "once_cell", - "remain", "serde", "serde_json", "specta", @@ -4755,17 +4754,6 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -[[package]] -name = "remain" -version = "0.2.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f2390298a947ee0aa6073d440e221c0726188cfbcdf9604addb6ee393eb4a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.52", -] - [[package]] name = "renderdoc-sys" version = "1.1.0" diff --git a/Cargo.toml b/Cargo.toml index dc896e33..64c3d03e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -44,7 +44,6 @@ reqwest = { version = "0.11", features = ["rustls", "rustls-tls", "json"] } futures = "0.3" log = { version = "0.4" } bitflags = { version = "2.4", features = ["serde"] } -remain = "0.2.2" derivative = "2.2.0" tempfile = "3" thiserror = "1.0" diff --git a/editor/Cargo.toml b/editor/Cargo.toml index a6043449..da743146 100644 --- a/editor/Cargo.toml +++ b/editor/Cargo.toml @@ -34,7 +34,6 @@ serde_json = { workspace = true } graphite-proc-macros = { path = "../proc-macros" } bezier-rs = { workspace = true } glam = { workspace = true, features = ["serde", "debug-glam-assert"] } -remain = { workspace = true } derivative = { workspace = true } specta.workspace = true image = { workspace = true, features = ["bmp", "png"] } diff --git a/editor/src/dispatcher.rs b/editor/src/dispatcher.rs index c2b4903f..6ff20238 100644 --- a/editor/src/dispatcher.rs +++ b/editor/src/dispatcher.rs @@ -12,7 +12,6 @@ pub struct Dispatcher { pub message_handlers: DispatcherMessageHandlers, } -#[remain::sorted] #[derive(Debug, Default)] pub struct DispatcherMessageHandlers { broadcast_message_handler: BroadcastMessageHandler, @@ -57,7 +56,6 @@ impl Dispatcher { } } - #[remain::check] pub fn handle_message>(&mut self, message: T) { use Message::*; @@ -86,11 +84,8 @@ impl Dispatcher { let mut queue = VecDeque::new(); // Process the action by forwarding it to the relevant message handler, or saving the FrontendMessage to be sent to the frontend - #[remain::sorted] match message { - #[remain::unsorted] NoOp => {} - #[remain::unsorted] Init => { // Load persistent data from the browser database queue.add(FrontendMessage::TriggerLoadAutoSaveDocuments); diff --git a/editor/src/messages/broadcast/broadcast_message.rs b/editor/src/messages/broadcast/broadcast_message.rs index 618b53ad..0caf46dd 100644 --- a/editor/src/messages/broadcast/broadcast_message.rs +++ b/editor/src/messages/broadcast/broadcast_message.rs @@ -2,12 +2,10 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, Broadcast)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum BroadcastMessage { // Sub-messages - #[remain::unsorted] #[child] TriggerEvent(BroadcastEvent), diff --git a/editor/src/messages/broadcast/broadcast_message_handler.rs b/editor/src/messages/broadcast/broadcast_message_handler.rs index dc00c19c..3bbc8b3e 100644 --- a/editor/src/messages/broadcast/broadcast_message_handler.rs +++ b/editor/src/messages/broadcast/broadcast_message_handler.rs @@ -6,12 +6,9 @@ pub struct BroadcastMessageHandler { } impl MessageHandler for BroadcastMessageHandler { - #[remain::check] fn process_message(&mut self, message: BroadcastMessage, responses: &mut VecDeque, _data: ()) { - #[remain::sorted] match message { // Sub-messages - #[remain::unsorted] BroadcastMessage::TriggerEvent(event) => { for message in self.listeners.entry(event).or_default() { responses.add_front(message.clone()) diff --git a/editor/src/messages/debug/debug_message_handler.rs b/editor/src/messages/debug/debug_message_handler.rs index 749c38cd..6044ce91 100644 --- a/editor/src/messages/debug/debug_message_handler.rs +++ b/editor/src/messages/debug/debug_message_handler.rs @@ -7,7 +7,6 @@ pub struct DebugMessageHandler { } impl MessageHandler for DebugMessageHandler { - #[remain::check] fn process_message(&mut self, message: DebugMessage, responses: &mut VecDeque, _data: ()) { match message { DebugMessage::ToggleTraceLogs => { diff --git a/editor/src/messages/dialog/dialog_message.rs b/editor/src/messages/dialog/dialog_message.rs index 47947f9c..d3735106 100644 --- a/editor/src/messages/dialog/dialog_message.rs +++ b/editor/src/messages/dialog/dialog_message.rs @@ -2,18 +2,14 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, Dialog)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum DialogMessage { // Sub-messages - #[remain::unsorted] #[child] ExportDialog(ExportDialogMessage), - #[remain::unsorted] #[child] NewDocumentDialog(NewDocumentDialogMessage), - #[remain::unsorted] #[child] PreferencesDialog(PreferencesDialogMessage), diff --git a/editor/src/messages/dialog/dialog_message_handler.rs b/editor/src/messages/dialog/dialog_message_handler.rs index a495dbee..f674cd3f 100644 --- a/editor/src/messages/dialog/dialog_message_handler.rs +++ b/editor/src/messages/dialog/dialog_message_handler.rs @@ -17,15 +17,10 @@ pub struct DialogData<'a> { } impl MessageHandler> for DialogMessageHandler { - #[remain::check] fn process_message(&mut self, message: DialogMessage, responses: &mut VecDeque, DialogData { portfolio, preferences }: DialogData) { - #[remain::sorted] match message { - #[remain::unsorted] DialogMessage::ExportDialog(message) => self.export_dialog.process_message(message, responses, portfolio), - #[remain::unsorted] DialogMessage::NewDocumentDialog(message) => self.new_document_dialog.process_message(message, responses, ()), - #[remain::unsorted] DialogMessage::PreferencesDialog(message) => self.preferences_dialog.process_message(message, responses, preferences), DialogMessage::CloseAllDocumentsWithConfirmation => { diff --git a/editor/src/messages/frontend/frontend_message.rs b/editor/src/messages/frontend/frontend_message.rs index 5353b0f1..52a3138b 100644 --- a/editor/src/messages/frontend/frontend_message.rs +++ b/editor/src/messages/frontend/frontend_message.rs @@ -11,7 +11,6 @@ use graphene_core::text::Font; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, Frontend)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum FrontendMessage { diff --git a/editor/src/messages/globals/globals_message_handler.rs b/editor/src/messages/globals/globals_message_handler.rs index 31edfd3c..5651555f 100644 --- a/editor/src/messages/globals/globals_message_handler.rs +++ b/editor/src/messages/globals/globals_message_handler.rs @@ -4,7 +4,6 @@ use crate::messages::prelude::*; pub struct GlobalsMessageHandler {} impl MessageHandler for GlobalsMessageHandler { - #[remain::check] fn process_message(&mut self, message: GlobalsMessage, _responses: &mut VecDeque, _data: ()) { match message { GlobalsMessage::SetPlatform { platform } => { diff --git a/editor/src/messages/input_mapper/input_mapper_message.rs b/editor/src/messages/input_mapper/input_mapper_message.rs index e951b27d..cbd66dc2 100644 --- a/editor/src/messages/input_mapper/input_mapper_message.rs +++ b/editor/src/messages/input_mapper/input_mapper_message.rs @@ -3,24 +3,18 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, KeyMappingMessage, Lookup)] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize)] pub enum InputMapperMessage { // Sub-messages - #[remain::unsorted] #[child] KeyDown(Key), - #[remain::unsorted] #[child] KeyUp(Key), - #[remain::unsorted] #[child] KeyDownNoRepeat(Key), - #[remain::unsorted] #[child] KeyUpNoRepeat(Key), - #[remain::unsorted] #[child] DoubleClick(MouseButton), diff --git a/editor/src/messages/input_mapper/key_mapping/key_mapping_message.rs b/editor/src/messages/input_mapper/key_mapping/key_mapping_message.rs index ef9838c2..419803fc 100644 --- a/editor/src/messages/input_mapper/key_mapping/key_mapping_message.rs +++ b/editor/src/messages/input_mapper/key_mapping/key_mapping_message.rs @@ -2,7 +2,6 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, KeyMapping)] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize)] pub enum KeyMappingMessage { @@ -12,11 +11,9 @@ pub enum KeyMappingMessage { ModifyMapping(MappingVariant), } -#[remain::sorted] #[impl_message(Message, KeyMappingMessage, ModifyMapping)] #[derive(PartialEq, Eq, Clone, Debug, Default, Hash, Serialize, Deserialize)] pub enum MappingVariant { - #[remain::unsorted] #[default] Default, diff --git a/editor/src/messages/input_preprocessor/input_preprocessor_message.rs b/editor/src/messages/input_preprocessor/input_preprocessor_message.rs index 2296199c..f3e656db 100644 --- a/editor/src/messages/input_preprocessor/input_preprocessor_message.rs +++ b/editor/src/messages/input_preprocessor/input_preprocessor_message.rs @@ -4,7 +4,6 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, InputPreprocessor)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum InputPreprocessorMessage { 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 f4b5c738..c297c78f 100644 --- a/editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs +++ b/editor/src/messages/input_preprocessor/input_preprocessor_message_handler.rs @@ -13,9 +13,7 @@ pub struct InputPreprocessorMessageHandler { } impl MessageHandler for InputPreprocessorMessageHandler { - #[remain::check] fn process_message(&mut self, message: InputPreprocessorMessage, responses: &mut VecDeque, keyboard_platform: KeyboardPlatformLayout) { - #[remain::sorted] match message { InputPreprocessorMessage::BoundsOfViewports { bounds_of_viewports } => { assert_eq!(bounds_of_viewports.len(), 1, "Only one viewport is currently supported"); diff --git a/editor/src/messages/layout/layout_message.rs b/editor/src/messages/layout/layout_message.rs index e69226e6..a278b25d 100644 --- a/editor/src/messages/layout/layout_message.rs +++ b/editor/src/messages/layout/layout_message.rs @@ -3,7 +3,6 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, Layout)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum LayoutMessage { diff --git a/editor/src/messages/layout/layout_message_handler.rs b/editor/src/messages/layout/layout_message_handler.rs index 3a2ac2b8..4dabbfaf 100644 --- a/editor/src/messages/layout/layout_message_handler.rs +++ b/editor/src/messages/layout/layout_message_handler.rs @@ -271,10 +271,8 @@ impl LayoutMessageHandler { } impl Vec> MessageHandler for LayoutMessageHandler { - #[remain::check] fn process_message(&mut self, message: LayoutMessage, responses: &mut std::collections::VecDeque, action_input_mapping: F) { use LayoutMessage::*; - #[remain::sorted] match message { ResendActiveWidget { layout_target, widget_id } => { // Find the updated diff based on the specified layout target @@ -345,13 +343,11 @@ impl LayoutMessageHandler { } /// Send a diff to the frontend based on the layout target. - #[remain::check] fn send_diff(&self, mut diff: Vec, layout_target: LayoutTarget, responses: &mut VecDeque, action_input_mapping: &impl Fn(&MessageDiscriminant) -> Vec) { diff.iter_mut().for_each(|diff| diff.new_value.apply_keyboard_shortcut(action_input_mapping)); trace!("{layout_target:?} diff {diff:#?}"); - #[remain::sorted] let message = match layout_target { LayoutTarget::DialogButtons => FrontendMessage::UpdateDialogButtons { layout_target, diff }, LayoutTarget::DialogColumn1 => FrontendMessage::UpdateDialogColumn1 { layout_target, diff }, @@ -367,7 +363,6 @@ impl LayoutMessageHandler { LayoutTarget::ToolShelf => FrontendMessage::UpdateToolShelfLayout { layout_target, diff }, LayoutTarget::WorkingColors => FrontendMessage::UpdateWorkingColorsLayout { layout_target, diff }, - #[remain::unsorted] LayoutTarget::LayoutTargetLength => panic!("`LayoutTargetLength` is not a valid Layout Target and is used for array indexing"), }; responses.add(message); diff --git a/editor/src/messages/layout/utility_types/layout_widget.rs b/editor/src/messages/layout/utility_types/layout_widget.rs index b5506673..2b32302d 100644 --- a/editor/src/messages/layout/utility_types/layout_widget.rs +++ b/editor/src/messages/layout/utility_types/layout_widget.rs @@ -20,7 +20,6 @@ impl core::fmt::Display for WidgetId { } } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Hash, Eq, Copy, Serialize, Deserialize, specta::Type)] #[repr(u8)] pub enum LayoutTarget { @@ -53,7 +52,6 @@ pub enum LayoutTarget { // KEEP THIS ENUM LAST // This is a marker that is used to define an array that is used to hold widgets - #[remain::unsorted] LayoutTargetLength, } @@ -292,7 +290,6 @@ impl<'a> Iterator for WidgetIterMut<'a> { pub type SubLayout = Vec; -#[remain::sorted] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, specta::Type)] pub enum LayoutGroup { #[serde(rename = "column")] @@ -475,7 +472,6 @@ impl Default for WidgetCallback { } } -#[remain::sorted] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, specta::Type)] pub enum Widget { BreadcrumbTrailButtons(BreadcrumbTrailButtons), diff --git a/editor/src/messages/message.rs b/editor/src/messages/message.rs index c26d5278..db7e6e86 100644 --- a/editor/src/messages/message.rs +++ b/editor/src/messages/message.rs @@ -4,13 +4,10 @@ use graphite_proc_macros::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message] #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] pub enum Message { - #[remain::unsorted] NoOp, - #[remain::unsorted] Init, #[child] diff --git a/editor/src/messages/portfolio/document/document_message.rs b/editor/src/messages/portfolio/document/document_message.rs index daa027e5..82938889 100644 --- a/editor/src/messages/portfolio/document/document_message.rs +++ b/editor/src/messages/portfolio/document/document_message.rs @@ -12,24 +12,18 @@ use graphene_core::Color; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, PortfolioMessage, Document)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum DocumentMessage { // Sub-messages - #[remain::unsorted] #[child] Navigation(NavigationMessage), - #[remain::unsorted] #[child] Overlays(OverlaysMessage), - #[remain::unsorted] #[child] PropertiesPanel(PropertiesPanelMessage), - #[remain::unsorted] #[child] NodeGraph(NodeGraphMessage), - #[remain::unsorted] #[child] GraphOperation(GraphOperationMessage), diff --git a/editor/src/messages/portfolio/document/document_message_handler.rs b/editor/src/messages/portfolio/document/document_message_handler.rs index 5ddca79b..4c500381 100644 --- a/editor/src/messages/portfolio/document/document_message_handler.rs +++ b/editor/src/messages/portfolio/document/document_message_handler.rs @@ -235,7 +235,6 @@ pub struct DocumentInputs<'a> { } impl MessageHandler> for DocumentMessageHandler { - #[remain::check] fn process_message(&mut self, message: DocumentMessage, responses: &mut VecDeque, document_inputs: DocumentInputs) { let DocumentInputs { document_id, @@ -245,10 +244,8 @@ impl MessageHandler> for DocumentMessageHand } = document_inputs; use DocumentMessage::*; - #[remain::sorted] match message { // Sub-messages - #[remain::unsorted] Navigation(message) => { let document_bounds = self.metadata().document_bounds_viewport_space(); self.navigation_handler.process_message( @@ -257,11 +254,9 @@ impl MessageHandler> for DocumentMessageHand (&self.metadata, document_bounds, ipp, self.selected_visible_layers_bounding_box_viewport(), &mut self.navigation), ); } - #[remain::unsorted] Overlays(message) => { self.overlays_message_handler.process_message(message, responses, (self.overlays_visible, ipp)); } - #[remain::unsorted] PropertiesPanel(message) => { let properties_panel_message_handler_data = PropertiesPanelMessageHandlerData { node_graph_message_handler: &self.node_graph_handler, @@ -274,7 +269,6 @@ impl MessageHandler> for DocumentMessageHand self.properties_panel_message_handler .process_message(message, responses, (persistent_data, properties_panel_message_handler_data)); } - #[remain::unsorted] NodeGraph(message) => { self.node_graph_handler.process_message( message, @@ -291,7 +285,6 @@ impl MessageHandler> for DocumentMessageHand }, ); } - #[remain::unsorted] GraphOperation(message) => GraphOperationMessageHandler.process_message( message, responses, diff --git a/editor/src/messages/portfolio/document/navigation/navigation_message.rs b/editor/src/messages/portfolio/document/navigation/navigation_message.rs index af581a12..503637d2 100644 --- a/editor/src/messages/portfolio/document/navigation/navigation_message.rs +++ b/editor/src/messages/portfolio/document/navigation/navigation_message.rs @@ -4,7 +4,6 @@ use crate::messages::prelude::*; use glam::DVec2; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, DocumentMessage, Navigation)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum NavigationMessage { 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 b1544bdc..7a717a25 100644 --- a/editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs +++ b/editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs @@ -49,7 +49,6 @@ impl Default for NavigationMessageHandler { } impl MessageHandler, &InputPreprocessorMessageHandler, Option<[DVec2; 2]>, &mut PTZ)> for NavigationMessageHandler { - #[remain::check] fn process_message( &mut self, message: NavigationMessage, @@ -60,7 +59,6 @@ impl MessageHandler, & let old_zoom = ptz.zoom; - #[remain::sorted] match message { DecreaseCanvasZoom { center_on_mouse } => { let new_scale = *VIEWPORT_ZOOM_LEVELS.iter().rev().find(|scale| **scale < ptz.zoom).unwrap_or(&ptz.zoom); diff --git a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs index 4941bf12..b0d27a20 100644 --- a/editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs +++ b/editor/src/messages/portfolio/document/properties_panel/properties_panel_message.rs @@ -2,7 +2,6 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, DocumentMessage, PropertiesPanel)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum PropertiesPanelMessage { 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 bf6b9308..61ea6778 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 @@ -8,7 +8,6 @@ use crate::messages::prelude::*; pub struct PropertiesPanelMessageHandler; impl<'a> MessageHandler)> for PropertiesPanelMessageHandler { - #[remain::check] fn process_message(&mut self, message: PropertiesPanelMessage, responses: &mut VecDeque, (persistent_data, data): (&PersistentData, PropertiesPanelMessageHandlerData)) { use PropertiesPanelMessage::*; diff --git a/editor/src/messages/portfolio/menu_bar/menu_bar_message.rs b/editor/src/messages/portfolio/menu_bar/menu_bar_message.rs index cb87e4b3..79157649 100644 --- a/editor/src/messages/portfolio/menu_bar/menu_bar_message.rs +++ b/editor/src/messages/portfolio/menu_bar/menu_bar_message.rs @@ -2,7 +2,6 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, PortfolioMessage, MenuBar)] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize)] pub enum MenuBarMessage { 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 8f33cdce..27cc154e 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,14 +10,12 @@ pub struct MenuBarMessageHandler { } impl MessageHandler for MenuBarMessageHandler { - #[remain::check] fn process_message(&mut self, message: MenuBarMessage, responses: &mut VecDeque, (has_active_document, rulers_visible): (bool, bool)) { use MenuBarMessage::*; self.has_active_document = has_active_document; self.rulers_visible = rulers_visible; - #[remain::sorted] match message { SendLayout => self.send_layout(responses, LayoutTarget::MenuBar), } diff --git a/editor/src/messages/portfolio/portfolio_message.rs b/editor/src/messages/portfolio/portfolio_message.rs index ae909f33..29d8f68f 100644 --- a/editor/src/messages/portfolio/portfolio_message.rs +++ b/editor/src/messages/portfolio/portfolio_message.rs @@ -7,20 +7,16 @@ use graphene_core::text::Font; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, Portfolio)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum PortfolioMessage { // Sub-messages - #[remain::unsorted] #[child] MenuBar(MenuBarMessage), - #[remain::unsorted] #[child] Document(DocumentMessage), // Messages - #[remain::unsorted] DocumentPassMessage { document_id: DocumentId, message: DocumentMessage, diff --git a/editor/src/messages/portfolio/portfolio_message_handler.rs b/editor/src/messages/portfolio/portfolio_message_handler.rs index 2e65ba7b..2e5c8b26 100644 --- a/editor/src/messages/portfolio/portfolio_message_handler.rs +++ b/editor/src/messages/portfolio/portfolio_message_handler.rs @@ -27,12 +27,9 @@ pub struct PortfolioMessageHandler { } impl MessageHandler for PortfolioMessageHandler { - #[remain::check] 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) => { let mut has_active_document = false; let mut rulers_visible = false; @@ -44,7 +41,6 @@ impl MessageHandler { if let Some(document_id) = self.active_document_id { if let Some(document) = self.documents.get_mut(&document_id) { @@ -60,7 +56,6 @@ impl MessageHandler { if let Some(document) = self.documents.get_mut(&document_id) { let document_inputs = DocumentInputs { diff --git a/editor/src/messages/preferences/preferences_message_handler.rs b/editor/src/messages/preferences/preferences_message_handler.rs index 7bef513c..a3c5a181 100644 --- a/editor/src/messages/preferences/preferences_message_handler.rs +++ b/editor/src/messages/preferences/preferences_message_handler.rs @@ -31,7 +31,6 @@ impl Default for PreferencesMessageHandler { } impl MessageHandler for PreferencesMessageHandler { - #[remain::check] fn process_message(&mut self, message: PreferencesMessage, responses: &mut VecDeque, _data: ()) { match message { PreferencesMessage::Load { preferences } => { diff --git a/editor/src/messages/tool/tool_message.rs b/editor/src/messages/tool/tool_message.rs index b101d9d4..3f6e0ada 100644 --- a/editor/src/messages/tool/tool_message.rs +++ b/editor/src/messages/tool/tool_message.rs @@ -5,120 +5,79 @@ use graphene_core::raster::color::Color; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, Tool)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)] pub enum ToolMessage { // Sub-messages - #[remain::unsorted] #[child] TransformLayer(TransformLayerMessage), - #[remain::unsorted] #[child] Select(SelectToolMessage), - #[remain::unsorted] #[child] Artboard(ArtboardToolMessage), - #[remain::unsorted] #[child] Navigate(NavigateToolMessage), - #[remain::unsorted] #[child] Eyedropper(EyedropperToolMessage), - #[remain::unsorted] #[child] Fill(FillToolMessage), - #[remain::unsorted] #[child] Gradient(GradientToolMessage), - #[remain::unsorted] #[child] Path(PathToolMessage), - #[remain::unsorted] #[child] Pen(PenToolMessage), - #[remain::unsorted] #[child] Freehand(FreehandToolMessage), - #[remain::unsorted] #[child] Spline(SplineToolMessage), - #[remain::unsorted] #[child] Line(LineToolMessage), - #[remain::unsorted] #[child] Rectangle(RectangleToolMessage), - #[remain::unsorted] #[child] Ellipse(EllipseToolMessage), - #[remain::unsorted] #[child] Polygon(PolygonToolMessage), - #[remain::unsorted] #[child] Text(TextToolMessage), - #[remain::unsorted] #[child] Brush(BrushToolMessage), - // #[remain::unsorted] - // #[child] + // // #[child] // Heal(HealToolMessage), - // #[remain::unsorted] - // #[child] + // // #[child] // Clone(CloneToolMessage), - // #[remain::unsorted] - // #[child] + // // #[child] // Patch(PatchToolMessage), - // #[remain::unsorted] - // #[child] + // // #[child] // Relight(RelightToolMessage), - // #[remain::unsorted] - // #[child] + // // #[child] // Detail(DetailToolMessage), - #[remain::unsorted] #[child] Imaginate(ImaginateToolMessage), // Messages - #[remain::unsorted] ActivateToolSelect, - #[remain::unsorted] ActivateToolArtboard, - #[remain::unsorted] ActivateToolNavigate, - #[remain::unsorted] ActivateToolEyedropper, - #[remain::unsorted] ActivateToolText, - #[remain::unsorted] ActivateToolFill, - #[remain::unsorted] ActivateToolGradient, - #[remain::unsorted] ActivateToolPath, - #[remain::unsorted] ActivateToolPen, - #[remain::unsorted] ActivateToolFreehand, - #[remain::unsorted] ActivateToolSpline, - #[remain::unsorted] ActivateToolLine, - #[remain::unsorted] ActivateToolRectangle, - #[remain::unsorted] ActivateToolEllipse, - #[remain::unsorted] ActivateToolPolygon, - #[remain::unsorted] ActivateToolBrush, - #[remain::unsorted] ActivateToolImaginate, ActivateTool { diff --git a/editor/src/messages/tool/tool_message_handler.rs b/editor/src/messages/tool/tool_message_handler.rs index 083d7f18..31b60b7f 100644 --- a/editor/src/messages/tool/tool_message_handler.rs +++ b/editor/src/messages/tool/tool_message_handler.rs @@ -17,7 +17,6 @@ pub struct ToolMessageHandler { } impl MessageHandler for ToolMessageHandler { - #[remain::check] fn process_message( &mut self, message: ToolMessage, @@ -26,49 +25,30 @@ impl MessageHandler self .transform_layer_handler .process_message(message, responses, (document, input, &self.tool_state.tool_data, &mut self.shape_editor)), - #[remain::unsorted] ToolMessage::ActivateToolSelect => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Select }), - #[remain::unsorted] ToolMessage::ActivateToolArtboard => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Artboard }), - #[remain::unsorted] ToolMessage::ActivateToolNavigate => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Navigate }), - #[remain::unsorted] ToolMessage::ActivateToolEyedropper => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Eyedropper }), - #[remain::unsorted] ToolMessage::ActivateToolText => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Text }), - #[remain::unsorted] ToolMessage::ActivateToolFill => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Fill }), - #[remain::unsorted] ToolMessage::ActivateToolGradient => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Gradient }), - #[remain::unsorted] ToolMessage::ActivateToolPath => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Path }), - #[remain::unsorted] ToolMessage::ActivateToolPen => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Pen }), - #[remain::unsorted] ToolMessage::ActivateToolFreehand => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Freehand }), - #[remain::unsorted] ToolMessage::ActivateToolSpline => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Spline }), - #[remain::unsorted] ToolMessage::ActivateToolLine => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Line }), - #[remain::unsorted] ToolMessage::ActivateToolRectangle => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Rectangle }), - #[remain::unsorted] ToolMessage::ActivateToolEllipse => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Ellipse }), - #[remain::unsorted] ToolMessage::ActivateToolPolygon => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Polygon }), - #[remain::unsorted] ToolMessage::ActivateToolBrush => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Brush }), - #[remain::unsorted] ToolMessage::ActivateToolImaginate => responses.add_front(ToolMessage::ActivateTool { tool_type: ToolType::Imaginate }), ToolMessage::ActivateTool { tool_type } => { @@ -241,7 +221,6 @@ impl MessageHandler { let tool_type = match &tool_message { ToolMessage::UpdateCursor | ToolMessage::UpdateHints => self.tool_state.tool_data.active_tool_type, diff --git a/editor/src/messages/tool/tool_messages/artboard_tool.rs b/editor/src/messages/tool/tool_messages/artboard_tool.rs index 15a3df8e..b4ac74e5 100644 --- a/editor/src/messages/tool/tool_messages/artboard_tool.rs +++ b/editor/src/messages/tool/tool_messages/artboard_tool.rs @@ -15,27 +15,18 @@ pub struct ArtboardTool { data: ArtboardToolData, } -#[remain::sorted] #[impl_message(Message, ToolMessage, Artboard)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum ArtboardToolMessage { // Standard messages - #[remain::unsorted] Abort, - #[remain::unsorted] Overlays(OverlayContext), // Tool-specific messages DeleteSelected, - NudgeSelected { - delta_x: f64, - delta_y: f64, - }, + NudgeSelected { delta_x: f64, delta_y: f64 }, PointerDown, - PointerMove { - constrain_axis_or_aspect: Key, - center: Key, - }, + PointerMove { constrain_axis_or_aspect: Key, center: Key }, PointerUp, } diff --git a/editor/src/messages/tool/tool_messages/brush_tool.rs b/editor/src/messages/tool/tool_messages/brush_tool.rs index 9860692b..47995caf 100644 --- a/editor/src/messages/tool/tool_messages/brush_tool.rs +++ b/editor/src/messages/tool/tool_messages/brush_tool.rs @@ -51,14 +51,11 @@ impl Default for BrushOptions { } } -#[remain::sorted] #[impl_message(Message, ToolMessage, Brush)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum BrushToolMessage { // Standard messages - #[remain::unsorted] Abort, - #[remain::unsorted] WorkingColorChanged, // Tool-specific messages @@ -68,7 +65,6 @@ pub enum BrushToolMessage { UpdateOptions(BrushToolMessageOptionsUpdate), } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum BrushToolMessageOptionsUpdate { BlendMode(BlendMode), diff --git a/editor/src/messages/tool/tool_messages/ellipse_tool.rs b/editor/src/messages/tool/tool_messages/ellipse_tool.rs index e0e4ecee..e3286c8e 100644 --- a/editor/src/messages/tool/tool_messages/ellipse_tool.rs +++ b/editor/src/messages/tool/tool_messages/ellipse_tool.rs @@ -33,7 +33,6 @@ impl Default for EllipseToolOptions { } } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum EllipseOptionsUpdate { FillColor(Option), @@ -44,25 +43,18 @@ pub enum EllipseOptionsUpdate { WorkingColors(Option, Option), } -#[remain::sorted] #[impl_message(Message, ToolMessage, Ellipse)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum EllipseToolMessage { // Standard messages - #[remain::unsorted] Overlays(OverlayContext), - #[remain::unsorted] Abort, - #[remain::unsorted] WorkingColorChanged, // Tool-specific messages DragStart, DragStop, - PointerMove { - center: Key, - lock_ratio: Key, - }, + PointerMove { center: Key, lock_ratio: Key }, UpdateOptions(EllipseOptionsUpdate), } diff --git a/editor/src/messages/tool/tool_messages/eyedropper_tool.rs b/editor/src/messages/tool/tool_messages/eyedropper_tool.rs index db668ff1..a846b57a 100644 --- a/editor/src/messages/tool/tool_messages/eyedropper_tool.rs +++ b/editor/src/messages/tool/tool_messages/eyedropper_tool.rs @@ -7,12 +7,10 @@ pub struct EyedropperTool { data: EyedropperToolData, } -#[remain::sorted] #[impl_message(Message, ToolMessage, Eyedropper)] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize, specta::Type)] pub enum EyedropperToolMessage { // Standard messages - #[remain::unsorted] Abort, // Tool-specific messages diff --git a/editor/src/messages/tool/tool_messages/fill_tool.rs b/editor/src/messages/tool/tool_messages/fill_tool.rs index f1b4f2f5..6c29b76c 100644 --- a/editor/src/messages/tool/tool_messages/fill_tool.rs +++ b/editor/src/messages/tool/tool_messages/fill_tool.rs @@ -7,7 +7,6 @@ pub struct FillTool { fsm_state: FillToolFsmState, } -#[remain::sorted] #[impl_message(Message, ToolMessage, Fill)] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize, specta::Type)] pub enum FillToolMessage { diff --git a/editor/src/messages/tool/tool_messages/freehand_tool.rs b/editor/src/messages/tool/tool_messages/freehand_tool.rs index 47a83d3e..56ffb746 100644 --- a/editor/src/messages/tool/tool_messages/freehand_tool.rs +++ b/editor/src/messages/tool/tool_messages/freehand_tool.rs @@ -39,16 +39,12 @@ impl Default for FreehandOptions { } } -#[remain::sorted] #[impl_message(Message, ToolMessage, Freehand)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum FreehandToolMessage { // Standard messages - #[remain::unsorted] Overlays(OverlayContext), - #[remain::unsorted] Abort, - #[remain::unsorted] WorkingColorChanged, // Tool-specific messages @@ -58,7 +54,6 @@ pub enum FreehandToolMessage { UpdateOptions(FreehandOptionsUpdate), } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum FreehandOptionsUpdate { FillColor(Option), diff --git a/editor/src/messages/tool/tool_messages/gradient_tool.rs b/editor/src/messages/tool/tool_messages/gradient_tool.rs index 6d002ed1..da99618a 100644 --- a/editor/src/messages/tool/tool_messages/gradient_tool.rs +++ b/editor/src/messages/tool/tool_messages/gradient_tool.rs @@ -19,28 +19,22 @@ pub struct GradientOptions { gradient_type: GradientType, } -#[remain::sorted] #[impl_message(Message, ToolMessage, Gradient)] #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize, specta::Type)] pub enum GradientToolMessage { // Standard messages - #[remain::unsorted] Abort, - #[remain::unsorted] Overlays(OverlayContext), // Tool-specific messages DeleteStop, InsertStop, PointerDown, - PointerMove { - constrain_axis: Key, - }, + PointerMove { constrain_axis: Key }, PointerUp, UpdateOptions(GradientOptionsUpdate), } -#[remain::sorted] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize, specta::Type)] pub enum GradientOptionsUpdate { Type(GradientType), diff --git a/editor/src/messages/tool/tool_messages/imaginate_tool.rs b/editor/src/messages/tool/tool_messages/imaginate_tool.rs index 39a07000..e5dfde78 100644 --- a/editor/src/messages/tool/tool_messages/imaginate_tool.rs +++ b/editor/src/messages/tool/tool_messages/imaginate_tool.rs @@ -11,21 +11,16 @@ pub struct ImaginateTool { tool_data: ImaginateToolData, } -#[remain::sorted] #[impl_message(Message, ToolMessage, Imaginate)] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize, specta::Type)] pub enum ImaginateToolMessage { // Standard messages - #[remain::unsorted] Abort, // Tool-specific messages DragStart, DragStop, - Resize { - center: Key, - lock_ratio: Key, - }, + Resize { center: Key, lock_ratio: Key }, } impl LayoutHolder for ImaginateTool { diff --git a/editor/src/messages/tool/tool_messages/line_tool.rs b/editor/src/messages/tool/tool_messages/line_tool.rs index ac7eb368..16901241 100644 --- a/editor/src/messages/tool/tool_messages/line_tool.rs +++ b/editor/src/messages/tool/tool_messages/line_tool.rs @@ -32,30 +32,21 @@ impl Default for LineOptions { } } -#[remain::sorted] #[impl_message(Message, ToolMessage, Line)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum LineToolMessage { // Standard messages - #[remain::unsorted] Overlays(OverlayContext), - #[remain::unsorted] Abort, - #[remain::unsorted] WorkingColorChanged, // Tool-specific messages DragStart, DragStop, - PointerMove { - center: Key, - lock_angle: Key, - snap_angle: Key, - }, + PointerMove { center: Key, lock_angle: Key, snap_angle: Key }, UpdateOptions(LineOptionsUpdate), } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum LineOptionsUpdate { LineWeight(f64), diff --git a/editor/src/messages/tool/tool_messages/navigate_tool.rs b/editor/src/messages/tool/tool_messages/navigate_tool.rs index 49ca9066..f87fb0a3 100644 --- a/editor/src/messages/tool/tool_messages/navigate_tool.rs +++ b/editor/src/messages/tool/tool_messages/navigate_tool.rs @@ -6,22 +6,15 @@ pub struct NavigateTool { tool_data: NavigateToolData, } -#[remain::sorted] #[impl_message(Message, ToolMessage, Navigate)] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize, specta::Type)] pub enum NavigateToolMessage { // Standard messages - #[remain::unsorted] Abort, // Tool-specific messages - ClickZoom { - zoom_in: bool, - }, - PointerMove { - snap_angle: Key, - snap_zoom: Key, - }, + ClickZoom { zoom_in: bool }, + PointerMove { snap_angle: Key, snap_zoom: Key }, RotateCanvasBegin, TransformCanvasEnd, TranslateCanvasBegin, diff --git a/editor/src/messages/tool/tool_messages/path_tool.rs b/editor/src/messages/tool/tool_messages/path_tool.rs index 0d79706c..28085edf 100644 --- a/editor/src/messages/tool/tool_messages/path_tool.rs +++ b/editor/src/messages/tool/tool_messages/path_tool.rs @@ -19,16 +19,12 @@ pub struct PathTool { tool_data: PathToolData, } -#[remain::sorted] #[impl_message(Message, ToolMessage, Path)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum PathToolMessage { // Standard messages - #[remain::unsorted] Abort, - #[remain::unsorted] Overlays(OverlayContext), - #[remain::unsorted] SelectionChanged, // Tool-specific messages diff --git a/editor/src/messages/tool/tool_messages/pen_tool.rs b/editor/src/messages/tool/tool_messages/pen_tool.rs index 25116392..5072cdc8 100644 --- a/editor/src/messages/tool/tool_messages/pen_tool.rs +++ b/editor/src/messages/tool/tool_messages/pen_tool.rs @@ -39,29 +39,20 @@ impl Default for PenOptions { } } -#[remain::sorted] #[impl_message(Message, ToolMessage, Pen)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum PenToolMessage { // Standard messages - #[remain::unsorted] Abort, - #[remain::unsorted] SelectionChanged, - #[remain::unsorted] WorkingColorChanged, - #[remain::unsorted] Overlays(OverlayContext), // Tool-specific messages Confirm, DragStart, DragStop, - PointerMove { - snap_angle: Key, - break_handle: Key, - lock_angle: Key, - }, + PointerMove { snap_angle: Key, break_handle: Key, lock_angle: Key }, Redo, Undo, UpdateOptions(PenOptionsUpdate), @@ -75,7 +66,6 @@ enum PenToolFsmState { PlacingAnchor, } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum PenOptionsUpdate { FillColor(Option), diff --git a/editor/src/messages/tool/tool_messages/polygon_tool.rs b/editor/src/messages/tool/tool_messages/polygon_tool.rs index 0d5aa07d..663b04bc 100644 --- a/editor/src/messages/tool/tool_messages/polygon_tool.rs +++ b/editor/src/messages/tool/tool_messages/polygon_tool.rs @@ -37,25 +37,18 @@ impl Default for PolygonOptions { } } -#[remain::sorted] #[impl_message(Message, ToolMessage, Polygon)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum PolygonToolMessage { // Standard messages - #[remain::unsorted] Overlays(OverlayContext), - #[remain::unsorted] Abort, - #[remain::unsorted] WorkingColorChanged, // Tool-specific messages DragStart, DragStop, - PointerMove { - center: Key, - lock_ratio: Key, - }, + PointerMove { center: Key, lock_ratio: Key }, UpdateOptions(PolygonOptionsUpdate), } @@ -65,7 +58,6 @@ pub enum PrimitiveShapeType { Star = 1, } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum PolygonOptionsUpdate { FillColor(Option), diff --git a/editor/src/messages/tool/tool_messages/rectangle_tool.rs b/editor/src/messages/tool/tool_messages/rectangle_tool.rs index 4c23a35d..ff2715c9 100644 --- a/editor/src/messages/tool/tool_messages/rectangle_tool.rs +++ b/editor/src/messages/tool/tool_messages/rectangle_tool.rs @@ -33,7 +33,6 @@ impl Default for RectangleToolOptions { } } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum RectangleOptionsUpdate { FillColor(Option), @@ -44,25 +43,18 @@ pub enum RectangleOptionsUpdate { WorkingColors(Option, Option), } -#[remain::sorted] #[impl_message(Message, ToolMessage, Rectangle)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum RectangleToolMessage { // Standard messages - #[remain::unsorted] Overlays(OverlayContext), - #[remain::unsorted] Abort, - #[remain::unsorted] WorkingColorChanged, // Tool-specific messages DragStart, DragStop, - PointerMove { - center: Key, - lock_ratio: Key, - }, + PointerMove { center: Key, lock_ratio: Key }, UpdateOptions(RectangleOptionsUpdate), } diff --git a/editor/src/messages/tool/tool_messages/select_tool.rs b/editor/src/messages/tool/tool_messages/select_tool.rs index 9c7f98e5..bd4806cc 100644 --- a/editor/src/messages/tool/tool_messages/select_tool.rs +++ b/editor/src/messages/tool/tool_messages/select_tool.rs @@ -30,7 +30,6 @@ pub struct SelectOptions { nested_selection_behavior: NestedSelectionBehavior, } -#[remain::sorted] #[derive(PartialEq, Eq, Clone, Debug, Hash, Serialize, Deserialize, specta::Type)] pub enum SelectOptionsUpdate { NestedSelectionBehavior(NestedSelectionBehavior), @@ -60,32 +59,22 @@ pub struct SelectToolPointerKeys { pub duplicate: Key, } -#[remain::sorted] #[impl_message(Message, ToolMessage, Select)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum SelectToolMessage { // Standard messages - #[remain::unsorted] Abort, - #[remain::unsorted] Overlays(OverlayContext), // Tool-specific messages - DragStart { - add_to_selection: Key, - select_deepest: Key, - }, - DragStop { - remove_from_selection: Key, - }, + DragStart { add_to_selection: Key, select_deepest: Key }, + DragStop { remove_from_selection: Key }, EditLayer, Enter, PointerMove(SelectToolPointerKeys), PointerOutsideViewport(SelectToolPointerKeys), SelectOptions(SelectOptionsUpdate), - SetPivot { - position: PivotPosition, - }, + SetPivot { position: PivotPosition }, ShiftViewport, } diff --git a/editor/src/messages/tool/tool_messages/spline_tool.rs b/editor/src/messages/tool/tool_messages/spline_tool.rs index b97e9796..22337553 100644 --- a/editor/src/messages/tool/tool_messages/spline_tool.rs +++ b/editor/src/messages/tool/tool_messages/spline_tool.rs @@ -34,16 +34,12 @@ impl Default for SplineOptions { } } -#[remain::sorted] #[impl_message(Message, ToolMessage, Spline)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum SplineToolMessage { // Standard messages - #[remain::unsorted] CanvasTransformed, - #[remain::unsorted] Abort, - #[remain::unsorted] WorkingColorChanged, // Tool-specific messages @@ -62,7 +58,6 @@ enum SplineToolFsmState { Drawing, } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum SplineOptionsUpdate { FillColor(Option), diff --git a/editor/src/messages/tool/tool_messages/text_tool.rs b/editor/src/messages/tool/tool_messages/text_tool.rs index 37a6525d..4f897fab 100644 --- a/editor/src/messages/tool/tool_messages/text_tool.rs +++ b/editor/src/messages/tool/tool_messages/text_tool.rs @@ -40,32 +40,23 @@ impl Default for TextOptions { } } -#[remain::sorted] #[impl_message(Message, ToolMessage, Text)] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum TextToolMessage { // Standard messages - #[remain::unsorted] Abort, - #[remain::unsorted] WorkingColorChanged, - #[remain::unsorted] Overlays(OverlayContext), // Tool-specific messages CommitText, EditSelected, Interact, - TextChange { - new_text: String, - }, - UpdateBounds { - new_text: String, - }, + TextChange { new_text: String }, + UpdateBounds { new_text: String }, UpdateOptions(TextOptionsUpdate), } -#[remain::sorted] #[derive(PartialEq, Clone, Debug, Serialize, Deserialize, specta::Type)] pub enum TextOptionsUpdate { FillColor(Option), diff --git a/editor/src/messages/tool/transform_layer/transform_layer_message.rs b/editor/src/messages/tool/transform_layer/transform_layer_message.rs index fec67b52..6b2a1610 100644 --- a/editor/src/messages/tool/transform_layer/transform_layer_message.rs +++ b/editor/src/messages/tool/transform_layer/transform_layer_message.rs @@ -3,7 +3,6 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, ToolMessage, TransformLayer)] #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] pub enum TransformLayerMessage { diff --git a/editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs b/editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs index 61cc5d05..927308ec 100644 --- a/editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs +++ b/editor/src/messages/tool/transform_layer/transform_layer_message_handler.rs @@ -42,7 +42,6 @@ impl TransformLayerMessageHandler { type TransformData<'a> = (&'a DocumentMessageHandler, &'a InputPreprocessorMessageHandler, &'a ToolData, &'a mut ShapeState); impl<'a> MessageHandler> for TransformLayerMessageHandler { - #[remain::check] fn process_message(&mut self, message: TransformLayerMessage, responses: &mut VecDeque, (document, input, tool_data, shape_editor): TransformData) { use TransformLayerMessage::*; @@ -91,7 +90,6 @@ impl<'a> MessageHandler> for TransformL selected.original_transforms.clear(); }; - #[remain::sorted] match message { ApplyTransformOperation => { selected.original_transforms.clear(); diff --git a/editor/src/messages/workspace/workspace_message.rs b/editor/src/messages/workspace/workspace_message.rs index 7251b9f3..e38130d3 100644 --- a/editor/src/messages/workspace/workspace_message.rs +++ b/editor/src/messages/workspace/workspace_message.rs @@ -2,7 +2,6 @@ use crate::messages::prelude::*; use serde::{Deserialize, Serialize}; -#[remain::sorted] #[impl_message(Message, Workspace)] #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)] pub enum WorkspaceMessage { diff --git a/editor/src/messages/workspace/workspace_message_handler.rs b/editor/src/messages/workspace/workspace_message_handler.rs index 17405b16..7045e676 100644 --- a/editor/src/messages/workspace/workspace_message_handler.rs +++ b/editor/src/messages/workspace/workspace_message_handler.rs @@ -6,11 +6,9 @@ pub struct WorkspaceMessageHandler { } impl MessageHandler for WorkspaceMessageHandler { - #[remain::check] fn process_message(&mut self, message: WorkspaceMessage, _responses: &mut VecDeque, _data: ()) { use WorkspaceMessage::*; - #[remain::sorted] match message { // Messages NodeGraphToggleVisibility => {