Skip to content

Commit ebd3c74

Browse files
committed
Clean up redundant code with multiple entry blocks
1 parent a55644c commit ebd3c74

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,27 @@ func generate_script_from_current_window(script_inherits: String = ""):
4040

4141
func _generate_script_from_entry_blocks(entry_statement: String, entry_blocks: Array[EntryBlock], init_func: InstructionTree.TreeNode) -> String:
4242
var script = entry_statement + "\n"
43+
var signal_node: InstructionTree.TreeNode
44+
var is_empty = true
4345

4446
for entry_block in entry_blocks:
4547
var next_block := entry_block.bottom_snap.get_snapped_block()
4648

47-
if next_block == null:
48-
script += "\tpass\n"
49-
else:
49+
if next_block != null:
5050
var generator: InstructionTree = InstructionTree.new()
5151
var instruction_node: InstructionTree.TreeNode = next_block.get_instruction_node()
5252
var to_append := generator.generate_text(instruction_node, 1)
5353
script += to_append
54+
script += "\n"
55+
is_empty = false
5456

55-
script += "\n"
57+
if signal_node == null and entry_block.signal_name:
58+
signal_node = InstructionTree.TreeNode.new("{0}.connect(_on_{0})".format([entry_block.signal_name]))
5659

57-
if entry_block.signal_name:
58-
init_func.add_child(InstructionTree.TreeNode.new("{0}.connect(_on_{0})".format([entry_block.signal_name])))
60+
if signal_node:
61+
init_func.add_child(signal_node)
62+
63+
if is_empty:
64+
script += "\tpass\n\n"
5965

6066
return script

0 commit comments

Comments
 (0)