Fix lints and change shortcut key

Author: Keavon

editor/src/messages/input_mapper/input_mappings.rs

@@ -75,7 +75,7 @@ pub fn input_mappings() -> Mapping {
 		entry!(KeyDown(KeyL); modifiers=[Alt], action_dispatch=NodeGraphMessage::ToggleSelectedAsLayersOrNodes),
 		entry!(KeyDown(KeyC); modifiers=[Shift], action_dispatch=NodeGraphMessage::PrintSelectedNodeCoordinates),
 		entry!(KeyDown(KeyC); modifiers=[Alt], action_dispatch=NodeGraphMessage::SendClickTargets),
-		entry!(KeyDown(KeyM); modifiers=[Alt], action_dispatch=NodeGraphMessage::MergeSelectedNodes),
+		entry!(KeyDown(KeyM); modifiers=[Accel], action_dispatch=NodeGraphMessage::MergeSelectedNodes),
 		entry!(KeyUp(KeyC); action_dispatch=NodeGraphMessage::EndSendClickTargets),
 		entry!(KeyDown(ArrowUp); action_dispatch=NodeGraphMessage::ShiftSelectedNodes { direction: Direction::Up, rubber_band: false }),
 		entry!(KeyDown(ArrowRight); action_dispatch=NodeGraphMessage::ShiftSelectedNodes { direction: Direction::Right, rubber_band: false }),

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs

@@ -354,7 +354,6 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap
 					.selected_nodes(breadcrumb_network_path)
 					.unwrap()
 					.selected_nodes()
-					.into_iter()
 					.map(|id| (*id, *id))
 					.collect::<HashMap<NodeId, NodeId>>();
 
@@ -461,7 +460,7 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap
 				});
 				responses.add(NodeGraphMessage::SetDisplayNameImpl {
 					node_id: encapsulating_node_id,
-					alias: "New node group".to_string(),
+					alias: "Untitled Node".to_string(),
 				});
 
 				responses.add(DocumentMessage::EnterNestedNetwork { node_id: encapsulating_node_id });
@@ -2124,12 +2123,12 @@ impl NodeGraphMessageHandler {
 			let output_types = network_interface.output_types(&node_id, breadcrumb_network_path);
 			let primary_output_type = output_types.first().cloned().flatten();
 			let frontend_data_type = if let Some((output_type, _)) = &primary_output_type {
-				FrontendGraphDataType::with_type(&output_type)
+				FrontendGraphDataType::with_type(output_type)
 			} else {
 				FrontendGraphDataType::General
 			};
 			let connected_to = outward_wires.get(&OutputConnector::node(node_id, 0)).cloned().unwrap_or_default();
-			let primary_output = if network_interface.has_primary_output(&node_id, breadcrumb_network_path) && output_types.len() > 0 {
+			let primary_output = if network_interface.has_primary_output(&node_id, breadcrumb_network_path) && !output_types.is_empty() {
 				Some(FrontendGraphOutput {
 					data_type: frontend_data_type,
 					name: "Output 1".to_string(),

editor/src/messages/portfolio/document/utility_types/network_interface.rs

@@ -2192,32 +2192,34 @@ impl NodeNetworkInterface {
 			for (input_index, input) in node.inputs.iter().enumerate() {
 				if let NodeInput::Node { node_id, output_index, .. } = input {
 					// If this errors then there is an input to a node that does not exist
-					let outward_wires_entry = outward_wires.get_mut(&OutputConnector::node(*node_id, *output_index)).expect(&format!(
-						"Output connector {:?} should be initialized for each node output from a node",
-						OutputConnector::node(*node_id, *output_index)
-					));
+					let outward_wires_entry = outward_wires.get_mut(&OutputConnector::node(*node_id, *output_index)).unwrap_or_else(|| {
+						panic!(
+							"Output connector {:?} should be initialized for each node output from a node",
+							OutputConnector::node(*node_id, *output_index)
+						)
+					});
 					outward_wires_entry.push(InputConnector::node(*current_node_id, input_index));
 				} else if let NodeInput::Network { import_index, .. } = input {
-					let outward_wires_entry = outward_wires.get_mut(&OutputConnector::Import(*import_index)).expect(&format!(
-						"Output connector {:?} should be initialized for each import from a node",
-						OutputConnector::Import(*import_index)
-					));
+					let outward_wires_entry = outward_wires
+						.get_mut(&OutputConnector::Import(*import_index))
+						.unwrap_or_else(|| panic!("Output connector {:?} should be initialized for each import from a node", OutputConnector::Import(*import_index)));
 					outward_wires_entry.push(InputConnector::node(*current_node_id, input_index));
 				}
 			}
 		}
 		for (export_index, export) in network.exports.iter().enumerate() {
 			if let NodeInput::Node { node_id, output_index, .. } = export {
-				let outward_wires_entry = outward_wires.get_mut(&OutputConnector::node(*node_id, *output_index)).expect(&format!(
-					"Output connector {:?} should be initialized for each node input from exports",
-					OutputConnector::node(*node_id, *output_index)
-				));
+				let outward_wires_entry = outward_wires.get_mut(&OutputConnector::node(*node_id, *output_index)).unwrap_or_else(|| {
+					panic!(
+						"Output connector {:?} should be initialized for each node input from exports",
+						OutputConnector::node(*node_id, *output_index)
+					)
+				});
 				outward_wires_entry.push(InputConnector::Export(export_index));
 			} else if let NodeInput::Network { import_index, .. } = export {
-				let outward_wires_entry = outward_wires.get_mut(&OutputConnector::Import(*import_index)).expect(&format!(
-					"Output connector {:?} should be initialized between imports and exports",
-					OutputConnector::Import(*import_index)
-				));
+				let outward_wires_entry = outward_wires
+					.get_mut(&OutputConnector::Import(*import_index))
+					.unwrap_or_else(|| panic!("Output connector {:?} should be initialized between imports and exports", OutputConnector::Import(*import_index)));
 				outward_wires_entry.push(InputConnector::Export(export_index));
 			}
 		}
@@ -4298,7 +4300,7 @@ impl NodeNetworkInterface {
 		let valid_upstream_chain_nodes = self.valid_upstream_chain_nodes(input_connector, network_path);
 
 		for node_id in &valid_upstream_chain_nodes {
-			self.set_chain_position(&node_id, network_path);
+			self.set_chain_position(node_id, network_path);
 		}
 		// Reload click target of the layer which used to encapsulate the node
 		if !valid_upstream_chain_nodes.is_empty() {

frontend/src/components/views/Graph.svelte

@@ -2,10 +2,6 @@
 	import { getContext, onMount, tick } from "svelte";
 	import { fade } from "svelte/transition";
 
-	import TextButton from "../widgets/buttons/TextButton.svelte";
-
-	import Separator from "../widgets/labels/Separator.svelte";
-
 	import { FADE_TRANSITION } from "@graphite/consts";
 	import type { NodeGraphState } from "@graphite/state-providers/node-graph";
 	import type { IconName } from "@graphite/utility-functions/icons";
@@ -17,8 +13,10 @@
 	import LayoutCol from "@graphite/components/layout/LayoutCol.svelte";
 	import LayoutRow from "@graphite/components/layout/LayoutRow.svelte";
 	import IconButton from "@graphite/components/widgets/buttons/IconButton.svelte";
+	import TextButton from "@graphite/components/widgets/buttons/TextButton.svelte";
 	import RadioInput from "@graphite/components/widgets/inputs/RadioInput.svelte";
 	import IconLabel from "@graphite/components/widgets/labels/IconLabel.svelte";
+	import Separator from "@graphite/components/widgets/labels/Separator.svelte";
 	import TextLabel from "@graphite/components/widgets/labels/TextLabel.svelte";
 	const GRID_COLLAPSE_SPACING = 10;
 	const GRID_SIZE = 24;