fix: fix debug command output

Author: ShrBox

src/legacy/main/BuiltinCommands.cpp

@@ -5,8 +5,8 @@
 #include "ll/api/command/CommandHandle.h"
 #include "ll/api/command/CommandRegistrar.h"
 #include "ll/api/io/Logger.h"
-#include "ll/api/service/Bedrock.h"
 #include "lse/Entry.h"
+#include "lse/api/DirectFormatter.h"
 #include "mc/server/commands/CommandOutput.h"
 #include "mc/server/commands/CommandPermissionLevel.h"
 
@@ -16,8 +16,10 @@
 #include "PythonHelper.h"
 #endif
 
-extern bool          isInConsoleDebugMode;
-extern ScriptEngine* debugEngine;
+extern bool                     isInConsoleDebugMode;
+extern ScriptEngine*            debugEngine;
+std::shared_ptr<ll::io::Logger> debugLogger = ll::io::LoggerRegistry::getInstance().getOrCreate("LSEDEBUG");
+inline void                     printConsoleSymbol() { debugLogger->info("> "); }
 
 bool ProcessDebugEngine(const std::string& cmd) {
 #ifdef LEGACY_SCRIPT_ENGINE_BACKEND_PYTHON
@@ -26,7 +28,7 @@ bool ProcessDebugEngine(const std::string& cmd) {
 #endif
     if (isInConsoleDebugMode) {
         EngineScope enter(debugEngine);
-        auto& logger = lse::LegacyScriptEngine::getInstance().getSelf().getLogger();
+        auto&       logger = lse::LegacyScriptEngine::getInstance().getSelf().getLogger();
         try {
             if (cmd == "stop" || cmd == LLSE_DEBUG_CMD) {
                 return true;
@@ -35,11 +37,11 @@ bool ProcessDebugEngine(const std::string& cmd) {
                 std::ostringstream sout;
                 PrintValue(sout, result);
                 logger.info(sout.str());
-                std::cout << "> " << std::flush;
+                printConsoleSymbol();
             }
-        } catch (Exception& e) {
-            ll::error_utils::printException(e, logger);
-            std::cout << "> " << std::flush;
+        } catch (...) {
+            ll::error_utils::printCurrentException(logger);
+            printConsoleSymbol();
         }
         return false;
     }
@@ -51,6 +53,7 @@ struct EngineDebugCommand {
 };
 
 void RegisterDebugCommand() {
+    debugLogger->setFormatter(ll::makePolymorphic<lse::io::DirectFormatter>());
     auto& command = ll::command::CommandRegistrar::getInstance()
                         .getOrCreateCommand(LLSE_DEBUG_CMD, "Debug LegacyScriptEngine", CommandPermissionLevel::Owner);
     command.overload<EngineDebugCommand>().optional("eval").execute(
@@ -63,8 +66,8 @@ void RegisterDebugCommand() {
                     std::ostringstream sout;
                     PrintValue(sout, result);
                     output.success(sout.str());
-                } catch (Exception& e) {
-                    ll::error_utils::printException(e, logger);
+                } catch (...) {
+                    ll::error_utils::printCurrentException(logger);
                 }
             } else {
                 if (isInConsoleDebugMode) {
@@ -75,7 +78,7 @@ void RegisterDebugCommand() {
                     // StartDebug
                     logger.info("Debug mode begins");
                     isInConsoleDebugMode = true;
-                    std::cout << "> " << std::flush;
+                    printConsoleSymbol();
                 }
             }
         }

src/lse/api/DirectFormatter.cpp

@@ -0,0 +1,7 @@
+#include "lse/api/DirectFormatter.h"
+
+namespace lse::io {
+void DirectFormatter::format(const ll::io::LogMessageView& view, std::string& buffer) const noexcept {
+    buffer = view.msg;
+}
+} // namespace lse::io

src/lse/api/DirectFormatter.h

@@ -0,0 +1,13 @@
+#include "ll/api/io/Formatter.h"
+
+namespace lse::io {
+using namespace ll::io;
+class DirectFormatter : public Formatter {
+public:
+    DirectFormatter()                   = default;
+    virtual ~DirectFormatter() override = default;
+
+    void format(LogMessageView const& view, std::string& buffer) const noexcept override;
+};
+
+} // namespace lse::io