BlockAST: Move some duplicated code to a function

Author: dylanmccall

addons/block_code/code_generation/block_ast.gd

@@ -44,35 +44,15 @@ class ASTNode:
 		children = []
 		arguments = {}
 
-	func get_code_block() -> String:
-		var code_block: String = data.code_template  # get multiline code_template from block definition
-
-		# insert args
-
-		# check if args match an overload in the resource
-
-		for arg_name in arguments:
-			# Use parentheses to be safe
-			var argument = arguments[arg_name]
-			var code_string: String
-			var raw_string: String
-			if argument is ASTValueNode:
-				code_string = argument.get_code()
-				raw_string = code_string
-			else:
-				code_string = BlockAST.raw_input_to_code_string(argument)
-				raw_string = str(argument)
-
-			code_block = code_block.replace("{{%s}}" % arg_name, raw_string)
-			code_block = code_block.replace("{%s}" % arg_name, code_string)
-
+	func _get_code_block() -> String:
+		var code_block: String = BlockAST.format_code_template(data.code_template, arguments)
 		return IDHandler.make_unique(code_block)
 
 	func get_code(depth: int) -> String:
 		var code: String = ""
 
 		# append code block
-		var code_block := get_code_block()
+		var code_block := _get_code_block()
 		code_block = code_block.indent("\t".repeat(depth))
 
 		code += code_block + "\n"
@@ -95,25 +75,7 @@ class ASTValueNode:
 		arguments = {}
 
 	func get_code() -> String:
-		var code: String = data.code_template  # get code_template from block definition
-
-		# check if args match an overload in the resource
-
-		for arg_name in arguments:
-			# Use parentheses to be safe
-			var argument = arguments[arg_name]
-			var code_string: String
-			var raw_string: String
-			if argument is ASTValueNode:
-				code_string = argument.get_code()
-				raw_string = code_string
-			else:
-				code_string = BlockAST.raw_input_to_code_string(argument)
-				raw_string = str(argument)
-
-			code = code.replace("{{%s}}" % arg_name, raw_string)
-			code = code.replace("{%s}" % arg_name, code_string)
-
+		var code: String = BlockAST.format_code_template(data.code_template, arguments)
 		return IDHandler.make_unique("(%s)" % code)
 
 
@@ -135,6 +97,26 @@ func to_string_recursive(node: ASTNode, depth: int) -> String:
 	return string
 
 
+static func format_code_template(code_template: String, arguments: Dictionary) -> String:
+	for argument_name in arguments:
+		# Use parentheses to be safe
+		var argument_value: Variant = arguments[argument_name]
+		var code_string: String
+		var raw_string: String
+
+		if argument_value is ASTValueNode:
+			code_string = argument_value.get_code()
+			raw_string = code_string
+		else:
+			code_string = BlockAST.raw_input_to_code_string(argument_value)
+			raw_string = str(argument_value)
+
+		code_template = code_template.replace("{{%s}}" % argument_name, raw_string)
+		code_template = code_template.replace("{%s}" % argument_name, code_string)
+
+	return code_template
+
+
 static func raw_input_to_code_string(input) -> String:
 	match typeof(input):
 		TYPE_STRING: