less hacky stdout mess

Author: matheusfillipe

gdrepl/gdserverv4.gd

@@ -112,27 +112,14 @@ class Session:
       local_scope_lock = false
       for line in lines.slice(0, len(lines)-1):
         var has_keyword = check_scope(line, i)
-        var line_stripped = line.strip_edges()
 
-        # Replace print statements from previous executions with pass to avoid repeated output
-        # while keeping control structure bodies valid
-        var is_print_call = line_stripped.begins_with("print(") or line_stripped.begins_with("printerr(")
-
-        # Inject stdout marker at the last scope index
         if i == last_index:
           var identation = " ".repeat(len(line.rstrip(" ")) - len(line.rstrip(" ").lstrip(" ")))
           _local += "  " + identation + "print(\"" + STDOUT_MARKER_START + "\")" + "\n"
 
-        if is_print_call and i < last_index:
-          # Replace with pass to avoid repeated output from previous executions
-          var indentation = " ".repeat(len(line) - len(line.lstrip(" \t")))
-          _local += "  " + indentation + "pass\n"
-        else:
-          _local += "  " + line + "\n"
-
+        _local += "  " + line + "\n"
         i += 1
 
-    # Inject stdout marker before the last line
     if i == last_index:
       _local += "  " + "print(\"" + STDOUT_MARKER_START + "\")" + "\n"
 

gdrepl/main.py

@@ -88,9 +88,15 @@ def wait_for_output(server, timeout):
     try:
         server.expect(STDOUT_MARKER_END, timeout=timeout)
         output = server.before.decode()
-        # Remove any stdout markers from the output
+
+        # Only show output after the last marker (new execution scope)
+        last_marker_pos = output.rfind(STDOUT_MARKER_START)
+        if last_marker_pos != -1:
+            output = output[last_marker_pos + len(STDOUT_MARKER_START) :]
+
         output = output.replace(STDOUT_MARKER_START, "")
         output = output.replace(STDOUT_MARKER_END, "")
+
         # Filter out void return errors (these are handled by retry logic)
         lines = output.split("\n")
         filtered_lines = []

tests/test_e2e.py

@@ -281,6 +281,33 @@ def test_multiple_prints_in_loop(self, repl):
         # (the 'before' buffer should only contain "-> 99" and not "0", "1", "2", "and")
         assert repl.before.count("and") == 0, "Loop output should not repeat"
 
+    def test_various_output_functions(self, repl):
+        """Test that various GDScript output functions work (not just print)."""
+        # Test printerr - should show output
+        repl.sendline("printerr('error message')")
+        repl.expect("error message", timeout=10)
+        repl.expect(">>>", timeout=10)
+
+        # Test push_warning - should show output
+        repl.sendline("push_warning('warning message')")
+        repl.expect(">>>", timeout=10)
+
+        # Test push_error - should show output
+        repl.sendline("push_error('error test')")
+        repl.expect(">>>", timeout=10)
+
+        # Test that print_rich works (if available in Godot 4)
+        repl.sendline("print_rich('[color=red]colored text[/color]')")
+        repl.expect(">>>", timeout=10)
+
+        # Now test that these don't repeat when we add new code
+        repl.sendline("42")
+        repl.expect(r"-> 42", timeout=10)
+        repl.expect(">>>", timeout=10)
+
+        # The old messages should not repeat
+        assert repl.before.count("error message") == 0, "printerr output should not repeat"
+
 
 @pytest.mark.slow
 class TestREPLPersistence: