Serialize user input as Variants instead of Strings

Co-authored-by: Manuel Quiñones <[email protected]>

Author: wnbaum

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

@@ -56,13 +56,15 @@ func set_raw_input(raw_input):
 			_color_input.color = raw_input
 			_update_panel_bg_color(raw_input)
 		TYPE_VECTOR2:
-			var split = raw_input.split(",")
-			_x_line_edit.text = split[0]
-			_y_line_edit.text = split[1]
+			# Rounding because floats are doubles by default but Vector2s have single components
+			_x_line_edit.text = ("%.4f" % raw_input.x).rstrip("0").rstrip(".")
+			_y_line_edit.text = ("%.4f" % raw_input.y).rstrip("0").rstrip(".")
 		TYPE_BOOL:
 			_bool_input_option.select(raw_input)
+		TYPE_NIL:
+			_line_edit.text = raw_input.trim_suffix("__nil__")
 		_:
-			_line_edit.text = raw_input
+			_line_edit.text = "" if raw_input == null else str(raw_input)
 
 
 func get_raw_input():
@@ -76,9 +78,15 @@ func get_raw_input():
 		TYPE_COLOR:
 			return _color_input.color
 		TYPE_VECTOR2:
-			return _x_line_edit.text + "," + _y_line_edit.text
+			return Vector2(float(_x_line_edit.text), float(_y_line_edit.text))
 		TYPE_BOOL:
 			return bool(_bool_input_option.selected)
+		TYPE_INT:
+			return null if _line_edit.text == "" else int(_line_edit.text)
+		TYPE_FLOAT:
+			return null if _line_edit.text == "" else float(_line_edit.text)
+		TYPE_NIL:
+			return _line_edit.text + "__nil__"
 		_:
 			return _line_edit.text
 
@@ -125,13 +133,21 @@ func get_string() -> String:
 
 	match variant_type:
 		TYPE_STRING:
+			# HACK: don't include quotes around NIL strings
+			if input.ends_with("__nil__"):
+				return input.trim_suffix("__nil__")
 			return "'%s'" % input.replace("\\", "\\\\").replace("'", "\\'")
 		TYPE_VECTOR2:
-			return "Vector2(%s)" % input
+			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
+	return ""
 
 
 func _validate_and_submit_edit_text(line_edit: Node, type: Variant.Type):