TemplateEditor: Remove the OPTION parameter type

Instead, we infer that a parameter has a set of options by the existence
of an OptionData as its default value.

In addition, add a way for a code template to include a plain, unquoted
string by using `{{parameter}}`. Previously this happened automatically
for any parameter whose value was an OptionData.

https://phabricator.endlessm.com/T35564

Author: dylanmccall

addons/block_code/blocks/graphics/animationplayer_play.tres

@@ -1,9 +1,14 @@
-[gd_resource type="Resource" load_steps=5 format=3 uid="uid://c5e1byehtxwc0"]
+[gd_resource type="Resource" load_steps=6 format=3 uid="uid://c5e1byehtxwc0"]
 
 [ext_resource type="Script" path="res://addons/block_code/code_generation/block_definition.gd" id="1_emeuv"]
 [ext_resource type="Script" path="res://addons/block_code/code_generation/option_data.gd" id="1_xu43h"]
 [ext_resource type="Script" path="res://addons/block_code/blocks/graphics/animationplayer_play.gd" id="2_7ymgi"]
 
+[sub_resource type="Resource" id="Resource_qpxn2"]
+script = ExtResource("1_xu43h")
+selected = 0
+items = []
+
 [sub_resource type="Resource" id="Resource_vnp2w"]
 script = ExtResource("1_xu43h")
 selected = 0
@@ -17,13 +22,14 @@ description = "Play the animation."
 category = "Graphics | Animation"
 type = 2
 variant_type = 0
-display_template = "Play {animation: OPTION} {direction: OPTION}"
-code_template = "if \"{direction}\" == \"ahead\":
-	play(\"{animation}\")
+display_template = "Play {animation: STRING} {direction: NIL}"
+code_template = "if {direction} == \"ahead\":
+	play({animation})
 else:
-	play_backwards(\"{animation}\")
+	play_backwards({animation})
 "
 defaults = {
+"animation": SubResource("Resource_qpxn2"),
 "direction": SubResource("Resource_vnp2w")
 }
 signal_name = ""

addons/block_code/blocks/logic/compare.tres

@@ -16,8 +16,8 @@ description = ""
 category = "Logic | Comparison"
 type = 3
 variant_type = 1
-display_template = "{float1: FLOAT} {op: OPTION} {float2: FLOAT}"
-code_template = "{float1} {op} {float2}"
+display_template = "{float1: FLOAT} {op: NIL} {float2: FLOAT}"
+code_template = "{float1} {{op}} {float2}"
 defaults = {
 "float1": 1.0,
 "float2": 1.0,

addons/block_code/blocks/sounds/pause_continue_sound.tres

@@ -6,7 +6,7 @@
 [sub_resource type="Resource" id="Resource_lalgp"]
 script = ExtResource("1_ilhdq")
 selected = 0
-items = ["Pause", "Continue"]
+items = ["pause", "continue"]
 
 [resource]
 script = ExtResource("1_q04gm")
@@ -16,9 +16,9 @@ description = "Pause/Continue the audio stream"
 category = "Sounds"
 type = 2
 variant_type = 0
-display_template = "{pause: OPTION} the sound {name: STRING}"
+display_template = "{pause: NIL} the sound {name: STRING}"
 code_template = "var __sound_node = get_node({name})
-if \"{pause}\" == \"pause\":
+if {pause} == \"pause\":
 	__sound_node.stream_paused = true
 else:
 	__sound_node.stream_paused = false

addons/block_code/code_generation/block_ast.gd

@@ -55,11 +55,15 @@ class ASTNode:
 			# 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)
 
 		return IDHandler.make_unique(code_block)
@@ -99,11 +103,15 @@ class ASTValueNode:
 			# 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)
 
 		return IDHandler.make_unique("(%s)" % code)
@@ -130,15 +138,11 @@ func to_string_recursive(node: ASTNode, depth: int) -> String:
 static func raw_input_to_code_string(input) -> String:
 	match typeof(input):
 		TYPE_STRING:
-			return "'%s'" % input.replace("\\", "\\\\").replace("'", "\\'")
+			return "'%s'" % input.c_escape()
 		TYPE_VECTOR2:
 			return "Vector2%s" % str(input)
 		TYPE_COLOR:
 			return "Color%s" % str(input)
-		TYPE_OBJECT:
-			if input is OptionData:
-				var option_data := input as OptionData
-				return option_data.items[option_data.selected]
 		_:
 			return "%s" % input
 

addons/block_code/code_generation/blocks_catalog.gd

@@ -198,8 +198,8 @@ static func _setup_input_block():
 			"Input",
 			Types.BlockType.VALUE,
 			TYPE_BOOL,
-			"Is action {action_name: OPTION} {action: OPTION}",
-			'Input.is_action_{action}("{action_name}")',
+			"Is action {action_name: STRING_NAME} {action: NIL}",
+			"Input.is_action_{{action}}('{{action_name}}')",
 			{"action_name": OptionData.new(inputmap_actions), "action": OptionData.new(["pressed", "just_pressed", "just_released"])},
 		)
 	)

addons/block_code/simple_nodes/simple_character/simple_character.gd

@@ -133,7 +133,7 @@ static func setup_custom_blocks():
 	block_definition.target_node_class = _class_name
 	block_definition.category = "Input"
 	block_definition.type = Types.BlockType.STATEMENT
-	block_definition.display_template = "Move with {player: OPTION} buttons as {kind: OPTION}"
+	block_definition.display_template = "Move with {player: NIL} buttons as {kind: NIL}"
 	block_definition.description = """Move the character using the “Player 1” or “Player 2” controls as configured in Godot.
 
 “Top-down” enables the character to move in both x (vertical) and y (horizontal) dimensions, as if the camera is above the character, looking down. No gravity is added.
@@ -143,7 +143,7 @@ static func setup_custom_blocks():
 “Spaceship” uses the left/right controls to turn the character and up/down controls to go forward or backward."""
 	# TODO: delta here is assumed to be the parameter name of
 	# the _process or _physics_process method:
-	block_definition.code_template = 'move_with_player_buttons("{player}", "{kind}", delta)'
+	block_definition.code_template = "move_with_player_buttons({player}, {kind}, delta)"
 	block_definition.defaults = {
 		"player": OptionData.new(["player_1", "player_2"]),
 		"kind": OptionData.new(["top-down", "platformer", "spaceship"]),

addons/block_code/ui/blocks/utilities/template_editor/template_editor.gd

@@ -114,13 +114,11 @@ func _append_input_parameter(parameter: Dictionary, id: int):
 	parameter_input.placeholder = parameter["name"]
 	parameter_input.variant_type = parameter["type"]
 
-	if parameter["is_option"] and default_value is OptionData:
+	if default_value is OptionData:
 		var option_data := default_value as OptionData
 		parameter_input.option_data = option_data
 		if option_data.selected < option_data.items.size():
 			parameter_input.default_value = option_data.items[option_data.selected]
-	elif parameter["is_option"]:
-		push_warning("The block parameter %s in %s appears to be an option, but no option data is provided" % [parameter_format, parent_block])
 	else:
 		parameter_input.default_value = default_value