gdharness 1.3.59 → 1.3.61

package/build/godot/operations/reading.gd

@@ -139,7 +139,7 @@ static func from_the_root(said: String, node_path: String, root_name: String) ->
 
 ## [param said], the refusal for a path a scene does not have, with where the path leaves it: the
 ## last node of the path it has, [param reached] from the root, called [param root_name], when that
-## is empty; the name below it that is missing; and [param children], the names that node has, as
+## is empty, the name below it that is missing, and [param children], the names that node has, as
 ## after a node was moved or renamed. Names up to [constant NAMED_CHILDREN] of them.
 static func missing_below(
 	said: String,
@@ -152,17 +152,21 @@ static func missing_below(
 	if children.size() > NAMED_CHILDREN:
 		shown += " and %d more" % (children.size() - NAMED_CHILDREN)
 	return (
-		"%s%s %s has no %s; %s."
+		"%s %s has no %s. %s."
 		% [
-			said,
-			"" if said.ends_with(".") else ".",
+			ended(said),
 			"The root, %s," % root_name if reached.is_empty() else "/".join(reached),
 			missing,
-			"its children are " + shown if not children.is_empty() else "it has no children",
+			"Its children are " + shown if not children.is_empty() else "It has no children",
 		]
 	)
 
 
+## [param said] with a full stop at its end, so another sentence can follow it.
+static func ended(said: String) -> String:
+	return said if said.ends_with(".") else said + "."
+
+
 ## [param said], the refusal for a [param kind] the scene does not have at [param node_path], with
 ## what is there when the scene has a node there, [param found] its class, and [param holders], the
 ## paths of the nodes in the scene that are one, so the caller has the path to pass. Names up to
@@ -180,7 +184,7 @@ static func not_of_kind(
 		return (
 			told
 			+ (
-				" The scene holds no %s; scene_node add with nodeType %s puts one in it."
+				" The scene holds no %s. scene_node add with nodeType %s puts one in it."
 				% [kind, kind]
 			)
 		)
@@ -222,17 +226,17 @@ static func offered(said: String, word: String, names: Array) -> String:
 	var every: PackedStringArray = PackedStringArray(names)
 	var close: PackedStringArray = nearest(word, every)
 	if close.is_empty():
-		return "%s; it has %s" % [said, ", ".join(every)]
+		return "%s It has %s" % [ended(said), ", ".join(every)]
 	return (
-		"%s; the nearest it has %s %s"
-		% [said, "is" if close.size() == 1 else "are", ", ".join(close)]
+		"%s The nearest it has %s %s"
+		% [ended(said), "is" if close.size() == 1 else "are", ", ".join(close)]
 	)
 
 
 ## [param said], the refusal for [param property], which [param target] does not declare, with the
 ## names it declares nearest it when any are, as a misspelt one is usually one of them, or else the
 ## variables its script declares. The engine's own are not listed when none is near, since an object
-## has a hundred, while a script's are the few a caller most likely meant; an object with no script
+## has a hundred, while a script's are the few a caller most likely meant. An object with no script
 ## is told where they are listed instead, since the refusal alone left nothing to try.
 static func near_property(said: String, target: Object, property: String) -> String:
 	var headings: int = PROPERTY_USAGE_CATEGORY | PROPERTY_USAGE_GROUP | PROPERTY_USAGE_SUBGROUP
@@ -243,7 +247,7 @@ static func near_property(said: String, target: Object, property: String) -> Str
 		if usage & PROPERTY_USAGE_ARRAY:
 			var listed: String = _list_called(target, declared, property)
 			if not listed.is_empty():
-				return "%s; %s" % [said, listed]
+				return "%s %s" % [ended(said), listed]
 		if not usage & headings:
 			names.append(str(declared.get("name", "")))
 		if usage & PROPERTY_USAGE_SCRIPT_VARIABLE and not usage & headings:
@@ -251,8 +255,8 @@ static func near_property(said: String, target: Object, property: String) -> Str
 	var close: PackedStringArray = nearest(property, PackedStringArray(names))
 	if not close.is_empty():
 		return (
-			"%s; the nearest it has %s %s"
-			% [said, "is" if close.size() == 1 else "are", ", ".join(close)]
+			"%s The nearest it has %s %s"
+			% [ended(said), "is" if close.size() == 1 else "are", ", ".join(close)]
 		)
 	# With a script that declares nothing readable, as one that does not compile, the name is
 	# likelier the script's than the class's, so the class's list would point the wrong way.
@@ -261,17 +265,17 @@ static func near_property(said: String, target: Object, property: String) -> Str
 	if scripted.is_empty():
 		return (
 			(
-				"%s; editor_classes info with className %s and includeInherited true lists the "
+				"%s editor_classes info with className %s and includeInherited true lists the "
 				+ "ones it has"
 			)
-			% [said, target.get_class()]
+			% [ended(said), target.get_class()]
 		)
 	scripted.sort()
-	return "%s; its script declares %s" % [said, ", ".join(PackedStringArray(scripted))]
+	return "%s Its script declares %s" % [ended(said), ", ".join(PackedStringArray(scripted))]
 
 
 ## How [param target] keeps the list [param property] names, when that is the label of one of the
-## engine's numbered lists, such as an OptionButton's Items; empty when it is not. The engine has no
+## engine's numbered lists, such as an OptionButton's Items. Empty when it is not. The engine has no
 ## property by that name, only a count and each entry's fields under a numbered prefix, so "items"
 ## was refused with nothing near it to offer.
 static func _list_called(target: Object, count: Dictionary, property: String) -> String:
@@ -292,7 +296,7 @@ static func _list_called(target: Object, count: Dictionary, property: String) ->
 	)
 	return (
 		(
-			"it keeps its %s as %s, how many there are, and %s under %s for the first, %s for the "
+			"It keeps its %s as %s, how many there are, and %s under %s for the first, %s for the "
 			+ "second and so on: give %s before the fields of the entries it makes"
 		)
 		% [parts[0].to_lower(), counted, each, first, parts[1] + "1/", counted]

package/build/godot/operations/resource_files.gd

@@ -77,7 +77,7 @@ func _why_none(file_path: String) -> String:
 		return "No .uid file beside it. refresh_uids writes one for every script and shader."
 	if kind in TEXT_RESOURCE_KINDS:
 		return (
-			"Its header carries no uid. The editor writes one when it saves the file; refresh_uids "
+			"Its header carries no uid. The editor writes one when it saves the file. refresh_uids "
 			+ "does not, and a headless save does not either."
 		)
 	if ResourceLoader.exists(file_path):

package/build/godot/operations/script_check.gd

@@ -97,7 +97,7 @@ func check_scripts(params: Dictionary) -> Dictionary:
 ## Raises every warning the project sets to warn so that the engine reports it as an error, which is
 ## the one way it reports a warning outside an editor or a debugger. Not saved. The analyser reads
 ## the levels again only once the settings change has been flushed, at the next frame, so this is
-## called in `_init` and the scripts are loaded after it; the project's autoloads, compiled before
+## called in `_init` and the scripts are loaded after it. The project's autoloads, compiled before
 ## that frame, compile under the project's own levels. A warning set to ignore stays ignored, and
 ## @warning_ignore and the directory rules hold as they do in the editor, since the analyser applies
 ## them itself.
@@ -116,7 +116,7 @@ static func raise_warnings() -> void:
 ## The warnings of each script in [code]paths[/code], under the levels [method raise_warnings] left:
 ## [code]scripts[/code] holds each that has any, with its warnings' lines and the engine's messages
 ## as raised. The analyser runs before anything is compiled, so a script whose dependency failed on
-## a warning still reports its own, and loading on past a failure loses nothing; only what is raised
+## a warning still reports its own, and loading on past a failure loses nothing. Only what is raised
 ## at the script's own path is its, since a dependency is read on its own entry as well.
 func check_warnings(params: Dictionary) -> Dictionary:
 	var asked: Array = params.get("paths", [])

package/build/godot/operations/serialisation.gd

@@ -15,7 +15,7 @@ const GdhShapes = preload("value_shapes.gd")
 const NUMBERS: Array[int] = [TYPE_BOOL, TYPE_INT, TYPE_FLOAT]
 const TEXTS: Array[int] = [TYPE_STRING, TYPE_STRING_NAME, TYPE_NODE_PATH]
 # 2^53. A JSON number is a double, and every whole number below this one in size has a double of
-# its own; from here on two or more share each double, so one arriving tells nobody which was sent.
+# its own. From here on two or more share each double, so one arriving tells nobody which was sent.
 const EXACT: int = 9_007_199_254_740_992
 # The types that cross as a plain JSON list and have to be built back into themselves. A list is
 # what a caller can write by hand and what the serialiser answers with, and the parameter or
@@ -136,7 +136,7 @@ func serialize_value(value: Variant) -> Variant:
 		return value
 	var carried: Variant = call(serialiser, value)
 	# The fixed shapes carry their components as bare floats, so an infinite one in a Vector2 is
-	# tagged here, and a 32-bit one shortened; containers reach their members through this already.
+	# tagged here, and a 32-bit one shortened. Containers reach their members through this already.
 	var type: int = typeof(value)
 	return (
 		carried
@@ -345,7 +345,7 @@ static func comparable(one: Variant, other: Variant) -> bool:
 ##
 ## A list of what is accepted rather than of what is refused, which is the way round that errs
 ## safely. The engine's own conversion table is not readable from GDScript, so either list is a
-## guess at it; guessing narrow costs a caller a refusal naming both types, and guessing wide costs
+## guess at it. Guessing narrow costs a caller a refusal naming both types, and guessing wide costs
 ## them the damage above. A refusal is the cheaper mistake, and it is the one they can act on.
 static func acceptable(value: Variant, type: int) -> bool:
 	if type == TYPE_NIL:
@@ -560,7 +560,7 @@ func _serialize_rid(value: RID) -> Dictionary:
 
 # A whole number from 2^53 on as its digits, because JSON numbers are doubles on the server's side
 # and on the engine's, and from there on neighbouring whole numbers share a double. A RefCounted's
-# instance id is one, with its top bit set, and a resource uid another; read as numbers they came
+# instance id is one, with its top bit set, and a resource uid another. Read as numbers they came
 # back as a neighbouring id, which named nothing or something else.
 func _serialize_int(value: int) -> Variant:
 	if value > -EXACT and value < EXACT:

package/build/godot/tests/listed.gd

@@ -37,7 +37,7 @@ const ORPHANS_LEFT: String = "gdharness orphans:"
 const ORPHANS_NAMED: int = 8
 ## The flags turning off a report, with the gdUnit4 hook that writes it. A gate reads what a run
 ## prints, and each report finds every case it hears of in the session to write them all out as the
-## run ends; project_test reads the JUnit one and turns off only the HTML one.
+## run ends, and project_test reads the JUnit one and turns off only the HTML one.
 const REPORTS_OFF: Dictionary[String, String] = {
 	"--html-report-off": "res://addons/gdUnit4/src/core/hooks/GdUnitHtmlReporterTestSessionHook.gd",
 	"--junit-report-off": "res://addons/gdUnit4/src/core/hooks/GdUnitXMLReporterTestSessionHook.gd",
@@ -72,7 +72,7 @@ const TOOL: String = "GdUnitCmdTool.gd"
 const GDUNIT: String = "--gdh-gdunit"
 ## How long a windowless engine sleeps after each frame. The engine's own default is the
 ## low-processor pause, 6.8 ms measured, which a run of suites awaiting frames spends thousands of
-## times; zero makes a frame's delta round to nothing, and a tween then never moves.
+## times. Zero makes a frame's delta round to nothing, and a tween then never moves.
 const FRAME_SLEEP_USEC: int = 1000
 ## What the engine's shutdown prints as it clears the newest script and the oldest, on an engine
 ## whose walk [GdhShutdownWalk] guards. Kept in step with the server's engine-leaks.ts, which reads
@@ -159,7 +159,7 @@ static func started(given: PackedStringArray) -> GdhRunner:
 				(
 					(
 						"gdharness test: gdUnit4 %s registers no session hook %s, so the report it "
-						+ "writes is not turned off; report it to gdharness with the version."
+						+ "writes is not turned off. Report it to gdharness with the version."
 					)
 					% [GdUnit4Version.current(), path]
 				)
@@ -549,7 +549,25 @@ class GdhRunner:
 			return
 		if Engine.is_embedded_in_editor():
 			return
-		if DisplayServer.window_get_mode() == DisplayServer.WINDOW_MODE_MINIMIZED:
+		var mode: DisplayServer.WindowMode = DisplayServer.window_get_mode()
+		if mode == DisplayServer.WINDOW_MODE_MAXIMIZED and not DisplayServer.window_can_draw():
+			# On macOS Godot reads a window whose frame fills the usable screen as maximised before
+			# asking whether it is minimised, and changing the mode from that reading unzooms it, so
+			# a minimised window that size, as a small screen makes the default one, stayed
+			# minimised. A point off it reads as what it is, and goes back once restored. Godot
+			# divides pixels by the scale into whole points, so a pixel moves nothing on a scaled
+			# screen.
+			var at: Vector2i = DisplayServer.window_get_position()
+			DisplayServer.window_set_position(
+				at + Vector2i(ceili(DisplayServer.screen_get_max_scale()), 0)
+			)
+			mode = DisplayServer.window_get_mode()
+			if mode == DisplayServer.WINDOW_MODE_MINIMIZED:
+				DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
+				minimise_pending = false
+			DisplayServer.window_set_position(at)
+			return
+		if mode == DisplayServer.WINDOW_MODE_MINIMIZED:
 			DisplayServer.window_set_mode(DisplayServer.WINDOW_MODE_WINDOWED)
 			minimise_pending = false
 
@@ -606,7 +624,7 @@ class GdhRunner:
 
 	## [param args] with everything up to the script at [param own] given as gdUnit4's tool name.
 	## The path is compared with its separators and, on Windows, its case folded, since the engine
-	## reports the script as `X:/a/listed.gd` when it was started as `X:\a\listed.gd`.
+	## reports the script as `D:/a/listed.gd` when it was started as `D:\a\listed.gd`.
 	static func options_of(args: PackedStringArray, own: String) -> PackedStringArray:
 		var wanted: String = spelt(own)
 		var at: int = -1
@@ -660,7 +678,7 @@ class GdhIndexedSession:
 		var found: GdUnitTestCase = _by_id.get(str(id), null)
 		return found
 
-	## [param made] as an indexed session of its cases, reporting where it does; one already indexed
+	## [param made] as an indexed session of its cases, reporting where it does. One already indexed
 	## as it is.
 	static func of(made: GdUnitTestSession) -> GdUnitTestSession:
 		if made is GdhIndexedSession:
@@ -706,7 +724,7 @@ class GdhSessionCheck:
 						"gdharness test: gdUnit4 %s handed its session hooks the session before "
 						+ "announcing it, so the runner's indexed session is not the one they "
 						+ "read. This gdUnit4 starts a session differently from the ones gdharness "
-						+ "knows; report it to gdharness with the version."
+						+ "knows. Report it to gdharness with the version."
 					)
 					% GdUnit4Version.current()
 				)
@@ -724,8 +742,8 @@ class GdhSessionCheck:
 					(
 						"gdharness test: gdUnit4 %s ran %d cases without looking one up in the "
 						+ "runner's indexed session, so its console reads another session. This "
-						+ "gdUnit4 starts a session differently from the ones gdharness knows; "
-						+ "report it to gdharness with the version."
+						+ "gdUnit4 starts a session differently from the ones gdharness knows. "
+						+ "Report it to gdharness with the version."
 					)
 					% [GdUnit4Version.current(), _runner.cases_ended]
 				)
@@ -773,7 +791,7 @@ class GdhShutdownWalk:
 
 	## Every script loaded from a file under res://, and [param also], held until the theme database
 	## goes, which is after the walk and before the GDScript language does. Freed in the walk, a
-	## script can take the next one with it and end the walk; held, none is freed there, so the walk
+	## script can take the next one with it and end the walk. Held, none is freed there, so the walk
 	## reaches every script and what the engine reports at exit is only what was leaked. A script a
 	## run leaks is held by what leaked it as well, and is still reported.
 	static func hold(also: Array[GDScript]) -> void: