Automatic collapse when too many messages are printed

Author: Johnny-the-happy-coder

core/error/error_macros.cpp

@@ -40,14 +40,6 @@
 #include "scene/main/node.h"
 #endif
 
-int repetitions_last_line = -1;
-const char *repetitions_last_function = NULL;
-// No need to initialize: by constructon, can never be checked if line/function don't match.
-char repetitions_last_message[256];
-int repetitions_last_message_count = 0;
-const int MAX_LOG_MESSAGE_REPETITIONS = 6;
-const char *REPETITIONS_WARNING_MESSAGE = "Last message repeated 6 times...";
-
 static ErrorHandlerList *error_handler_list = nullptr;
 
 void add_error_handler(ErrorHandlerList *p_handler) {
@@ -106,25 +98,6 @@ void _err_print_error(const char *p_function, const char *p_file, int p_line, co
 	}
 
 	_global_lock();
-
-	if (repetitions_last_line == p_line && repetitions_last_function == p_function && ::strcmp(p_message, repetitions_last_message) == 0) {
-		if (repetitions_last_message_count == MAX_LOG_MESSAGE_REPETITIONS) {
-			p_message = REPETITIONS_WARNING_MESSAGE;
-			repetitions_last_message_count += 1; // avoid rollover errors
-		} else if (repetitions_last_message_count < MAX_LOG_MESSAGE_REPETITIONS) {
-			repetitions_last_message_count += 1;
-		} else {
-			_global_unlock();
-			return;
-		}
-	} else {
-		repetitions_last_message_count = 0;
-		repetitions_last_line = p_line;
-		repetitions_last_function = p_function;
-		// The message memory lifetime may end after this call.
-		::strncpy(repetitions_last_message, p_message, sizeof(repetitions_last_message));
-	}
-
 	ErrorHandlerList *l = error_handler_list;
 	while (l) {
 		l->errfunc(l->userdata, p_function, p_file, p_line, p_error, p_message, p_editor_notify, p_type);

editor/editor_log.cpp

@@ -42,6 +42,8 @@
 #include "scene/gui/separator.h"
 #include "scene/resources/font.h"
 
+#define MAX_MESSAGES_BEFORE_COLLAPSE 10
+
 void EditorLog::_error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, bool p_editor_notify, ErrorHandlerType p_type) {
 	EditorLog *self = static_cast<EditorLog *>(p_self);
 
@@ -230,6 +232,14 @@ void EditorLog::_process_message(const String &p_msg, MessageType p_type, bool p
 		LogMessage &previous = messages.write[messages.size() - 1];
 		previous.count++;
 
+		if (!collapse && previous.count == MAX_MESSAGES_BEFORE_COLLAPSE) {
+			if (!Thread::is_main_thread()) {
+				MessageQueue::get_main_singleton()->push_callable(callable_mp(this, &EditorLog::_set_collapse), true);
+			} else {
+				_set_collapse(true);
+			}
+		}
+
 		_add_log_line(previous, collapse);
 	} else {
 		// Different message to the previous one received.