From 98fbbafef78057c818fb02b15c27e38ad2f5b5bc Mon Sep 17 00:00:00 2001
From: Vaxry <43317083+vaxerski@users.noreply.github.com>
Date: Tue, 28 Apr 2026 15:56:07 +0100
Subject: config/errors: Report and categorize errors properly for actions
 (#14192)

Makes all errors categorized, some not displayed, some displayed.
All errors can be obtained after hl.dispatch()
---
 src/config/lua/ConfigManager.cpp | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'src/config/lua/ConfigManager.cpp')

diff --git a/src/config/lua/ConfigManager.cpp b/src/config/lua/ConfigManager.cpp
index fad187db..7819ff2e 100644
--- a/src/config/lua/ConfigManager.cpp
+++ b/src/config/lua/ConfigManager.cpp
@@ -631,11 +631,20 @@ void CConfigManager::addError(std::string&& str) {
     Notification::overlay()->addNotification(std::format("Runtime error in lua:\n{}", std::move(str)), 0, 5000, ICON_WARNING);
 }
 
+void CConfigManager::addEvalIssue(const Config::SConfigError& err) {
+    if (!m_isEvaluating)
+        return;
+
+    if (err.level == eConfigErrorLevel::WARNING || err.level == eConfigErrorLevel::INFO)
+        m_evalIssues.emplace_back(err);
+}
+
 std::optional<std::string> CConfigManager::eval(const std::string& code) {
     if (!m_lua)
-        return "lua state not initialized";
+        return "error: lua state not initialized";
 
     m_errors.clear();
+    m_evalIssues.clear();
     m_isEvaluating = true;
 
     Hyprutils::Utils::CScopeGuard x([this] { m_isEvaluating = false; });
@@ -643,30 +652,37 @@ std::optional<std::string> CConfigManager::eval(const std::string& code) {
     if (luaL_loadstring(m_lua, code.c_str()) != LUA_OK) {
         std::string err = lua_tostring(m_lua, -1);
         lua_pop(m_lua, 1);
-        return err;
+        return std::format("error: {}", err);
     }
 
     if (guardedPCall(0, 0, 0, LUA_TIMEOUT_EVAL_MS, "hyprctl eval") != LUA_OK) {
         std::string err = lua_tostring(m_lua, -1);
         lua_pop(m_lua, 1);
-        return err;
+        return std::format("error: {}", err);
     }
 
-    if (!m_errors.empty()) {
+    if (!m_errors.empty() || !m_evalIssues.empty()) {
         std::string out;
         out.reserve(256);
 
         for (size_t i = 0; i < m_errors.size(); ++i) {
+            out += "error: ";
             out += m_errors.at(i);
             out += "\n";
         }
 
+        for (const auto& issue : m_evalIssues) {
+            out += std::format("{}: {}", Config::toString(issue.level), issue.message);
+            out += "\n";
+        }
+
         out.pop_back();
 
         return out;
     }
 
     m_errors.clear();
+    m_evalIssues.clear();
 
     return std::nullopt;
 }
-- 
cgit v1.2.3