Fix all helper functions in NodeGraphMessageHandler

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -469,14 +469,15 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 						DocumentMessageHandler::get_downstream_node(&self.document_network(), &self.metadata, first_unselected_parent_folder)
 							.unwrap_or((self.document_network().exports_metadata.0, 0));
 
-					responses.add(GraphOperationMessage::InsertNodeBetween {
+					responses.add(NodeGraphMessage::InsertNodeBetween {
 						post_node_id: folder_downstream_node_id,
 						post_node_input_index: folder_downstream_input_index,
 						insert_node_output_index: 0,
 						insert_node_id: layer.to_node(),
 						insert_node_input_index: 0,
 						pre_node_output_index: 0,
 						pre_node_id: first_unselected_parent_folder.to_node(),
+						use_document_network: true,
 					});
 
 					responses.add(GraphOperationMessage::ShiftUpstream {

editor/src/messages/portfolio/document/graph_operation/graph_operation_message.rs

@@ -46,18 +46,6 @@ pub enum GraphOperationMessage {
 	InsertBooleanOperation {
 		operation: BooleanOperation,
 	},
-	InsertNodeBetween {
-		// Post node
-		post_node_id: NodeId,
-		post_node_input_index: usize,
-		// Inserted node
-		insert_node_id: NodeId,
-		insert_node_output_index: usize,
-		insert_node_input_index: usize,
-		// Pre node
-		pre_node_id: NodeId,
-		pre_node_output_index: usize,
-	},
 	LoadStructure,
 	MoveSelectedSiblingsToChild {
 		new_parent: LayerNodeIdentifier,

editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs

@@ -81,28 +81,30 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageData<'_>> for Gr
 				responses.add(NodeGraphMessage::SelectedNodesAdd { nodes: vec![*new_layer_id] });
 
 				match (downstream_node, upstream_node) {
-					(Some(downstream_node), Some(upstream_node)) => responses.add(GraphOperationMessage::InsertNodeBetween {
+					(Some(downstream_node), Some(upstream_node)) => responses.add(NodeGraphMessage::InsertNodeBetween {
 						post_node_id: downstream_node,
 						post_node_input_index: input_index,
 						insert_node_output_index: 0,
 						insert_node_id: *new_layer_id,
 						insert_node_input_index: 0,
 						pre_node_output_index: 0,
 						pre_node_id: upstream_node,
+						use_document_network: true,
 					}),
 					(Some(downstream_node), None) => responses.add(GraphOperationMessage::SetNodeInput {
 						node_id: downstream_node,
 						input_index: input_index,
 						input: NodeInput::node(*new_layer_id, 0),
 					}),
-					(None, Some(upstream_node)) => responses.add(GraphOperationMessage::InsertNodeBetween {
+					(None, Some(upstream_node)) => responses.add(NodeGraphMessage::InsertNodeBetween {
 						post_node_id: document_network.exports_metadata.0,
 						post_node_input_index: 0,
 						insert_node_output_index: 0,
 						insert_node_id: *new_layer_id,
 						insert_node_input_index: 0,
 						pre_node_output_index: 0,
 						pre_node_id: upstream_node,
+						use_document_network: true,
 					}),
 					(None, None) => {
 						if let Some(primary_export) = document_network.exports.get_mut(0) {
@@ -185,23 +187,25 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageData<'_>> for Gr
 				});
 
 				match (post_node_id, pre_node_id) {
-					(Some(post_node_id), Some(pre_node_id)) => responses.add(GraphOperationMessage::InsertNodeBetween {
+					(Some(post_node_id), Some(pre_node_id)) => responses.add(NodeGraphMessage::InsertNodeBetween {
 						post_node_id: post_node_id,
 						post_node_input_index: post_node_input_index,
 						insert_node_output_index: 0,
 						insert_node_id: node_id,
 						insert_node_input_index: 0,
 						pre_node_output_index: 0,
 						pre_node_id: pre_node_id,
+						use_document_network: true,
 					}),
-					(None, Some(pre_node_id)) => responses.add(GraphOperationMessage::InsertNodeBetween {
+					(None, Some(pre_node_id)) => responses.add(NodeGraphMessage::InsertNodeBetween {
 						post_node_id: document_network.exports_metadata.0,
 						post_node_input_index: 0,
 						insert_node_output_index: 0,
 						insert_node_id: node_id,
 						insert_node_input_index: 0,
 						pre_node_output_index: 0,
 						pre_node_id: pre_node_id,
+						use_document_network: true,
 					}),
 					(Some(post_node_id), None) => responses.add(GraphOperationMessage::SetNodeInput {
 						node_id: post_node_id,
@@ -262,14 +266,15 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageData<'_>> for Gr
 				});
 
 				// Insert it in the upper layer's chain, right before it enters the upper layer
-				responses.add(GraphOperationMessage::InsertNodeBetween {
+				responses.add(NodeGraphMessage::InsertNodeBetween {
 					post_node_id: upper_layer.to_node(),
 					post_node_input_index: 1,
 					insert_node_id: boolean_operation_node_id,
 					insert_node_output_index: 0,
 					insert_node_input_index: 0,
 					pre_node_id: upper_node_id,
 					pre_node_output_index: upper_output_index,
+					use_document_network: true,
 				});
 
 				// Connect the lower chain to the Boolean Operation node's lower input
@@ -304,49 +309,6 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageData<'_>> for Gr
 				// Re-render
 				responses.add(NodeGraphMessage::RunDocumentGraph);
 			}
-			GraphOperationMessage::InsertNodeBetween {
-				post_node_id,
-				post_node_input_index,
-				insert_node_output_index,
-				insert_node_id,
-				insert_node_input_index,
-				pre_node_output_index,
-				pre_node_id,
-			} => {
-				let post_node = document_network.nodes.get(&post_node_id);
-				let Some((post_node_input_index, _)) = post_node
-					.map_or(&document_network.exports, |post_node| &post_node.inputs)
-					.iter()
-					.enumerate()
-					.filter(|input| input.1.is_exposed())
-					.nth(post_node_input_index)
-				else {
-					error!("Failed to find input index {post_node_input_index} on node {post_node_id:#?}");
-					return;
-				};
-				let Some(insert_node) = document_network.nodes.get(&insert_node_id) else {
-					error!("Insert node not found");
-					return;
-				};
-				let Some((insert_node_input_index, _)) = insert_node.inputs.iter().enumerate().filter(|input| input.1.is_exposed()).nth(insert_node_input_index) else {
-					error!("Failed to find input index {insert_node_input_index} on node {insert_node_id:#?}");
-					return;
-				};
-
-				let post_input = NodeInput::node(insert_node_id, insert_node_output_index);
-				responses.add(GraphOperationMessage::SetNodeInput {
-					node_id: post_node_id,
-					input_index: post_node_input_index,
-					input: post_input,
-				});
-
-				let insert_input = NodeInput::node(pre_node_id, pre_node_output_index);
-				responses.add(GraphOperationMessage::SetNodeInput {
-					node_id: insert_node_id,
-					input_index: insert_node_input_index,
-					input: insert_input,
-				});
-			}
 			GraphOperationMessage::OpacitySet { layer, opacity } => {
 				if layer == LayerNodeIdentifier::ROOT_PARENT {
 					log::error!("Cannot run OpacitySet on ROOT_PARENT");

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

@@ -57,13 +57,17 @@ pub enum NodeGraphMessage {
 		node_template: NodeTemplate,
 	},
 	InsertNodeBetween {
+		// Post node
 		post_node_id: NodeId,
 		post_node_input_index: usize,
-		insert_node_output_index: usize,
+		// Inserted node
 		insert_node_id: NodeId,
+		insert_node_output_index: usize,
 		insert_node_input_index: usize,
-		pre_node_output_index: usize,
+		// Pre node
 		pre_node_id: NodeId,
+		pre_node_output_index: usize,
+		use_document_network: bool,
 	},
 	PasteNodes {
 		serialized_nodes: String,