gdharness 1.3.0 → 1.3.2

package/build/godot/addons/gdharness_editor/tools/scene_paths.gd

@@ -11,9 +11,9 @@ extends RefCounted
 
 enum { UNCHANGED, REWRITTEN, DELETED }
 
-const HeadlessCheck = preload("../headless_check.gd")
-const Read = preload("../reading.gd")
-const SceneFile = preload("../scene_file.gd")
+const GdhHeadlessCheck = preload("../headless_check.gd")
+const GdhRead = preload("../reading.gd")
+const GdhSceneFile = preload("../scene_file.gd")
 ## PROPERTY_HINT_NO_NODEPATH, which marks a property the editor's rename skips. It is not bound for
 ## scripts, and follows PROPERTY_HINT_ONESHOT in the engine's list.
 const HINT_NO_NODEPATH: int = PROPERTY_HINT_ONESHOT + 1
@@ -30,7 +30,7 @@ var _homes: Dictionary = {}
 ## it had, its record, the file]. The editor shares such a resource with every scene using it, so a
 ## rewrite that is not saved is put back.
 var _outside: Array[Array] = []
-var _scene: SceneFile = null
+var _scene: GdhSceneFile = null
 var _moves: Dictionary = {}
 var _back: Dictionary = {}
 var _seen: Dictionary = {}
@@ -50,7 +50,7 @@ static func moved(given: String, moves: Dictionary) -> String:
 
 ## Carries [param moves], from the root of [param scene], into the paths it holds. Called after the
 ## move and before the write. Answers how many paths it rewrote.
-func carry(scene: SceneFile, moves: Dictionary) -> int:
+func carry(scene: GdhSceneFile, moves: Dictionary) -> int:
 	if moves.is_empty():
 		return 0
 	_scene = scene
@@ -92,7 +92,7 @@ func carry(scene: SceneFile, moves: Dictionary) -> int:
 ## Opens [param scene_path], carries [param moves] into it, and writes it when that rewrote a path.
 ## Answers "" or why it was left as it was.
 func carry_into(scene_path: String, moves: Dictionary) -> String:
-	var scene: SceneFile = SceneFile.new()
+	var scene: GdhSceneFile = GdhSceneFile.new()
 	var refused: Dictionary = scene.open(scene_path, true)
 	if not refused.is_empty():
 		return str(refused.get("error", ""))
@@ -127,7 +127,7 @@ func put_back(scene_path: String, why: String = "") -> void:
 func answer() -> Dictionary:
 	for file: String in _homes:
 		var resource: Resource = _homes[file]
-		var saving: Error = SceneFile.save_keeping_uid(resource, file)
+		var saving: Error = GdhSceneFile.save_keeping_uid(resource, file)
 		if saving == OK:
 			if Engine.is_editor_hint():
 				EditorInterface.get_resource_filesystem().update_file(file)
@@ -181,11 +181,13 @@ static func _left(record: Dictionary, why: String) -> Dictionary:
 ## Whether [param property] can hold a node path the editor's rename would follow: one saved or
 ## shown, of a type that holds paths, and not marked as holding none.
 static func _may_hold_paths(property: Dictionary) -> bool:
-	if not Read.as_int(property.get("usage")) & (PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR):
+	if not GdhRead.as_int(property.get("usage")) & (PROPERTY_USAGE_STORAGE | PROPERTY_USAGE_EDITOR):
 		return false
-	if Read.as_int(property.get("hint")) == HINT_NO_NODEPATH:
+	if GdhRead.as_int(property.get("hint")) == HINT_NO_NODEPATH:
 		return false
-	return [TYPE_OBJECT, TYPE_NODE_PATH, TYPE_ARRAY, TYPE_DICTIONARY].has(Read.as_int(property.get("type")))
+	return [TYPE_OBJECT, TYPE_NODE_PATH, TYPE_ARRAY, TYPE_DICTIONARY].has(
+		GdhRead.as_int(property.get("type"))
+	)
 
 
 ## [param value], held by the node that was at [param was] and is at [param now], with each path in
@@ -421,7 +423,7 @@ func _home_of(animation: Animation, library: AnimationLibrary) -> Dictionary:
 		}
 	if not Engine.is_editor_hint():
 		var script: Script = home.get_script()
-		if (script != null and not script.is_tool()) or HeadlessCheck.holds_scripted_embedded(home, {}):
+		if (script != null and not script.is_tool()) or GdhHeadlessCheck.holds_scripted_embedded(home, {}):
 			return {
 				"why":
 				(
@@ -432,7 +434,7 @@ func _home_of(animation: Animation, library: AnimationLibrary) -> Dictionary:
 						)
 						% file
 					)
-					+ HeadlessCheck.REMEDY
+					+ GdhHeadlessCheck.REMEDY
 				)
 			}
 	return {"file": file, "home": home, "why": ""}

package/build/godot/addons/gdharness_editor/tools/scene_placing.gd

@@ -4,8 +4,8 @@ extends RefCounted
 ## What a new node in a scene is made or copied from, what the scene owns of it, and where among its
 ## siblings a node may go.
 
-const Read = preload("../reading.gd")
-const PropertyValues = preload("../property_values.gd")
+const GdhRead = preload("../reading.gd")
+const GdhPropertyValues = preload("../property_values.gd")
 
 
 ## The scene to instance for an add, or null for a node of a class, beside why neither can be made
@@ -64,11 +64,11 @@ static func copied(source: Node, root: Node, copies: Dictionary) -> Node:
 			return null
 		copy = packed.instantiate(PackedScene.GEN_EDIT_STATE_INSTANCE)
 		for declared: Dictionary in source.get_property_list():
-			if not (Read.as_int(declared.get("usage", 0)) & PROPERTY_USAGE_STORAGE):
+			if not (GdhRead.as_int(declared.get("usage", 0)) & PROPERTY_USAGE_STORAGE):
 				continue
 			var property: String = str(declared.get("name", ""))
 			var value: Variant = source.get(property)
-			if not PropertyValues.same(copy.get(property), value):
+			if not GdhPropertyValues.same(copy.get(property), value):
 				copy.set(property, value)
 		for group: StringName in source.get_groups():
 			if not copy.is_in_group(group):
@@ -100,7 +100,7 @@ static func reconnect(copies: Dictionary, top: Node) -> void:
 		for info: Dictionary in source.get_signal_list():
 			var signal_name: String = str(info.get("name", ""))
 			for conn: Dictionary in source.get_signal_connection_list(signal_name):
-				var flags: int = Read.as_int(conn.get("flags", 0))
+				var flags: int = GdhRead.as_int(conn.get("flags", 0))
 				var callable: Callable = conn.get("callable", Callable())
 				var target: Object = callable.get_object()
 				if not flags & Object.CONNECT_PERSIST or target == null:
@@ -134,7 +134,7 @@ static func unplaceable(parent: Node, node: Node, asked: Variant) -> String:
 	if asked == null:
 		return ""
 	var others: int = parent.get_child_count() - (1 if node != null and node.get_parent() == parent else 0)
-	var at: int = Read.as_int(asked, -1)
+	var at: int = GdhRead.as_int(asked, -1)
 	if at < 0 or at > others:
 		return (
 			"index %s is not a place among the %d other children of %s: give 0 to %d, 0 for first."
@@ -151,7 +151,7 @@ static func unplaceable(parent: Node, node: Node, asked: Variant) -> String:
 ## Moves [param node] to [param asked] among its siblings, when a place was asked for.
 static func place(node: Node, asked: Variant) -> void:
 	if asked != null:
-		node.get_parent().move_child(node, Read.as_int(asked))
+		node.get_parent().move_child(node, GdhRead.as_int(asked))
 
 
 ## Why [param instanced] cannot be instanced into [param scene_path], or "" when it can: a scene