Wrap error messages; account for GDScriptAnalyzer by forcing class_name

Author: Razoric480

course/lesson-7-member-variables/draw_rectangle_at_position/TestsDrawingRectangles.gd

@@ -28,4 +28,3 @@ func test_rectangle_size_is_200_by_120() -> String:
 	if points != expected_rect:
 		return tr("The drawn shapes don't have the expected length and height. Did you forget to use the length and height parameter?")
 	return ""
-

script_checking/OfflineScriptVerifier.gd

@@ -29,8 +29,9 @@ func test() -> void:
 		if wrap.has_errors():
 			errors = []
 			for i in wrap.get_error_count():
-				var error_line: int = wrap.get_error_line(i) - 1
-				var line_text := _new_script_text.split("\n")[error_line]
+				var lines := _new_script_text.split("\n")
+				var error_line: int = clampi(wrap.get_error_line(i) - 1, 0, lines.size()-1)
+				var line_text := lines[error_line]
 				var error_data := make_error_from_data(
 					1,
 					wrap.get_error(i),

ui/UIPractice.gd

@@ -20,12 +20,12 @@ const PracticeDonePopup := preload("components/popups/PracticeDonePopup.gd")
 const PracticeLeaveUnfinishedPopup := preload("components/popups/PracticeLeaveUnfinishedPopup.gd")
 const documentation_resource: Documentation = preload("res://course/Documentation.tres")
 
-var REGEX_DIVSION_BY_ZERO := RegEx.new()
+static var REGEX_DIVSION_BY_ZERO := RegEx.create_from_string((r"[/%] *0"))
+static var REGEX_CLASS_NAME := RegEx.create_from_string(r"\s*class_name\s")
 
 @export var lesson_test_practice: String
 @export_range(0, 1, 1, "or_greater") var test_practice: int
 @export var _layout_container: Control
-@export var _output_container: Control
 @export var _game_container: Container
 @export var _game_view: GameView
 @export var _output_console: OutputConsole
@@ -331,15 +331,30 @@ func _validate_and_run_student_code() -> void:
 		_code_editor.unlock_editor()
 		return
 
-	var verifier := OfflineScriptVerifier.new(script_text)
+	var verifier_script := script_text
+	var script_is_desynced_by_one_line := false
+	
+	if not _has_class_name(verifier_script):
+		# required by GDScriptAnalyzer, since otherwise it has no external parser to cache
+		verifier_script = "class_name TEMP_UserScript\n" + verifier_script
+		script_is_desynced_by_one_line = true
+	
+	var verifier := OfflineScriptVerifier.new(verifier_script)
 	verifier.test()
 	var errors := verifier.errors
 
 	if not errors.is_empty():
+		if script_is_desynced_by_one_line:
+			for error: ScriptError in errors:
+				error.error_range.start.line -= 1
+				error.error_range.end.line -= 1
 		_code_editor.slice_editor.errors = errors
 
 		for index in errors.size():
 			var error: ScriptError = errors[index]
+			# GDScriptAnalyzer benign issue; script didn't exist until now
+			if error.message == 'Error while getting cache for script "".':
+				continue
 			MessageBus.print_script_error(error, script_file_name)
 
 		var is_missing_parser_error: bool = (
@@ -399,7 +414,7 @@ func _validate_and_run_student_code() -> void:
 	if script_is_valid != OK:
 		var error := ScriptError.new()
 		error.message = tr(
-			"Oh no! The script has an error, but the Script Verifier did not catch it",
+			"Oh no! The script has an error (code %s), but the Script Verifier did not catch it" % script_is_valid,
 		)
 		error.severity = 1
 		error.code = GDQuestCodes.ErrorCode.INVALID_NO_CATCH
@@ -690,6 +705,10 @@ func _on_init_set_javascript() -> void:
 		GDQUEST.events.onError.connect(_on_js_error_feedback_ref)
 
 
+func _has_class_name(source: String) -> bool:
+	return REGEX_CLASS_NAME.search(source) != null
+
+
 # Checks if the script text has mixed tabs and spaces in indentation.
 # Returns the line number of the error or -1 if there's no error
 func _check_for_mixed_indentation(text: String) -> int:

ui/components/OutputConsoleErrorMessage.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://ukja5lpk5jw5"]
 
 [ext_resource type="Script" uid="uid://vmi2orvhk0yw" path="res://ui/components/OutputConsoleErrorMessage.gd" id="2"]
-[ext_resource type="StyleBox" path="res://ui/theme/panel_error_log.tres" id="4"]
+[ext_resource type="StyleBox" uid="uid://d0pcjb7n8kfxq" path="res://ui/theme/panel_error_log.tres" id="4"]
 
 [node name="OutputConsoleErrorMessage" type="PanelContainer" unique_id=1485937269 node_paths=PackedStringArray("_severity_label", "_message_label", "_location_row", "_file_name_label", "_location_label", "_external_label", "_message_explain_button")]
 self_modulate = Color(1, 1, 1, 0.25)
@@ -37,10 +37,12 @@ theme_override_colors/font_color = Color(0.572549, 0.560784, 0.721569, 1)
 text = "INFO"
 
 [node name="MessageValue" type="Label" parent="Layout/Content/MessageRow" unique_id=389845082]
+custom_minimum_size = Vector2(0, 20)
 layout_mode = 2
 size_flags_horizontal = 3
 size_flags_vertical = 0
 theme_override_colors/font_color = Color(0.572549, 0.560784, 0.721569, 1)
+autowrap_mode = 3
 
 [node name="LocationRow" type="HBoxContainer" parent="Layout/Content" unique_id=129616357]
 layout_mode = 2

ui/components/OutputConsolePrintMessage.tscn

@@ -1,7 +1,7 @@
 [gd_scene format=3 uid="uid://cdrh84x70t6mh"]
 
 [ext_resource type="Script" uid="uid://duuccx1urqa0r" path="res://ui/components/OutputConsolePrintMessage.gd" id="2"]
-[ext_resource type="StyleBox" path="res://ui/theme/panel_error_log.tres" id="3"]
+[ext_resource type="StyleBox" uid="uid://d0pcjb7n8kfxq" path="res://ui/theme/panel_error_log.tres" id="3"]
 
 [node name="OutputConsolePrintMessage" type="PanelContainer" unique_id=502726398 node_paths=PackedStringArray("_label")]
 anchors_preset = 15
@@ -12,6 +12,8 @@ script = ExtResource("2")
 _label = NodePath("Label")
 
 [node name="Label" type="Label" parent="." unique_id=807380464]
+custom_minimum_size = Vector2(0, 20)
 layout_mode = 2
 size_flags_vertical = 0
 text = "Value"
+autowrap_mode = 3