Move script generation to InstructionTree

Handling the script generation in the UI canvas code seems misplaced,
and it depends on nothing in the UI except for the current canvas
window. Move the generation to InstructionTree using an interface taking
an array of Node. This will allow testing the code generation without
using the block canvas.

Author: dbnicholson

addons/block_code/instruction_tree/instruction_tree.gd

@@ -57,3 +57,67 @@ static func generate_text_recursive(node: TreeNode, depth: int, out: PackedStrin
 
 	if node.next:
 		generate_text_recursive(node.next, depth, out)
+
+
+static func generate_script_from_nodes(nodes: Array[Node], bsd: BlockScriptData) -> String:
+	var entry_blocks_by_entry_statement: Dictionary = {}
+
+	for block in nodes:
+		if !(block is Block):
+			continue
+
+		if block is EntryBlock:
+			var entry_statement = block.get_entry_statement()
+			if not entry_blocks_by_entry_statement.has(entry_statement):
+				entry_blocks_by_entry_statement[entry_statement] = []
+			entry_blocks_by_entry_statement[entry_statement].append(block)
+
+	var script: String = ""
+
+	script += "extends %s\n\n" % bsd.script_inherits
+
+	for variable in bsd.variables:
+		script += "var %s: %s\n\n" % [variable.var_name, type_string(variable.var_type)]
+
+	script += "\n"
+
+	var init_func = TreeNode.new("func _init():")
+
+	for entry_statement in entry_blocks_by_entry_statement:
+		var entry_blocks: Array[EntryBlock]
+		entry_blocks.assign(entry_blocks_by_entry_statement[entry_statement])
+		script += _generate_script_from_entry_blocks(entry_statement, entry_blocks, init_func)
+
+	if init_func.children:
+		script += generate_text(init_func)
+
+	return script
+
+
+static func _generate_script_from_entry_blocks(entry_statement: String, entry_blocks: Array[EntryBlock], init_func: TreeNode) -> String:
+	var script = entry_statement + "\n"
+	var signal_node: TreeNode
+	var is_empty = true
+
+	InstructionTree.IDHandler.reset()
+
+	for entry_block in entry_blocks:
+		var next_block := entry_block.bottom_snap.get_snapped_block()
+
+		if next_block != null:
+			var instruction_node: TreeNode = next_block.get_instruction_node()
+			var to_append := generate_text(instruction_node, 1)
+			script += to_append
+			script += "\n"
+			is_empty = false
+
+		if signal_node == null and entry_block.signal_name:
+			signal_node = TreeNode.new("{0}.connect(_on_{0})".format([entry_block.signal_name]))
+
+	if signal_node:
+		init_func.add_child(signal_node)
+
+	if is_empty:
+		script += "\tpass\n\n"
+
+	return script

addons/block_code/ui/block_canvas/node_block_canvas/node_block_canvas.gd

@@ -5,66 +5,4 @@ extends BlockCanvas
 
 func generate_script_from_current_window(bsd: BlockScriptData):
 	# TODO: implement multiple windows
-	var current_window := _window
-
-	var entry_blocks_by_entry_statement: Dictionary = {}
-
-	for block in current_window.get_children():
-		if !(block is Block):
-			continue
-
-		if block is EntryBlock:
-			var entry_statement = block.get_entry_statement()
-			if not entry_blocks_by_entry_statement.has(entry_statement):
-				entry_blocks_by_entry_statement[entry_statement] = []
-			entry_blocks_by_entry_statement[entry_statement].append(block)
-
-	var script: String = ""
-
-	script += "extends %s\n\n" % bsd.script_inherits
-
-	for variable in bsd.variables:
-		script += "var %s: %s\n\n" % [variable.var_name, type_string(variable.var_type)]
-
-	script += "\n"
-
-	var init_func = InstructionTree.TreeNode.new("func _init():")
-
-	for entry_statement in entry_blocks_by_entry_statement:
-		var entry_blocks: Array[EntryBlock]
-		entry_blocks.assign(entry_blocks_by_entry_statement[entry_statement])
-		script += _generate_script_from_entry_blocks(entry_statement, entry_blocks, init_func)
-
-	if init_func.children:
-		script += InstructionTree.generate_text(init_func)
-
-	return script
-
-
-func _generate_script_from_entry_blocks(entry_statement: String, entry_blocks: Array[EntryBlock], init_func: InstructionTree.TreeNode) -> String:
-	var script = entry_statement + "\n"
-	var signal_node: InstructionTree.TreeNode
-	var is_empty = true
-
-	InstructionTree.IDHandler.reset()
-
-	for entry_block in entry_blocks:
-		var next_block := entry_block.bottom_snap.get_snapped_block()
-
-		if next_block != null:
-			var instruction_node: InstructionTree.TreeNode = next_block.get_instruction_node()
-			var to_append := InstructionTree.generate_text(instruction_node, 1)
-			script += to_append
-			script += "\n"
-			is_empty = false
-
-		if signal_node == null and entry_block.signal_name:
-			signal_node = InstructionTree.TreeNode.new("{0}.connect(_on_{0})".format([entry_block.signal_name]))
-
-	if signal_node:
-		init_func.add_child(signal_node)
-
-	if is_empty:
-		script += "\tpass\n\n"
-
-	return script
+	return InstructionTree.generate_script_from_nodes(_window.get_children(), bsd)