Move DragManager.get_tree_scope to InstructionTree

dbnicholson · dbnicholson · commit 29ab2efb3c19 · 2024-07-23T09:19:03.000-06:00
This static function has nothing to do with the DragManager class since it's simply walking a tree of Nodes and looking for a Block that has a non-empty scope property set. I'm not sure it really fits in InstructionTree either, but that's a better fit at least. This avoids some dependency issues between DragManager, its inner Drag class, and BlockCanvas. https://phabricator.endlessm.com/T35494
diff --git a/addons/block_code/drag_manager/drag_manager.gd b/addons/block_code/drag_manager/drag_manager.gd
@@ -141,7 +141,7 @@ class Drag:
 				if _block_scope != top_block.get_entry_statement():
 					return false
 			elif top_block:
-				var tree_scope := DragManager.get_tree_scope(top_block)
+				var tree_scope := InstructionTree.get_tree_scope(top_block)
 				if tree_scope != "" and _block_scope != tree_scope:
 					return false
 
@@ -230,7 +230,7 @@ func drag_block(block: Block, copied_from: Block = null):
 
 	block.disconnect_signals()
 
-	var block_scope := get_tree_scope(block)
+	var block_scope := InstructionTree.get_tree_scope(block)
 	if block_scope != "":
 		_block_canvas.set_scope(block_scope)
 
@@ -273,16 +273,3 @@ func connect_block_canvas_signals(block: Block):
 		block.drag_started.connect(drag_block)
 	if block.modified.get_connections().size() == 0:
 		block.modified.connect(func(): block_modified.emit())
-
-
-## Returns the scope of the first non-empty scope child block
-static func get_tree_scope(node: Node) -> String:
-	if node is Block:
-		if node.scope != "":
-			return node.scope
-
-	for c in node.get_children():
-		var scope := get_tree_scope(c)
-		if scope != "":
-			return scope
-	return ""
diff --git a/addons/block_code/instruction_tree/instruction_tree.gd b/addons/block_code/instruction_tree/instruction_tree.gd
@@ -121,3 +121,16 @@ static func _generate_script_from_entry_blocks(entry_statement: String, entry_bl
 		script += "\tpass\n\n"
 
 	return script
+
+
+## Returns the scope of the first non-empty scope child block
+static func get_tree_scope(node: Node) -> String:
+	if node is Block:
+		if node.scope != "":
+			return node.scope
+
+	for c in node.get_children():
+		var scope := get_tree_scope(c)
+		if scope != "":
+			return scope
+	return ""
diff --git a/addons/block_code/ui/block_canvas/block_canvas.gd b/addons/block_code/ui/block_canvas/block_canvas.gd
@@ -216,7 +216,7 @@ func set_scope(scope: String):
 			if scope == block.get_entry_statement():
 				valid = true
 		else:
-			var tree_scope := DragManager.get_tree_scope(block)
+			var tree_scope := InstructionTree.get_tree_scope(block)
 			if tree_scope == "" or scope == tree_scope:
 				valid = true
 
