Skip to content

Clean up redundant code with multiple entry blocks #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2024
Merged

Clean up redundant code with multiple entry blocks #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions addons/block_code/ui/block_canvas/node_block_canvas/node_block_canvas.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,21 +40,27 @@ func generate_script_from_current_window(script_inherits: String = ""):

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

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

if next_block == null:
script += "\tpass\n"
else:
if next_block != null:
var generator: InstructionTree = InstructionTree.new()
var instruction_node: InstructionTree.TreeNode = next_block.get_instruction_node()
var to_append := generator.generate_text(instruction_node, 1)
script += to_append
script += "\n"
is_empty = false

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

if entry_block.signal_name:
init_func.add_child(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