gdharness 1.2.42 → 1.3.1

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

@@ -10,7 +10,7 @@ extends Node
 ## `debug_data` signal every ScriptEditorDebugger emits for every message, on a node Godot does not
 ## expose to scripts: found by its class in the editor's tree and connected to by name.
 
-const Read = preload("../reading.gd")
+const GdhRead = preload("../reading.gd")
 
 ## The most functions a frame may carry when the server does not say. The engine names a function
 ## once, as it first appears, and the game's debugger queue drops those messages past its size, so
@@ -28,7 +28,7 @@ const PROFILE_FROM_START: String = "GDHARNESS_PROFILE_FROM_START"
 
 
 ## The editor's debugger sessions, numbered as the editor numbers its debugger tabs.
-class Sessions:
+class GdhSessions:
 	extends EditorDebuggerPlugin
 
 	signal session_started(session_id: int)
@@ -53,7 +53,7 @@ class Sessions:
 
 
 var _editor_plugin: EditorPlugin = null
-var _sessions: Sessions = null
+var _sessions: GdhSessions = null
 ## The debugger tabs connected to, by instance id, so none is connected twice.
 var _hooked: Dictionary[int, bool] = {}
 
@@ -75,7 +75,7 @@ var _totals: Dictionary[String, PackedFloat64Array] = {}
 
 func set_editor_plugin(plugin: EditorPlugin) -> void:
 	_editor_plugin = plugin
-	_sessions = Sessions.new()
+	_sessions = GdhSessions.new()
 	var joined: int = _sessions.session_started.connect(_on_session_started)
 	if joined != OK:
 		push_error("gdharness could not watch debugger sessions start: %d" % joined)
@@ -105,9 +105,9 @@ func profile_start(args: Dictionary) -> Dictionary:
 			),
 		}
 	_reset()
-	var asked: int = Read.as_int(args.get("frameFunctions", FRAME_FUNCTIONS))
+	var asked: int = GdhRead.as_int(args.get("frameFunctions", FRAME_FUNCTIONS))
 	_frame_functions = asked if asked > 0 else FRAME_FUNCTIONS
-	if Read.as_bool(args.get("arm", false)):
+	if GdhRead.as_bool(args.get("arm", false)):
 		_armed = true
 		# The game the editor starts next inherits the editor's environment, and this tells its
 		# runtime addon to hold its start until the profiler is on, which the session's start
@@ -206,7 +206,7 @@ func _on_debug_data(message: String, data: Array, session_id: int) -> void:
 	if session_id != _session:
 		return
 	if message == "servers:function_signature" and data.size() >= 2:
-		_names[Read.as_int(data[1])] = str(data[0])
+		_names[GdhRead.as_int(data[1])] = str(data[0])
 	elif message == "servers:profile_frame":
 		var carried: int = _add(data, _totals)
 		if carried >= 0:
@@ -231,28 +231,28 @@ func _add(data: Array, into: Dictionary[String, PackedFloat64Array]) -> int:
 	var at: int = 6
 	if data.size() <= at:
 		return -1
-	var servers: int = Read.as_int(data[at])
+	var servers: int = GdhRead.as_int(data[at])
 	at += 1
 	for _server: int in servers:
 		if data.size() <= at + 1:
 			return -1
-		at += 2 + Read.as_int(data[at + 1])
+		at += 2 + GdhRead.as_int(data[at + 1])
 	if data.size() <= at:
 		return -1
-	var values: int = Read.as_int(data[at])
+	var values: int = GdhRead.as_int(data[at])
 	at += 1
 	if values % 5 != 0 or data.size() < at + values:
 		return -1
 	var carried: int = 0
 	for index: int in range(at, at + values, 5):
-		var id: int = Read.as_int(data[index])
+		var id: int = GdhRead.as_int(data[index])
 		var signature: String = _names[id] if _names.has(id) else "#%d" % id
 		var sum: PackedFloat64Array = (
 			into[signature] if into.has(signature) else PackedFloat64Array([0, 0, 0])
 		)
-		sum[0] += Read.as_float(data[index + 1])
-		sum[1] += Read.as_float(data[index + 2])
-		sum[2] += Read.as_float(data[index + 3])
+		sum[0] += GdhRead.as_float(data[index + 1])
+		sum[1] += GdhRead.as_float(data[index + 2])
+		sum[2] += GdhRead.as_float(data[index + 3])
 		into[signature] = sum
 		carried += 1
 	return carried

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

@@ -3,11 +3,11 @@ extends Node
 
 ## Resource files, shaders, tilesets and themes, written through the open editor.
 
-const FileReads = preload("../file_reads.gd")
-const HeadlessCheck = preload("../headless_check.gd")
-const PropertyValues = preload("../property_values.gd")
-const Read = preload("../reading.gd")
-const SceneFile = preload("../scene_file.gd")
+const GdhFileReads = preload("../file_reads.gd")
+const GdhHeadlessCheck = preload("../headless_check.gd")
+const GdhPropertyValues = preload("../property_values.gd")
+const GdhRead = preload("../reading.gd")
+const GdhSceneFile = preload("../scene_file.gd")
 
 # The minimal shader of a type: its declaration and the one function the engine calls for it.
 const SHADER_EMPTY: String = """shader_type %s;
@@ -23,7 +23,7 @@ const SHADER_ENTRY: Dictionary[String, String] = {
 const CELLS_SHOWN: int = 1000
 
 var _editor_plugin: EditorPlugin = null
-var _properties: PropertyValues = PropertyValues.new()
+var _properties: GdhPropertyValues = GdhPropertyValues.new()
 
 
 func set_editor_plugin(plugin: EditorPlugin) -> void:
@@ -48,7 +48,7 @@ func _written(path: String) -> void:
 	if ResourceLoader.has_cached(path):
 		var _replaced: Resource = ResourceLoader.load(path, "", ResourceLoader.CACHE_MODE_REPLACE)
 	if _editor_plugin:
-		SceneFile.scan_later()
+		GdhSceneFile.scan_later()
 
 
 ## Why a tool that creates [param path] must not write there, or "". Saving over a file that was
@@ -89,12 +89,15 @@ func _xy(value: Variant, label: String) -> Array:
 			x = pair[0]
 			y = pair[1]
 	for number: Variant in [x, y]:
-		if not (number is float or number is int) or Read.as_float(number) != floorf(Read.as_float(number)):
+		if (
+			not (number is float or number is int)
+			or GdhRead.as_float(number) != floorf(GdhRead.as_float(number))
+		):
 			return [
 				false,
 				'%s must be two whole numbers, {"x": .., "y": ..}, not %s.' % [label, JSON.stringify(value)]
 			]
-	return [true, Vector2i(Read.as_int(x), Read.as_int(y))]
+	return [true, Vector2i(GdhRead.as_int(x), GdhRead.as_int(y))]
 
 
 ## The theme on disk at this path, or null when there is not one.
@@ -119,12 +122,12 @@ func _load_theme(theme_path: String) -> Theme:
 ## Read back because a property can be set and still not be saved: one without storage, a
 ## script variable that is not exported. Both were answered as changed.
 func _save_checked(resource: Resource, path: String, names: Array, previous: Variant) -> String:
-	var saving: Error = SceneFile.save_keeping_uid(resource, path)
+	var saving: Error = GdhSceneFile.save_keeping_uid(resource, path)
 	if saving != OK:
 		return "Failed to save %s: %s" % [path, error_string(saving)]
 	var unkept: String = _unkept_headless(resource, path, names, previous)
 	if not unkept.is_empty():
-		return "Nothing was written: " + unkept + HeadlessCheck.put_back(path, previous)
+		return "Nothing was written: " + unkept + GdhHeadlessCheck.put_back(path, previous)
 	var loaded: Resource = ResourceLoader.load(path, "", ResourceLoader.CACHE_MODE_IGNORE)
 	var lost: String = ""
 	if loaded == null:
@@ -133,7 +136,7 @@ func _save_checked(resource: Resource, path: String, names: Array, previous: Var
 		for key: Variant in names:
 			var property: String = str(key)
 			var read: Variant = _properties.read_at(loaded, property)
-			if not PropertyValues.same(read, _properties.read_at(resource, property)):
+			if not GdhPropertyValues.same(read, _properties.read_at(resource, property)):
 				lost = (
 					(
 						"%s.%s would load from the file as %s: it is not a property the file keeps, so "
@@ -145,19 +148,19 @@ func _save_checked(resource: Resource, path: String, names: Array, previous: Var
 	if lost.is_empty():
 		_written(path)
 		return ""
-	return lost + HeadlessCheck.put_back(path, previous)
+	return lost + GdhHeadlessCheck.put_back(path, previous)
 
 
 ## Outside the editor, puts back in the file just saved at [param path] what a script that is not a
 ## tool changed and the call did not ask for, [param names] being what it asked for, and answers ""
-## or why that did not hold. See [HeadlessCheck].
+## or why that did not hold. See [GdhHeadlessCheck].
 func _unkept_headless(resource: Resource, path: String, names: Array, previous: Variant) -> String:
 	if Engine.is_editor_hint():
 		return ""
 	var script: Script = resource.get_script()
 	var scripted: bool = script != null and not script.is_tool()
 	if not path.ends_with(".tres"):
-		if scripted or HeadlessCheck.holds_scripted_embedded(resource, {}):
+		if scripted or GdhHeadlessCheck.holds_scripted_embedded(resource, {}):
 			return (
 				(
 					(
@@ -166,7 +169,7 @@ func _unkept_headless(resource: Resource, path: String, names: Array, previous:
 					)
 					% path
 				)
-				+ HeadlessCheck.REMEDY
+				+ GdhHeadlessCheck.REMEDY
 			)
 		return ""
 	var before: String = ""
@@ -179,15 +182,15 @@ func _unkept_headless(resource: Resource, path: String, names: Array, previous:
 		var property: String = str(key)
 		asked[property] = true
 		asked[property.get_slice(":", 0)] = true
-		reached.merge(HeadlessCheck.reached(resource, property))
-	return HeadlessCheck.settle_saved(
+		reached.merge(GdhHeadlessCheck.reached(resource, property))
+	return GdhHeadlessCheck.settle_saved(
 		path,
 		before,
-		HeadlessCheck.stored(resource).values(),
+		GdhHeadlessCheck.stored(resource).values(),
 		resource if scripted else null,
 		asked,
 		reached,
-		func() -> Error: return SceneFile.save_keeping_uid(resource, path)
+		func() -> Error: return GdhSceneFile.save_keeping_uid(resource, path)
 	)
 
 
@@ -202,7 +205,7 @@ func create_resource(args: Dictionary) -> Dictionary:
 		return {"ok": false, "error": taken}
 
 	var script_path: String = str(args.get("script", ""))
-	var made: Dictionary = SceneFile.made_as(
+	var made: Dictionary = GdhSceneFile.made_as(
 		resource_type, "" if script_path == "" else _ensure_res_path(script_path), "Resource", "resourceType"
 	)
 	if made.has("error"):
@@ -229,7 +232,7 @@ func create_resource(args: Dictionary) -> Dictionary:
 		var script: Script = load(script_file) as Script
 		if script == null:
 			return {"ok": false, "error": "No script loads from " + script_file}
-		var uncompiled: String = SceneFile.uncompiled(script, script_file)
+		var uncompiled: String = GdhSceneFile.uncompiled(script, script_file)
 		if not uncompiled.is_empty():
 			return {"ok": false, "error": uncompiled}
 		var base: String = str(script.get_instance_base_type())
@@ -245,13 +248,15 @@ func create_resource(args: Dictionary) -> Dictionary:
 	if not refused.is_empty():
 		return {"ok": false, "error": refused}
 
-	var folder: String = SceneFile.make_folder_for(res_path)
+	var folder: String = GdhSceneFile.make_folder_for(res_path)
 	if not folder.is_empty():
 		return {"ok": false, "error": folder}
+	var answer: Dictionary = {"ok": true, "resourcePath": res_path, "resourceType": asked_type}
+	_properties.note_also_changed(answer)
 	var failed: String = _save_checked(resource, res_path, properties.keys(), null)
 	if not failed.is_empty():
 		return {"ok": false, "error": failed}
-	return {"ok": true, "resourcePath": res_path, "resourceType": asked_type}
+	return answer
 
 
 func modify_resource(args: Dictionary) -> Dictionary:
@@ -284,11 +289,13 @@ func modify_resource(args: Dictionary) -> Dictionary:
 	var refused: String = _properties.write_all(resource, properties)
 	if not refused.is_empty():
 		return {"ok": false, "error": refused}
+	var answer: Dictionary = {"ok": true, "resourcePath": res_path}
+	_properties.note_also_changed(answer)
 	var previous: PackedByteArray = FileAccess.get_file_as_bytes(res_path)
 	var failed: String = _save_checked(resource, res_path, properties.keys(), previous)
 	if not failed.is_empty():
 		return {"ok": false, "error": failed}
-	return {"ok": true, "resourcePath": res_path}
+	return answer
 
 
 ## What a resource file holds, read as a headless engine reads it with no editor connected.
@@ -300,14 +307,14 @@ func read_resource(args: Dictionary) -> Dictionary:
 	var inner: String = str(args.get("subResource", ""))
 	if not inner.is_empty():
 		res_path += "::" + inner
-	return FileReads.resource(res_path, Read.as_bool(args.get("includeDefaults", false)))
+	return GdhFileReads.resource(res_path, GdhRead.as_bool(args.get("includeDefaults", false)))
 
 
 func create_shader(args: Dictionary) -> Dictionary:
-	var shader_path: String = _ensure_res_path(str(args.get("shaderPath", "")))
+	var shader_path: String = _ensure_res_path(str(args.get("resourcePath", "")))
 	var shader_type: String = str(args.get("shaderType", "canvas_item"))
 	if shader_path == "res://":
-		return {"ok": false, "error": "shaderPath is required"}
+		return {"ok": false, "error": "resourcePath is required"}
 	var taken: String = _taken(shader_path, "resource_edit op=create_shader", "Edit its text")
 	if not taken.is_empty():
 		return {"ok": false, "error": taken}
@@ -316,7 +323,7 @@ func create_shader(args: Dictionary) -> Dictionary:
 	if code == "":
 		code = SHADER_EMPTY % [shader_type, SHADER_ENTRY.get(shader_type, "fragment")]
 
-	var folder: String = SceneFile.make_folder_for(shader_path)
+	var folder: String = GdhSceneFile.make_folder_for(shader_path)
 	if not folder.is_empty():
 		return {"ok": false, "error": folder}
 	var file: FileAccess = FileAccess.open(shader_path, FileAccess.WRITE)
@@ -336,9 +343,9 @@ func create_shader(args: Dictionary) -> Dictionary:
 
 
 func create_tileset(args: Dictionary) -> Dictionary:
-	var tileset_path: String = _ensure_res_path(str(args.get("tilesetPath", "")))
+	var tileset_path: String = _ensure_res_path(str(args.get("resourcePath", "")))
 	if tileset_path == "res://":
-		return {"ok": false, "error": "tilesetPath is required"}
+		return {"ok": false, "error": "resourcePath is required"}
 	var taken: String = _taken(tileset_path, "resource_edit op=create_tileset")
 	if not taken.is_empty():
 		return {"ok": false, "error": taken}
@@ -371,10 +378,10 @@ func create_tileset(args: Dictionary) -> Dictionary:
 			{"sourceId": added, "texture": atlas.texture.resource_path, "tiles": atlas.get_tiles_count()}
 		)
 
-	var folder: String = SceneFile.make_folder_for(tileset_path)
+	var folder: String = GdhSceneFile.make_folder_for(tileset_path)
 	if not folder.is_empty():
 		return {"ok": false, "error": folder}
-	var saving: Error = SceneFile.save_keeping_uid(tileset, tileset_path)
+	var saving: Error = GdhSceneFile.save_keeping_uid(tileset, tileset_path)
 	if saving != OK:
 		return {"ok": false, "error": "Failed to save %s: %s" % [tileset_path, error_string(saving)]}
 
@@ -478,7 +485,7 @@ func _source_ids(tile_set: TileSet) -> Array[int]:
 
 func set_tilemap_cells(args: Dictionary) -> Dictionary:
 	var scene_path: String = _ensure_res_path(str(args.get("scenePath", "")))
-	var node_path: String = str(args.get("tilemapNodePath", ""))
+	var node_path: String = str(args.get("nodePath", ""))
 	if scene_path == "res://":
 		return {"ok": false, "error": "scenePath is required"}
 
@@ -491,12 +498,12 @@ func set_tilemap_cells(args: Dictionary) -> Dictionary:
 	if placed.is_empty():
 		return {"ok": false, "error": "cells is empty, so there is nothing to place"}
 
-	var scene: SceneFile = SceneFile.new()
+	var scene: GdhSceneFile = GdhSceneFile.new()
 	var refused: Dictionary = scene.open(scene_path, true)
 	if not refused.is_empty():
 		return refused
 
-	var layer: int = Read.as_int(args.get("layer", 0))
+	var layer: int = GdhRead.as_int(args.get("layer", 0))
 	var found: Array = _tile_node(scene, node_path, layer)
 	if found[0] == null:
 		return scene.refuse(str(found[1]))
@@ -544,7 +551,7 @@ func set_tilemap_cells(args: Dictionary) -> Dictionary:
 
 ## The node at [param node_path] cells are painted on, with a TileSet, as [node, why not].
 ## TileMapLayer is the node since 4.3, and TileMap the one it replaced, which keeps its layers.
-func _tile_node(scene: SceneFile, node_path: String, layer: int) -> Array:
+func _tile_node(scene: GdhSceneFile, node_path: String, layer: int) -> Array:
 	var node: Node = (
 		scene.root if node_path == "." or node_path == "" else scene.root.get_node_or_null(node_path)
 	)
@@ -582,12 +589,12 @@ func _cell(entry: Variant, index: int, tile_set: TileSet) -> Array:
 	var atlas_at: Array = _xy(cell["atlasCoords"], "cells[%d].atlasCoords" % index)
 	if not atlas_at[0]:
 		return atlas_at
-	var source_id: int = Read.as_int(cell["sourceId"], -1)
+	var source_id: int = GdhRead.as_int(cell["sourceId"], -1)
 	if not tile_set.has_source(source_id):
 		return [false, "The TileSet has no source %d; it has %s" % [source_id, _source_ids(tile_set)]]
 	var source: TileSetSource = tile_set.get_source(source_id)
 	var atlas_coords: Vector2i = atlas_at[1]
-	var alternative: int = Read.as_int(cell.get("alternativeTile", 0))
+	var alternative: int = GdhRead.as_int(cell.get("alternativeTile", 0))
 	if not source.has_tile(atlas_coords):
 		return [
 			false,
@@ -691,20 +698,20 @@ func _cell_at(node: Node, layer: int, at: Vector2i) -> Array:
 ## Saves [param theme] over [param theme_path] with [param item] changed, answering "" or why not.
 func _save_theme(theme: Theme, theme_path: String, item: String) -> String:
 	var previous: PackedByteArray = FileAccess.get_file_as_bytes(theme_path)
-	var saving: Error = SceneFile.save_keeping_uid(theme, theme_path)
+	var saving: Error = GdhSceneFile.save_keeping_uid(theme, theme_path)
 	if saving != OK:
 		return "Failed to save %s: %s" % [theme_path, error_string(saving)]
 	var unkept: String = _unkept_headless(theme, theme_path, [item], previous)
 	if not unkept.is_empty():
-		return "Nothing was written: " + unkept + HeadlessCheck.put_back(theme_path, previous)
+		return "Nothing was written: " + unkept + GdhHeadlessCheck.put_back(theme_path, previous)
 	_written(theme_path)
 	return ""
 
 
 func set_theme_color(args: Dictionary) -> Dictionary:
-	var theme_path: String = _ensure_res_path(str(args.get("themePath", "")))
+	var theme_path: String = _ensure_res_path(str(args.get("resourcePath", "")))
 	if theme_path == "res://":
-		return {"ok": false, "error": "themePath is required"}
+		return {"ok": false, "error": "resourcePath is required"}
 
 	var color_name: String = str(args.get("colorName", ""))
 	var control_type: String = str(args.get("controlType", ""))
@@ -717,10 +724,10 @@ func set_theme_color(args: Dictionary) -> Dictionary:
 
 	var c: Dictionary = args.get("color", {})
 	var color: Color = Color(
-		Read.as_float(c.get("r", 1.0), 1.0),
-		Read.as_float(c.get("g", 1.0), 1.0),
-		Read.as_float(c.get("b", 1.0), 1.0),
-		Read.as_float(c.get("a", 1.0), 1.0)
+		GdhRead.as_float(c.get("r", 1.0), 1.0),
+		GdhRead.as_float(c.get("g", 1.0), 1.0),
+		GdhRead.as_float(c.get("b", 1.0), 1.0),
+		GdhRead.as_float(c.get("a", 1.0), 1.0)
 	)
 	theme.set_color(color_name, control_type, color)
 
@@ -745,9 +752,9 @@ func set_theme_color(args: Dictionary) -> Dictionary:
 
 
 func set_theme_font_size(args: Dictionary) -> Dictionary:
-	var theme_path: String = _ensure_res_path(str(args.get("themePath", "")))
+	var theme_path: String = _ensure_res_path(str(args.get("resourcePath", "")))
 	if theme_path == "res://":
-		return {"ok": false, "error": "themePath is required"}
+		return {"ok": false, "error": "resourcePath is required"}
 
 	var font_size_name: String = str(args.get("fontSizeName", ""))
 	var control_type: String = str(args.get("controlType", ""))
@@ -760,7 +767,7 @@ func set_theme_font_size(args: Dictionary) -> Dictionary:
 
 	# Godot reads a size of 0 or less as unset and answers the theme's default, so -3 would be read
 	# back as 16.
-	var pixels: float = Read.as_float(args.get("size"), 0.0)
+	var pixels: float = GdhRead.as_float(args.get("size"), 0.0)
 	if not is_finite(pixels) or pixels < 1 or pixels != floorf(pixels):
 		var shown: String = str(int(pixels)) if pixels == floorf(pixels) else str(pixels)
 		return {

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

@@ -4,9 +4,9 @@ extends RefCounted
 ## The two ways a scene keeps its own values for nodes another scene makes: by inheriting that scene,
 ## or by instancing it with its children editable.
 
-const FileReads = preload("../file_reads.gd")
-const Paths = preload("scene_paths.gd")
-const SceneFile = preload("../scene_file.gd")
+const GdhFileReads = preload("../file_reads.gd")
+const GdhPaths = preload("scene_paths.gd")
+const GdhSceneFile = preload("../scene_file.gd")
 
 
 ## Why a create at [param scene_path] is refused when a file is there already, which saving over
@@ -45,7 +45,7 @@ static func inherited(
 		script = load(script_path) as Script
 		if script == null:
 			return {"ok": false, "error": "No script loads from " + script_path}
-		var uncompiled: String = SceneFile.uncompiled(script, script_path)
+		var uncompiled: String = GdhSceneFile.uncompiled(script, script_path)
 		if not uncompiled.is_empty():
 			return {"ok": false, "error": uncompiled}
 	return inherit(scene_path, base_path, str(args.get("rootNodeName", "")), script)
@@ -59,12 +59,12 @@ static func inherited(
 ## the base: a headless engine making that instance runs every script in the base, and the pack would
 ## keep what they set as this scene's own values.
 static func inherit(scene_path: String, base_path: String, root_name: String, script: Script) -> Dictionary:
-	var base: Dictionary = FileReads.scene_node(base_path, ".")
+	var base: Dictionary = GdhFileReads.scene_node(base_path, ".")
 	if not base.get("ok", false):
 		return {"ok": false, "error": "inherits: " + str(base.get("error", "%s holds no nodes" % base_path))}
 	var root_type: String = str(base["type"])
 	var name: String = str(base["name"]) if root_name.is_empty() else root_name
-	var unfit: String = SceneFile.unfit_name(name)
+	var unfit: String = GdhSceneFile.unfit_name(name)
 	if not unfit.is_empty():
 		return {"ok": false, "error": unfit}
 	if script != null:
@@ -78,7 +78,7 @@ static func inherit(scene_path: String, base_path: String, root_name: String, sc
 					% [script.resource_path, extended, root_type, base_path]
 				)
 			}
-	var folder: String = SceneFile.make_folder_for(scene_path)
+	var folder: String = GdhSceneFile.make_folder_for(scene_path)
 	if not folder.is_empty():
 		return {"ok": false, "error": folder}
 
@@ -87,14 +87,14 @@ static func inherit(scene_path: String, base_path: String, root_name: String, sc
 		"",
 		(
 			'[ext_resource type="PackedScene"%s path="%s" id="1_base"]'
-			% [SceneFile.reference_uid(base_path), base_path]
+			% [GdhSceneFile.reference_uid(base_path), base_path]
 		),
 	]
 	if script != null:
 		var _resourced: bool = lines.append(
 			(
 				'[ext_resource type="Script"%s path="%s" id="2_script"]'
-				% [SceneFile.reference_uid(script.resource_path), script.resource_path]
+				% [GdhSceneFile.reference_uid(script.resource_path), script.resource_path]
 			)
 		)
 	lines.append_array(["", '[node name="%s" instance=ExtResource("1_base")]' % name])
@@ -117,7 +117,7 @@ static func inherit(scene_path: String, base_path: String, root_name: String, sc
 			"error":
 			"%s did not load back as a scene inheriting %s, so it was removed." % [scene_path, base_path]
 		}
-	SceneFile.refresh(scene_path)
+	GdhSceneFile.refresh(scene_path)
 	return {
 		"ok": true,
 		"scenePath": scene_path,
@@ -130,8 +130,8 @@ static func inherit(scene_path: String, base_path: String, root_name: String, sc
 ## Makes the children of [param node], an instance in [param scene], editable or not, answering why
 ## it cannot or "". With them editable the scene keeps its own values for them, as the editor's
 ## Editable Children does; made not editable again, the values it kept for them are dropped. The
-## caller has had [method SceneFile.foreign] refuse a node inside an instance that is not editable.
-static func set_editable(scene: SceneFile, node: Node, editable: bool) -> String:
+## caller has had [method GdhSceneFile.foreign] refuse a node inside an instance that is not editable.
+static func set_editable(scene: GdhSceneFile, node: Node, editable: bool) -> String:
 	if node.owner == null or node.scene_file_path.is_empty():
 		return (
 			"editableChildren is a setting of an instance in this scene, and %s is not one."
@@ -152,7 +152,7 @@ static func set_editable(scene: SceneFile, node: Node, editable: bool) -> String
 ## for a node deleted, they are only named. Answers followed, the scenes rewritten, and
 ## notFollowed, each one left as it was with why, each only when it names any, with what
 ## [param carried] gives.
-static func follow(changed: String, old_path: String, new_path: String, carried: Paths) -> Dictionary:
+static func follow(changed: String, old_path: String, new_path: String, carried: GdhPaths) -> Dictionary:
 	var texts: Dictionary = {}
 	_read_scenes("res://", texts)
 	var kin: Array[String] = [changed]
@@ -176,14 +176,14 @@ static func follow(changed: String, old_path: String, new_path: String, carried:
 		var moves: Dictionary = {}
 		if _inherits(scene_path, changed, texts):
 			moves[old_path] = new_path
-		var read: Dictionary = FileReads.scene_tree(scene_path, -1, false)
+		var read: Dictionary = GdhFileReads.scene_tree(scene_path, -1, false)
 		if not read.get("ok", false):
 			not_followed.append({"scenePath": scene_path, "reason": str(read.get("error", ""))})
 			continue
 		var tree: Dictionary = read["tree"]
 		_instances_of(tree, changed, old_path, new_path, moves)
 		var text: String = texts[scene_path]
-		var unsaved: String = SceneFile.unsaved_in_editor(scene_path)
+		var unsaved: String = GdhSceneFile.unsaved_in_editor(scene_path)
 		var rewritten: String = text
 		if not new_path.is_empty():
 			rewritten = _rewritten(text, moves, old_path.get_base_dir() != new_path.get_base_dir())
@@ -198,7 +198,7 @@ static func follow(changed: String, old_path: String, new_path: String, carried:
 				)
 				continue
 			file.close()
-			SceneFile.refresh(scene_path)
+			GdhSceneFile.refresh(scene_path)
 			followed.append(scene_path)
 		if moves.is_empty() or not text.contains("NodePath("):
 			continue
@@ -335,7 +335,7 @@ static func _attribute_moved(
 	var found: RegExMatch = RegEx.create_from_string(' %s="([^"]*)"' % attribute).search(line)
 	if found == null:
 		return line
-	var moved: String = Paths.moved(found.get_string(1), moves)
+	var moved: String = GdhPaths.moved(found.get_string(1), moves)
 	if moved == found.get_string(1):
 		return line
 	var placed: String = _attribute_set(line, attribute, moved)

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": ""}