Fix sorting of message enum variants

editor/src/viewport_tools/tools/crop.rs

@@ -10,6 +10,11 @@ pub struct Crop;
 #[impl_message(Message, ToolMessage, Crop)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum CropMessage {
+	// Standard messages
+	// #[remain::unsorted]
+	// Abort,
+
+	// Tool-specific messages
 	MouseMove,
 }
 

editor/src/viewport_tools/tools/ellipse.rs

@@ -23,10 +23,17 @@ pub struct Ellipse {
 #[impl_message(Message, ToolMessage, Ellipse)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum EllipseMessage {
+	// Standard messages
+	#[remain::unsorted]
 	Abort,
+
+	// Tool-specific messages
 	DragStart,
 	DragStop,
-	Resize { center: Key, lock_ratio: Key },
+	Resize {
+		center: Key,
+		lock_ratio: Key,
+	},
 }
 
 impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Ellipse {

editor/src/viewport_tools/tools/eyedropper.rs

@@ -23,7 +23,11 @@ pub struct Eyedropper {
 #[impl_message(Message, ToolMessage, Eyedropper)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum EyedropperMessage {
+	// Standard messages
+	#[remain::unsorted]
 	Abort,
+
+	// Tool-specific messages
 	LeftMouseDown,
 	RightMouseDown,
 }

editor/src/viewport_tools/tools/fill.rs

@@ -23,7 +23,11 @@ pub struct Fill {
 #[impl_message(Message, ToolMessage, Fill)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum FillMessage {
+	// Standard messages
+	#[remain::unsorted]
 	Abort,
+
+	// Tool-specific messages
 	LeftMouseDown,
 	RightMouseDown,
 }

editor/src/viewport_tools/tools/line.rs

@@ -26,10 +26,18 @@ pub struct Line {
 #[impl_message(Message, ToolMessage, Line)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum LineMessage {
+	// Standard messages
+	#[remain::unsorted]
 	Abort,
+
+	// Tool-specific messages
 	DragStart,
 	DragStop,
-	Redraw { center: Key, lock_angle: Key, snap_angle: Key },
+	Redraw {
+		center: Key,
+		lock_angle: Key,
+		snap_angle: Key,
+	},
 }
 
 impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Line {

editor/src/viewport_tools/tools/navigate.rs

@@ -19,9 +19,18 @@ pub struct Navigate {
 #[impl_message(Message, ToolMessage, Navigate)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum NavigateMessage {
+	// Standard messages
+	#[remain::unsorted]
 	Abort,
-	ClickZoom { zoom_in: bool },
-	MouseMove { snap_angle: Key, snap_zoom: Key },
+
+	// Tool-specific messages
+	ClickZoom {
+		zoom_in: bool,
+	},
+	MouseMove {
+		snap_angle: Key,
+		snap_zoom: Key,
+	},
 	RotateCanvasBegin,
 	TransformCanvasEnd,
 	TranslateCanvasBegin,

editor/src/viewport_tools/tools/path.rs

@@ -27,9 +27,12 @@ pub struct Path {
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum PathMessage {
 	// Standard messages
+	#[remain::unsorted]
 	Abort,
+	#[remain::unsorted]
 	DocumentIsDirty,
 
+	// Tool-specific messages
 	DragStart,
 	DragStop,
 	PointerMove,

editor/src/viewport_tools/tools/pen.rs

@@ -24,7 +24,11 @@ pub struct Pen {
 #[impl_message(Message, ToolMessage, Pen)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum PenMessage {
+	// Standard messages
+	#[remain::unsorted]
 	Abort,
+
+	// Tool-specific messages
 	Confirm,
 	DragStart,
 	DragStop,

editor/src/viewport_tools/tools/rectangle.rs

@@ -23,10 +23,17 @@ pub struct Rectangle {
 #[impl_message(Message, ToolMessage, Rectangle)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum RectangleMessage {
+	// Standard messages
+	#[remain::unsorted]
 	Abort,
+
+	// Tool-specific messages
 	DragStart,
 	DragStop,
-	Resize { center: Key, lock_ratio: Key },
+	Resize {
+		center: Key,
+		lock_ratio: Key,
+	},
 }
 
 impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Rectangle {

editor/src/viewport_tools/tools/select.rs

@@ -24,21 +24,30 @@ pub struct Select {
 	data: SelectToolData,
 }
 
-// #[remain::sorted] // https://github.com/dtolnay/remain/issues/16
+#[remain::sorted]
 #[impl_message(Message, ToolMessage, Select)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum SelectMessage {
 	// Standard messages
+	#[remain::unsorted]
 	Abort,
+	#[remain::unsorted]
 	DocumentIsDirty,
 
-	DragStart { add_to_selection: Key },
+	// Tool-specific messages
+	Align {
+		axis: AlignAxis,
+		aggregate: AlignAggregate,
+	},
+	DragStart {
+		add_to_selection: Key,
+	},
 	DragStop,
-	MouseMove { snap_angle: Key },
-
-	Align { axis: AlignAxis, aggregate: AlignAggregate },
 	FlipHorizontal,
 	FlipVertical,
+	MouseMove {
+		snap_angle: Key,
+	},
 }
 
 impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Select {

editor/src/viewport_tools/tools/shape.rs

@@ -24,10 +24,17 @@ pub struct Shape {
 #[impl_message(Message, ToolMessage, Shape)]
 #[derive(PartialEq, Clone, Debug, Hash, Serialize, Deserialize)]
 pub enum ShapeMessage {
+	// Standard messages
+	#[remain::unsorted]
 	Abort,
+
+	// Tool-specific messages
 	DragStart,
 	DragStop,
-	Resize { center: Key, lock_ratio: Key },
+	Resize {
+		center: Key,
+		lock_ratio: Key,
+	},
 }
 
 impl<'a> MessageHandler<ToolMessage, ToolActionHandlerData<'a>> for Shape {