Dispatcher::handle_message does not need Result anymore (2)

Author: phimuemue

frontend/wasm/src/document.rs

@@ -13,17 +13,16 @@ fn convert_error(err: editor::EditorError) -> JsValue {
 	Error::new(&err.to_string()).into()
 }
 
-fn dispatch<T: Into<Message>>(message: T) -> Result<(), JsValue> {
+fn dispatch<T: Into<Message>>(message: T) {
 	let messages = crate::EDITOR_STATE.with(|state| state.borrow_mut().handle_message(message.into()));
     crate::handle_responses(messages);
-	Ok(()) // TODO
 }
 
 /// Modify the currently selected tool in the document state store
 #[wasm_bindgen]
 pub fn select_tool(tool: String) -> Result<(), JsValue> {
 	match translate_tool(&tool) {
-		Some(tool) => dispatch(ToolMessage::ActivateTool(tool)),
+		Some(tool) => Ok(dispatch(ToolMessage::ActivateTool(tool))),
 		None => Err(Error::new(&format!("Couldn't select {} because it was not recognized as a valid tool", tool)).into()),
 	}
 }
@@ -33,7 +32,7 @@ pub fn select_tool(tool: String) -> Result<(), JsValue> {
 pub fn set_tool_options(tool: String, options: &JsValue) -> Result<(), JsValue> {
 	match options.into_serde::<ToolOptions>() {
 		Ok(options) => match translate_tool(&tool) {
-			Some(tool) => dispatch(ToolMessage::SetToolOptions(tool, options)),
+			Some(tool) => Ok(dispatch(ToolMessage::SetToolOptions(tool, options))),
 			None => Err(Error::new(&format!("Couldn't set options for {} because it was not recognized as a valid tool", tool)).into()),
 		},
 		Err(err) => Err(Error::new(&format!("Invalid JSON for ToolOptions: {}", err)).into()),
@@ -54,73 +53,73 @@ pub fn send_tool_message(tool: String, message: &JsValue) -> Result<(), JsValue>
 		None => Err(Error::new(&format!("Couldn't send message for {} because it was not recognized as a valid tool", tool)).into()),
 	};
 	match tool_message {
-		Ok(tool_message) => dispatch(tool_message),
+		Ok(tool_message) => Ok(dispatch(tool_message)),
 		Err(err) => Err(err),
 	}
 }
 
 #[wasm_bindgen]
-pub fn select_document(document: usize) -> Result<(), JsValue> {
+pub fn select_document(document: usize) {
 	dispatch(DocumentsMessage::SelectDocument(document))
 }
 
 #[wasm_bindgen]
-pub fn get_open_documents_list() -> Result<(), JsValue> {
+pub fn get_open_documents_list() {
 	dispatch(DocumentsMessage::GetOpenDocumentsList)
 }
 
 #[wasm_bindgen]
-pub fn new_document() -> Result<(), JsValue> {
+pub fn new_document() {
 	dispatch(DocumentsMessage::NewDocument)
 }
 
 #[wasm_bindgen]
-pub fn open_document() -> Result<(), JsValue> {
+pub fn open_document() {
 	dispatch(DocumentsMessage::OpenDocument)
 }
 
 #[wasm_bindgen]
-pub fn open_document_file(name: String, content: String) -> Result<(), JsValue> {
+pub fn open_document_file(name: String, content: String) {
 	dispatch(DocumentsMessage::OpenDocumentFile(name, content))
 }
 
 #[wasm_bindgen]
-pub fn save_document() -> Result<(), JsValue> {
+pub fn save_document() {
 	dispatch(DocumentMessage::SaveDocument)
 }
 
 #[wasm_bindgen]
-pub fn close_document(document: usize) -> Result<(), JsValue> {
+pub fn close_document(document: usize) {
 	dispatch(DocumentsMessage::CloseDocument(document))
 }
 
 #[wasm_bindgen]
-pub fn close_all_documents() -> Result<(), JsValue> {
+pub fn close_all_documents() {
 	dispatch(DocumentsMessage::CloseAllDocuments)
 }
 
 #[wasm_bindgen]
-pub fn close_active_document_with_confirmation() -> Result<(), JsValue> {
+pub fn close_active_document_with_confirmation() {
 	dispatch(DocumentsMessage::CloseActiveDocumentWithConfirmation)
 }
 
 #[wasm_bindgen]
-pub fn close_all_documents_with_confirmation() -> Result<(), JsValue> {
+pub fn close_all_documents_with_confirmation() {
 	dispatch(DocumentsMessage::CloseAllDocumentsWithConfirmation)
 }
 
 /// Send new bounds when document panel viewports get resized or moved within the editor
 /// [left, top, right, bottom]...
 #[wasm_bindgen]
-pub fn bounds_of_viewports(bounds_of_viewports: &[f64]) -> Result<(), JsValue> {
+pub fn bounds_of_viewports(bounds_of_viewports: &[f64]) {
 	let chunked: Vec<_> = bounds_of_viewports.chunks(4).map(ViewportBounds::from_slice).collect();
 	let ev = InputPreprocessorMessage::BoundsOfViewports(chunked);
 	dispatch(ev)
 }
 
 /// Mouse movement within the screenspace bounds of the viewport
 #[wasm_bindgen]
-pub fn on_mouse_move(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Result<(), JsValue> {
+pub fn on_mouse_move(x: f64, y: f64, mouse_keys: u8, modifiers: u8) {
 	let editor_mouse_state = EditorMouseState::from_keys_and_editor_position(mouse_keys, (x, y).into());
 
 	let modifier_keys = ModifierKeys::from_bits(modifiers).expect("invalid modifier keys");
@@ -131,7 +130,7 @@ pub fn on_mouse_move(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Result<()
 
 /// Mouse scrolling within the screenspace bounds of the viewport
 #[wasm_bindgen]
-pub fn on_mouse_scroll(x: f64, y: f64, mouse_keys: u8, wheel_delta_x: i32, wheel_delta_y: i32, wheel_delta_z: i32, modifiers: u8) -> Result<(), JsValue> {
+pub fn on_mouse_scroll(x: f64, y: f64, mouse_keys: u8, wheel_delta_x: i32, wheel_delta_y: i32, wheel_delta_z: i32, modifiers: u8) {
 	let mut editor_mouse_state = EditorMouseState::from_keys_and_editor_position(mouse_keys, (x, y).into());
 	editor_mouse_state.scroll_delta = ScrollDelta::new(wheel_delta_x, wheel_delta_y, wheel_delta_z);
 
@@ -143,7 +142,7 @@ pub fn on_mouse_scroll(x: f64, y: f64, mouse_keys: u8, wheel_delta_x: i32, wheel
 
 /// A mouse button depressed within screenspace the bounds of the viewport
 #[wasm_bindgen]
-pub fn on_mouse_down(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Result<(), JsValue> {
+pub fn on_mouse_down(x: f64, y: f64, mouse_keys: u8, modifiers: u8) {
 	let editor_mouse_state = EditorMouseState::from_keys_and_editor_position(mouse_keys, (x, y).into());
 
 	let modifier_keys = ModifierKeys::from_bits(modifiers).expect("invalid modifier keys");
@@ -154,7 +153,7 @@ pub fn on_mouse_down(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Result<()
 
 /// A mouse button released
 #[wasm_bindgen]
-pub fn on_mouse_up(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Result<(), JsValue> {
+pub fn on_mouse_up(x: f64, y: f64, mouse_keys: u8, modifiers: u8) {
 	let editor_mouse_state = EditorMouseState::from_keys_and_editor_position(mouse_keys, (x, y).into());
 
 	let modifier_keys = ModifierKeys::from_bits(modifiers).expect("invalid modifier keys");
@@ -165,7 +164,7 @@ pub fn on_mouse_up(x: f64, y: f64, mouse_keys: u8, modifiers: u8) -> Result<(),
 
 /// A keyboard button depressed within screenspace the bounds of the viewport
 #[wasm_bindgen]
-pub fn on_key_down(name: String, modifiers: u8) -> Result<(), JsValue> {
+pub fn on_key_down(name: String, modifiers: u8) {
 	let key = translate_key(&name);
 	let mods = ModifierKeys::from_bits(modifiers).expect("invalid modifier keys");
 	log::trace!("Key down {:?}, name: {}, modifiers: {:?}", key, name, mods);
@@ -175,7 +174,7 @@ pub fn on_key_down(name: String, modifiers: u8) -> Result<(), JsValue> {
 
 /// A keyboard button released
 #[wasm_bindgen]
-pub fn on_key_up(name: String, modifiers: u8) -> Result<(), JsValue> {
+pub fn on_key_up(name: String, modifiers: u8) {
 	let key = translate_key(&name);
 	let mods = ModifierKeys::from_bits(modifiers).expect("invalid modifier keys");
 	log::trace!("Key up {:?}, name: {}, modifiers: {:?}", key, name, mods);
@@ -185,55 +184,55 @@ pub fn on_key_up(name: String, modifiers: u8) -> Result<(), JsValue> {
 
 /// Update primary color
 #[wasm_bindgen]
-pub fn update_primary_color(primary_color: Color) -> Result<(), JsValue> {
+pub fn update_primary_color(primary_color: Color) {
 	dispatch(ToolMessage::SelectPrimaryColor(primary_color.inner()))
 }
 
 /// Update secondary color
 #[wasm_bindgen]
-pub fn update_secondary_color(secondary_color: Color) -> Result<(), JsValue> {
+pub fn update_secondary_color(secondary_color: Color) {
 	dispatch(ToolMessage::SelectSecondaryColor(secondary_color.inner()))
 }
 
 /// Swap primary and secondary color
 #[wasm_bindgen]
-pub fn swap_colors() -> Result<(), JsValue> {
+pub fn swap_colors() {
 	dispatch(ToolMessage::SwapColors)
 }
 
 /// Reset primary and secondary colors to their defaults
 #[wasm_bindgen]
-pub fn reset_colors() -> Result<(), JsValue> {
+pub fn reset_colors() {
 	dispatch(ToolMessage::ResetColors)
 }
 
 /// Undo history one step
 #[wasm_bindgen]
-pub fn undo() -> Result<(), JsValue> {
+pub fn undo() {
 	dispatch(DocumentMessage::Undo)
 }
 
 /// Redo history one step
 #[wasm_bindgen]
-pub fn redo() -> Result<(), JsValue> {
+pub fn redo() {
 	dispatch(DocumentMessage::Redo)
 }
 
 /// Select all layers
 #[wasm_bindgen]
-pub fn select_all_layers() -> Result<(), JsValue> {
+pub fn select_all_layers() {
 	dispatch(DocumentMessage::SelectAllLayers)
 }
 
 /// Deselect all layers
 #[wasm_bindgen]
-pub fn deselect_all_layers() -> Result<(), JsValue> {
+pub fn deselect_all_layers() {
 	dispatch(DocumentMessage::DeselectAllLayers)
 }
 
 /// Reorder selected layer
 #[wasm_bindgen]
-pub fn reorder_selected_layers(delta: i32) -> Result<(), JsValue> {
+pub fn reorder_selected_layers(delta: i32) {
 	dispatch(DocumentMessage::ReorderSelectedLayers(delta))
 }
 
@@ -260,96 +259,96 @@ pub fn set_blend_mode_for_selected_layers(blend_mode_svg_style_name: String) ->
 		_ => return Err(convert_error(EditorError::Misc("UnknownBlendMode".to_string()))),
 	};
 
-	dispatch(DocumentMessage::SetBlendModeForSelectedLayers(blend_mode))
+	Ok(dispatch(DocumentMessage::SetBlendModeForSelectedLayers(blend_mode)))
 }
 
 /// Set the opacity for the selected layers
 #[wasm_bindgen]
-pub fn set_opacity_for_selected_layers(opacity_percent: f64) -> Result<(), JsValue> {
+pub fn set_opacity_for_selected_layers(opacity_percent: f64) {
 	dispatch(DocumentMessage::SetOpacityForSelectedLayers(opacity_percent / 100.))
 }
 
 /// Export the document
 #[wasm_bindgen]
-pub fn export_document() -> Result<(), JsValue> {
+pub fn export_document() {
 	dispatch(DocumentMessage::ExportDocument)
 }
 
 /// Sets the zoom to the value
 #[wasm_bindgen]
-pub fn set_canvas_zoom(new_zoom: f64) -> Result<(), JsValue> {
+pub fn set_canvas_zoom(new_zoom: f64) {
 	let ev = MovementMessage::SetCanvasZoom(new_zoom);
 	dispatch(ev)
 }
 
 /// Zoom in to the next step
 #[wasm_bindgen]
-pub fn increase_canvas_zoom() -> Result<(), JsValue> {
+pub fn increase_canvas_zoom() {
 	let ev = MovementMessage::IncreaseCanvasZoom;
 	dispatch(ev)
 }
 
 /// Zoom out to the next step
 #[wasm_bindgen]
-pub fn decrease_canvas_zoom() -> Result<(), JsValue> {
+pub fn decrease_canvas_zoom() {
 	let ev = MovementMessage::DecreaseCanvasZoom;
 	dispatch(ev)
 }
 
 /// Sets the rotation to the new value (in radians)
 #[wasm_bindgen]
-pub fn set_rotation(new_radians: f64) -> Result<(), JsValue> {
+pub fn set_rotation(new_radians: f64) {
 	let ev = MovementMessage::SetCanvasRotation(new_radians);
 	dispatch(ev)
 }
 
 /// Translates document (in viewport coords)
 #[wasm_bindgen]
-pub fn translate_canvas(delta_x: f64, delta_y: f64) -> Result<(), JsValue> {
+pub fn translate_canvas(delta_x: f64, delta_y: f64) {
 	let ev = MovementMessage::TranslateCanvas((delta_x, delta_y).into());
 	dispatch(ev)
 }
 
 /// Translates document (in viewport coords)
 #[wasm_bindgen]
-pub fn translate_canvas_by_fraction(delta_x: f64, delta_y: f64) -> Result<(), JsValue> {
+pub fn translate_canvas_by_fraction(delta_x: f64, delta_y: f64) {
 	let ev = MovementMessage::TranslateCanvasByViewportFraction((delta_x, delta_y).into());
 	dispatch(ev)
 }
 
 /// Update the list of selected layers. The layer paths have to be stored in one array and are separated by LayerId::MAX
 #[wasm_bindgen]
-pub fn select_layers(paths: Vec<LayerId>) -> Result<(), JsValue> {
+pub fn select_layers(paths: Vec<LayerId>) {
 	let paths = paths.split(|id| *id == LayerId::MAX).map(|path| path.to_vec()).collect();
 	dispatch(DocumentMessage::SetSelectedLayers(paths))
 }
 
 /// Toggle visibility of a layer from the layer list
 #[wasm_bindgen]
-pub fn toggle_layer_visibility(path: Vec<LayerId>) -> Result<(), JsValue> {
+pub fn toggle_layer_visibility(path: Vec<LayerId>) {
 	dispatch(DocumentMessage::ToggleLayerVisibility(path))
 }
 
 /// Toggle expansions state of a layer from the layer list
 #[wasm_bindgen]
-pub fn toggle_layer_expansion(path: Vec<LayerId>) -> Result<(), JsValue> {
+pub fn toggle_layer_expansion(path: Vec<LayerId>) {
 	dispatch(DocumentMessage::ToggleLayerExpansion(path))
 }
 
 /// Renames a layer from the layer list
 #[wasm_bindgen]
-pub fn rename_layer(path: Vec<LayerId>, new_name: String) -> Result<(), JsValue> {
+pub fn rename_layer(path: Vec<LayerId>, new_name: String) {
 	dispatch(DocumentMessage::RenameLayer(path, new_name))
 }
 
 /// Deletes a layer from the layer list
 #[wasm_bindgen]
-pub fn delete_layer(path: Vec<LayerId>) -> Result<(), JsValue> {
+pub fn delete_layer(path: Vec<LayerId>) {
 	dispatch(DocumentMessage::DeleteLayer(path))
 }
 
 /// Requests the backend to add a layer to the layer list
 #[wasm_bindgen]
-pub fn add_folder(path: Vec<LayerId>) -> Result<(), JsValue> {
+pub fn add_folder(path: Vec<LayerId>) {
 	dispatch(DocumentMessage::CreateFolder(path))
 }