Modify all message enum data to use named struct values, not tuples (#479)

* Massively reorganize and clean up the whole Rust codebase

* Modify all message enum data to use named struct values, not tuples

Author: Keavon

editor/src/communication/dispatcher.rs

@@ -161,10 +161,10 @@ mod test {
 		let mut editor = create_editor_with_three_layers();
 
 		let document_before_copy = editor.dispatcher.message_handlers.portfolio_message_handler.active_document().graphene_document.clone();
-		editor.handle_message(PortfolioMessage::Copy(Clipboard::User));
+		editor.handle_message(PortfolioMessage::Copy { clipboard: Clipboard::User });
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::User,
-			path: vec![],
+			folder_path: vec![],
 			insert_index: -1,
 		});
 		let document_after_copy = editor.dispatcher.message_handlers.portfolio_message_handler.active_document().graphene_document.clone();
@@ -197,11 +197,13 @@ mod test {
 		let document_before_copy = editor.dispatcher.message_handlers.portfolio_message_handler.active_document().graphene_document.clone();
 		let shape_id = document_before_copy.root.as_folder().unwrap().layer_ids[1];
 
-		editor.handle_message(DocumentMessage::SetSelectedLayers(vec![vec![shape_id]]));
-		editor.handle_message(PortfolioMessage::Copy(Clipboard::User));
+		editor.handle_message(DocumentMessage::SetSelectedLayers {
+			replacement_selected_layers: vec![vec![shape_id]],
+		});
+		editor.handle_message(PortfolioMessage::Copy { clipboard: Clipboard::User });
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::User,
-			path: vec![],
+			folder_path: vec![],
 			insert_index: -1,
 		});
 
@@ -235,7 +237,7 @@ mod test {
 		const LINE_INDEX: usize = 0;
 		const PEN_INDEX: usize = 1;
 
-		editor.handle_message(DocumentMessage::CreateEmptyFolder(vec![]));
+		editor.handle_message(DocumentMessage::CreateEmptyFolder { container_path: vec![] });
 
 		let document_before_added_shapes = editor.dispatcher.message_handlers.portfolio_message_handler.active_document().graphene_document.clone();
 		let folder_id = document_before_added_shapes.root.as_folder().unwrap().layer_ids[FOLDER_INDEX];
@@ -257,20 +259,22 @@ mod test {
 			points: vec![(10.0, 20.0), (30.0, 40.0)],
 		});
 
-		editor.handle_message(DocumentMessage::SetSelectedLayers(vec![vec![folder_id]]));
+		editor.handle_message(DocumentMessage::SetSelectedLayers {
+			replacement_selected_layers: vec![vec![folder_id]],
+		});
 
 		let document_before_copy = editor.dispatcher.message_handlers.portfolio_message_handler.active_document().graphene_document.clone();
 
-		editor.handle_message(PortfolioMessage::Copy(Clipboard::User));
+		editor.handle_message(PortfolioMessage::Copy { clipboard: Clipboard::User });
 		editor.handle_message(DocumentMessage::DeleteSelectedLayers);
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::User,
-			path: vec![],
+			folder_path: vec![],
 			insert_index: -1,
 		});
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::User,
-			path: vec![],
+			folder_path: vec![],
 			insert_index: -1,
 		});
 
@@ -329,18 +333,20 @@ mod test {
 		let rect_id = document_before_copy.root.as_folder().unwrap().layer_ids[RECT_INDEX];
 		let ellipse_id = document_before_copy.root.as_folder().unwrap().layer_ids[ELLIPSE_INDEX];
 
-		editor.handle_message(DocumentMessage::SetSelectedLayers(vec![vec![rect_id], vec![ellipse_id]]));
-		editor.handle_message(PortfolioMessage::Copy(Clipboard::User));
+		editor.handle_message(DocumentMessage::SetSelectedLayers {
+			replacement_selected_layers: vec![vec![rect_id], vec![ellipse_id]],
+		});
+		editor.handle_message(PortfolioMessage::Copy { clipboard: Clipboard::User });
 		editor.handle_message(DocumentMessage::DeleteSelectedLayers);
 		editor.draw_rect(0., 800., 12., 200.);
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::User,
-			path: vec![],
+			folder_path: vec![],
 			insert_index: -1,
 		});
 		editor.handle_message(PortfolioMessage::PasteIntoFolder {
 			clipboard: Clipboard::User,
-			path: vec![],
+			folder_path: vec![],
 			insert_index: -1,
 		});
 
@@ -385,17 +391,19 @@ mod test {
 			)
 		};
 
-		editor.handle_message(DocumentMessage::SetSelectedLayers(sorted_layers[..2].to_vec()));
+		editor.handle_message(DocumentMessage::SetSelectedLayers {
+			replacement_selected_layers: sorted_layers[..2].to_vec(),
+		});
 
-		editor.handle_message(DocumentMessage::ReorderSelectedLayers(1));
+		editor.handle_message(DocumentMessage::ReorderSelectedLayers { relative_index_offset: 1 });
 		let (all, non_selected, selected) = verify_order(editor.dispatcher.message_handlers.portfolio_message_handler.active_document_mut());
 		assert_eq!(all, non_selected.into_iter().chain(selected.into_iter()).collect::<Vec<_>>());
 
-		editor.handle_message(DocumentMessage::ReorderSelectedLayers(-1));
+		editor.handle_message(DocumentMessage::ReorderSelectedLayers { relative_index_offset: -1 });
 		let (all, non_selected, selected) = verify_order(editor.dispatcher.message_handlers.portfolio_message_handler.active_document_mut());
 		assert_eq!(all, selected.into_iter().chain(non_selected.into_iter()).collect::<Vec<_>>());
 
-		editor.handle_message(DocumentMessage::ReorderSelectedLayers(i32::MAX));
+		editor.handle_message(DocumentMessage::ReorderSelectedLayers { relative_index_offset: isize::MAX });
 		let (all, non_selected, selected) = verify_order(editor.dispatcher.message_handlers.portfolio_message_handler.active_document_mut());
 		assert_eq!(all, non_selected.into_iter().chain(selected.into_iter()).collect::<Vec<_>>());
 	}

editor/src/document/document_message.rs

@@ -14,14 +14,23 @@ use serde::{Deserialize, Serialize};
 #[derive(PartialEq, Clone, Debug, Serialize, Deserialize)]
 pub enum DocumentMessage {
 	AbortTransaction,
-	AddSelectedLayers(Vec<Vec<LayerId>>),
-	AlignSelectedLayers(AlignAxis, AlignAggregate),
+	AddSelectedLayers {
+		additional_layers: Vec<Vec<LayerId>>,
+	},
+	AlignSelectedLayers {
+		axis: AlignAxis,
+		aggregate: AlignAggregate,
+	},
 	#[child]
 	Artboard(ArtboardMessage),
 	CommitTransaction,
-	CreateEmptyFolder(Vec<LayerId>),
+	CreateEmptyFolder {
+		container_path: Vec<LayerId>,
+	},
 	DebugPrintDocument,
-	DeleteLayer(Vec<LayerId>),
+	DeleteLayer {
+		layer_path: Vec<LayerId>,
+	},
 	DeleteSelectedLayers,
 	DeselectAllLayers,
 	DirtyRenderDocument,
@@ -32,41 +41,78 @@ pub enum DocumentMessage {
 	DocumentStructureChanged,
 	DuplicateSelectedLayers,
 	ExportDocument,
-	FlipSelectedLayers(FlipAxis),
-	FolderChanged(Vec<LayerId>),
+	FlipSelectedLayers {
+		flip_axis: FlipAxis,
+	},
+	FolderChanged {
+		affected_folder_path: Vec<LayerId>,
+	},
 	GroupSelectedLayers,
-	LayerChanged(Vec<LayerId>),
+	LayerChanged {
+		affected_layer_path: Vec<LayerId>,
+	},
 	#[child]
 	Movement(MovementMessage),
 	MoveSelectedLayersTo {
-		path: Vec<LayerId>,
+		folder_path: Vec<LayerId>,
 		insert_index: isize,
 	},
-	NudgeSelectedLayers(f64, f64),
+	NudgeSelectedLayers {
+		delta_x: f64,
+		delta_y: f64,
+	},
 	#[child]
 	Overlays(OverlaysMessage),
 	Redo,
-	RenameLayer(Vec<LayerId>, String),
+	RenameLayer {
+		layer_path: Vec<LayerId>,
+		new_name: String,
+	},
 	RenderDocument,
-	ReorderSelectedLayers(i32), // relative_position,
+	ReorderSelectedLayers {
+		relative_index_offset: isize,
+	},
 	RollbackTransaction,
 	SaveDocument,
 	SelectAllLayers,
 	SelectionChanged,
-	SelectLayer(Vec<LayerId>, bool, bool),
-	SetBlendModeForSelectedLayers(BlendMode),
-	SetLayerExpansion(Vec<LayerId>, bool),
-	SetOpacityForSelectedLayers(f64),
-	SetSelectedLayers(Vec<Vec<LayerId>>),
-	SetSnapping(bool),
-	SetViewMode(ViewMode),
+	SelectLayer {
+		layer_path: Vec<LayerId>,
+		ctrl: bool,
+		shift: bool,
+	},
+	SetBlendModeForSelectedLayers {
+		blend_mode: BlendMode,
+	},
+	SetLayerExpansion {
+		layer_path: Vec<LayerId>,
+		set_expanded: bool,
+	},
+	SetOpacityForSelectedLayers {
+		opacity: f64,
+	},
+	SetSelectedLayers {
+		replacement_selected_layers: Vec<Vec<LayerId>>,
+	},
+	SetSnapping {
+		snap: bool,
+	},
+	SetViewMode {
+		view_mode: ViewMode,
+	},
 	StartTransaction,
-	ToggleLayerExpansion(Vec<LayerId>),
-	ToggleLayerVisibility(Vec<LayerId>),
+	ToggleLayerExpansion {
+		layer_path: Vec<LayerId>,
+	},
+	ToggleLayerVisibility {
+		layer_path: Vec<LayerId>,
+	},
 	#[child]
 	TransformLayers(TransformLayerMessage),
 	Undo,
-	UngroupLayers(Vec<LayerId>),
+	UngroupLayers {
+		folder_path: Vec<LayerId>,
+	},
 	UngroupSelectedLayers,
 	UpdateLayerMetadata {
 		layer_path: Vec<LayerId>,