Change context format

Author: 98teg

json_config_file/json_properties/json_property.gd

@@ -332,3 +332,16 @@ func _get_file_path(file: String) -> String:
 		return file
 	else:
 		return _get_variable("dir_path").plus_file(file)
+
+
+func _update_context(error_or_warning: Dictionary, context) -> void:
+	var _index_regex = RegEx.new()
+	_index_regex.compile("^\\[([0-9]|[1-9]+[0-9]+)\\]$")
+
+	if error_or_warning.has("context"):
+		if _index_regex.search(error_or_warning.context) == null:
+			error_or_warning.context = context + "." + error_or_warning.context
+		else:
+			error_or_warning.context = context + error_or_warning.context
+	else:
+		error_or_warning.context = context

json_config_file/json_properties/json_property_array.gd

@@ -63,18 +63,12 @@ func _validate_type(array) -> void:
 				var index = "[" + String(i) + "]"
 
 				for error in _element_property._get_errors():
-					if error.has("context"):
-						error.context = index + "/" + error.context
-					else:
-						error.context = index
+					_update_context(error, index)
 
 					_errors.append(error)
 
 				for warning in _element_property._get_warnings():
-					if warning.has("context"):
-						warning.context = index + "/" + warning.context
-					else:
-						warning.context = index
+					_update_context(warning, index)
 
 					_warnings.append(warning)
 

json_config_file/json_properties/json_property_object.gd

@@ -80,18 +80,12 @@ func _validate_type(object) -> void:
 				_result[property_name] = property._get_result()
 
 				for error in property._get_errors():
-					if error.has("context"):
-						error.context = property_name + "/" + error.context
-					else:
-						error.context = property_name
+					_update_context(error, property_name)
 
 					_errors.append(error)
 
 				for warning in property._get_warnings():
-					if warning.has("context"):
-						warning.context = property_name + "/" + warning.context
-					else:
-						warning.context = property_name
+					_update_context(warning, property_name)
 
 					_warnings.append(warning)