formatting

Author: moritztim

addons/form/nodes/Boundaries.gd

@@ -23,4 +23,4 @@ class_name Boundaries extends Resource
 
 ## Determines if the subject is within the boundaries
 func has(subject: int) -> bool:
-	return (max == 0 || subject <= max) && (min == 0 || subject >= min)
+	return (max == 0||subject <= max)&&(min == 0||subject >= min)

addons/form/nodes/Form.gd

@@ -12,14 +12,14 @@ class_name Form extends Control
 			submit_button.pressed.disconnect(submit)
 		submit_button = new_val
 ## Handles the submission of the form.
-@export var protocol:Protocol
+@export var protocol: Protocol
 
 ## Submits the form data to the protocol if the data is valid.
 func submit():
 	var fields := generate_fields_dict(true)
 	var valid := true
 	for field in fields.values():
-		if field["label"] != null && !field["label"].indicate_validity():
+		if field["label"] != null&&!field["label"].indicate_validity():
 			valid = false
 	if !valid:
 		return
@@ -34,19 +34,19 @@ func generate_fields_dict(
 	## 	return { { "label": ..., "input": ... }, ... }
 	## else:
 	## 	return { input, ... }
-	include_labels: bool = false,
+	include_labels: bool=false,
 	## The node to generate the dictionary from.
 	## This is mainly used for recursion.
-	subject: Node = self,
+	subject: Node=self,
 	## The dictionary to add the fields to.
 	## This is mainly used for recursion.
-	fields := {}
+	fields:={}
 ) -> Dictionary:
 	var labeled_inputs := []
 
 	for child in subject.get_children():
 		# If the child is a label with an associated input, add it to the dictionary.
-		if child is FormLabel && child.input != null:
+		if child is FormLabel&&child.input != null:
 			var key := generate_unique_key(child, fields)
 			if include_labels:
 				fields[key] = {
@@ -60,11 +60,11 @@ func generate_fields_dict(
 		elif child.get_child_count() > 0:
 			# Add the child's children to the dictionary as they are returned from the recursive call.
 			fields.merge(generate_fields_dict(include_labels, child, fields))
-	
+
 	# Before we checked only inputs that have labels, so this adds the remaining ones.
 	for child in subject.get_children():
 		# If it's an input and it hasn't been added yet, add it.
-		if Form.is_input(child) && ! labeled_inputs.has(child):
+		if Form.is_input(child)&&!labeled_inputs.has(child):
 			var key := generate_unique_key(child, fields)
 			if include_labels:
 				fields[key] = {
@@ -102,13 +102,13 @@ static func is_input(subject: Node) -> bool:
 		(
 			subject is BaseButton
 			# meaning a button, but not one that just opens a popup
-			&&! subject is MenuButton
+			&&!subject is MenuButton
 		)
 		# or subject is input field
-		|| subject is LineEdit
-		|| subject is TextEdit
-		|| subject is ItemList
-		|| subject is Slider
-		|| subject is SpinBox
-		|| subject is GraphEdit
+		||subject is LineEdit
+		||subject is TextEdit
+		||subject is ItemList
+		||subject is Slider
+		||subject is SpinBox
+		||subject is GraphEdit
 	)

addons/form/nodes/FormLabel.gd

@@ -2,20 +2,19 @@
 ## Label for input controls
 class_name FormLabel extends Label
 
-
 ## Input control to label
 @export var input: Control:
 	set(new_val):
-		if new_val == null || Form.is_input(new_val):
+		if new_val == null||Form.is_input(new_val):
 			if input != null:
 				input.gui_input.disconnect(_on_gui_input)
 			input = new_val
 			mode = mode # run setter
 			indicate_required()
-			if validate_on_input && input != null:
+			if validate_on_input&&input != null:
 				input.gui_input.connect(_on_gui_input)
 		else:
-			printerr(get_class(),": input must be a input button or input field")
+			printerr(get_class(), ": input must be a input button or input field")
 ## "Input value must not be empty"
 @export var input_required := false:
 	set(new_val):
@@ -33,8 +32,8 @@ class_name FormLabel extends Label
 ## The style to apply to the input when valid
 var valid_style: StyleBox:
 	get:
-		if input && _valid_style == null:
-			_valid_style = input.get_theme_stylebox("normal") 
+		if input&&_valid_style == null:
+			_valid_style = input.get_theme_stylebox("normal")
 		return _valid_style
 ## Internal storage for valid_style
 var _valid_style
@@ -58,7 +57,7 @@ enum Mode {
 		if new_val == null:
 			new_val = Mode.SEPARATE
 		mode = new_val
-	
+
 		if mode == Mode.SEPARATE:
 			visible = true
 		else:
@@ -73,15 +72,14 @@ enum Mode {
 						input[prop] = ""
 					found = true
 					break
-			if !found && mode == Mode.IN_INPUT:
+			if !found&&mode == Mode.IN_INPUT:
 				push_error("Input ", input.get_instance_id(), " has no placeholder_text or text property")
 				mode = Mode.SEPARATE
 				visible = true
 
-
 ## Sets the label text to the input's name if it is empty and runs necessary setters
 func _enter_tree():
-	if input != null && text in [null, ""]:
+	if input != null&&text in [null, ""]:
 		text = input.name
 	if !visibility_changed.is_connected(update_display_mode):
 		visibility_changed.connect(update_display_mode)
@@ -91,9 +89,9 @@ func _enter_tree():
 ## If the label is not visible and the mode is Mode.SEPARATE, the mode is set to Mode.HIDDEN.
 ## Else the mode setter is run (mode = mode).
 func update_display_mode():
-	if visible && (mode == Mode.IN_INPUT || mode == Mode.HIDDEN):
+	if visible&&(mode == Mode.IN_INPUT||mode == Mode.HIDDEN):
 		mode = Mode.SEPARATE
-	elif !visible && mode == Mode.SEPARATE:
+	elif !visible&&mode == Mode.SEPARATE:
 		mode = Mode.HIDDEN
 	else:
 		# run setter
@@ -102,7 +100,7 @@ func update_display_mode():
 ## Add or remove the required_hint if input_required
 func indicate_required():
 	# if * needed but not present
-	if input_required && required_hint not in ["", null] && !text.ends_with(required_hint):
+	if input_required&&required_hint not in ["", null]&&!text.ends_with(required_hint):
 		# add
 		text += required_hint
 	# if * present but not needed
@@ -114,16 +112,16 @@ func indicate_required():
 ## Change style based on validity and return validity or default if input is not validatable
 func indicate_validity(
 	## the default value to return if input is not validatable
-	default := true
+	default:=true
 ) -> bool:
 	var valid = default
 	# no input = not validatable -> valid = default
 	if input:
 		var broken_rules := {}
 		var value = Protocol.new().get_value(input)
-		var input_has_not_null_validator = has_property(input, "validator") && input.validator != null
-		
-		if  input_required && (value == null || ((value is String || value is StringName) && value == "")):
+		var input_has_not_null_validator = has_property(input, "validator")&&input.validator != null
+
+		if input_required&&(value == null||((value is String||value is StringName)&&value == "")):
 			# input is required but empty -> valid = false
 				broken_rules["required"] = true
 				valid = false
@@ -135,7 +133,7 @@ func indicate_validity(
 				broken_rules = input.validator.broken_rules
 		else: # Has a text value or doesn't have to be true, has no validation rules. -> valid = true
 			valid = true
-		
+
 		if !valid:
 			print("Input ", input.get_instance_id(), " breaks the following rule(s):")
 			print(broken_rules)
@@ -155,18 +153,18 @@ func indicate_validity(
 	return valid
 
 ## Return validity of "Subject has property_name and it is not a method"
-func has_property(subject:Object, property_name: StringName) -> bool:
-	return property_name in subject && !subject.has_method(property_name)
+func has_property(subject: Object, property_name: StringName) -> bool:
+	return property_name in subject&&!subject.has_method(property_name)
 
 ## Indicate validity on GUI input if event is relevant and validate_on_input
 func _on_gui_input(event: InputEvent):
-		if validate_on_input && !(event is InputEventMouseMotion) && Form.is_input(input) && (
-			event is InputEventMouseButton && event.button_index == MOUSE_BUTTON_LEFT && !event.pressed  && ( # left click release
+		if validate_on_input&&!(event is InputEventMouseMotion)&&Form.is_input(input)&&(
+			event is InputEventMouseButton&&event.button_index == MOUSE_BUTTON_LEFT&&!event.pressed&&( # left click release
 				input is BaseButton
-				|| input is Slider
-				|| input is SpinBox
-				|| input is GraphEdit
+				||input is Slider
+				||input is SpinBox
+				||input is GraphEdit
 			)
-			|| event is InputEventKey
+			||event is InputEventKey
 		):
 			indicate_validity.call_deferred() # ensure value is updated before validation

addons/form/nodes/ListFilter.gd

@@ -13,16 +13,16 @@ enum Match {
 @export var elements: Array[String]
 
 ## Returns wether the subject is represented in the list
-func is_represented_in(subject: String)-> bool:
+func is_represented_in(subject: String) -> bool:
 	for element in elements:
 		if subject.contains(element):
-			if !bool(match): # If any element is present and AT_LEAST_ONE must be, return true
+			if !bool(match ): # If any element is present and AT_LEAST_ONE must be, return true
 				return true
 			## else, keep looking
-		elif bool(match): # If any element is not present but ALL must be, return false
+		elif bool(match ): # If any element is not present but ALL must be, return false
 			return false
 	# If we get here, either every element is present and ALL must be, or no element is present and AT_LEAST_ONE must be
-	return bool(match)
+	return bool(match )
 
 ## Returns the output of elements.size()
 func size() -> int:

addons/form/nodes/Protocol.gd

@@ -36,7 +36,7 @@ func submit(
 	fields: Dictionary
 ) -> int:
 	push_error("not implemented")
-	return -1
+	return - 1
 
 ## Finds the value of the given Node based on its type.
 ## Throws an error if the type is unknown.
@@ -53,7 +53,7 @@ func submit(
 func get_value(subject: Node) -> Variant:
 	if subject is BaseButton:
 		return subject.button_pressed
-	elif subject is LineEdit || subject is TextEdit:
+	elif subject is LineEdit||subject is TextEdit:
 		return subject.text
 	elif subject is ItemList:
 		var items: Array[Dictionary] = []
@@ -65,7 +65,7 @@ func get_value(subject: Node) -> Variant:
 				"metadata": subject.get_item_metadata(i)
 			})
 		return items
-	elif subject is Slider || subject is SpinBox:
+	elif subject is Slider||subject is SpinBox:
 		return subject.value
 	elif subject is GraphEdit:
 		return subject.get_connection_list()
@@ -80,15 +80,14 @@ func sanitize(
 	## Any other type will be returned as is.
 	subject: Variant,
 	## Stores every instance of every character that was caught by the sanitization in order of appearance.
-	jail := [],
+	jail:=[],
 	## The sanitization method to use.
-	sanitization_override := sanitization,
+	sanitization_override:=sanitization,
 	## Whether to sanitize Dictionary keys. Note that this is passed down recursively.
-	sanitize_keys := false
+	sanitize_keys:=false
 ) -> Variant:
 	var sanitized := subject
 
-	
 	match typeof(subject):
 		TYPE_DICTIONARY:
 			sanitized = {}
@@ -112,7 +111,7 @@ func sanitize(
 						jail.append(char)
 					else:
 						subject += char
-			
+
 			# Sanitization
 			var escape_char = "\\"
 			if OS.get_name() == "Windows":
@@ -145,7 +144,7 @@ func sanitize(
 					var result := regex.search_all(subject)
 					var matches := []
 					for match in result:
-						var matchstr = match.get_string()
+						var matchstr = match .get_string()
 						matches.append(matchstr)
 						jail.append(matchstr)
 					for char in subject:

addons/form/nodes/Protocols/FileProtocol.gd

@@ -30,13 +30,13 @@ func submit(
 	if DirAccess.dir_exists_absolute(target_dir) == false:
 		push_error("Target directory does not exist.")
 		return 0
-	
+
 	var file_name := generate_file_name(fields)
 
 	if FileAccess.file_exists(target_dir + "/" + file_name):
 		push_error("File already exists.")
 		return 0
-	
+
 	var values = fields.values().map(func(input: Node):
 		return get_value(input)
 	)