Merge pull request #134 from Genio-The-Haiku-IDE/feature/lsp-separte-…

…log-config
Genio-The-Haiku-IDE · Oct 31, 2023 · c2f4adb · c2f4adb
2 parents 9986a73 + 16f3cf2
commit c2f4adb
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 10 deletions.
diff --git a/src/GenioApp.cpp b/src/GenioApp.cpp
@@ -12,7 +12,7 @@
 #include <StringList.h>
 
 #include <getopt.h>
-
+#include "LSPLogLevels.h"
 #include "ConfigManager.h"
 #include "GenioNamespace.h"
 
@@ -303,6 +303,20 @@ GenioApp::PrepareConfig(ConfigManager& cfg)
 	cfg.AddConfig("Editor/Find", "find_whole_word", B_TRANSLATE("Whole word"), false);
 	cfg.AddConfig("Editor/Find", "find_match_case", B_TRANSLATE("Match case"), false);
 
+
+	GMessage lsplevels = {{ {"mode", "options"},
+							{"note", B_TRANSLATE("This setting will be updated on restart")}
+						 }};
+
+	lsplevels["option_1"]["value"] = (int32)lsp_log_level::LSP_LOG_LEVEL_ERROR;
+	lsplevels["option_1"]["label"] = "Error";
+	lsplevels["option_2"]["value"] = (int32)lsp_log_level::LSP_LOG_LEVEL_INFO;
+	lsplevels["option_2"]["label"] = "Info";
+	lsplevels["option_3"]["value"] = (int32)lsp_log_level::LSP_LOG_LEVEL_TRACE;
+	lsplevels["option_3"]["label"] = "Trace";
+
+	cfg.AddConfig("LSP", "lsp_log_level", B_TRANSLATE("Log level:"), (int32)lsp_log_level::LSP_LOG_LEVEL_ERROR, &lsplevels);
+
 	cfg.AddConfig("Hidden", "ui_bounds", "", BRect(40, 40, 839, 639));
 }
 

diff --git a/src/config/ConfigWindow.cpp b/src/config/ConfigWindow.cpp
@@ -17,6 +17,7 @@
 #include <ScrollView.h>
 #include <TextControl.h>
 #include <Window.h>
+#include <StringView.h>
 
 #include "ConfigManager.h"
 
@@ -278,6 +279,8 @@ ConfigWindow::MakeViewFor(const char* groupName, GMessage& list)
 			return nullptr;
 
 		settingLayout->AddView(parameterView);
+		if (msg.Has("note"))
+			settingLayout->AddView(MakeNoteView(msg));
 	}
 
 	settingLayout->AddItem(BSpaceLayoutItem::CreateHorizontalStrut(10));
@@ -286,7 +289,14 @@ ConfigWindow::MakeViewFor(const char* groupName, GMessage& list)
 	return view;
 }
 
-
+BView*
+ConfigWindow::MakeNoteView(GMessage& config)
+{
+	BString name((const char*)config["key"]);
+	name << "_note";
+	BStringView* view = new BStringView(name.String(), config["note"]);
+	return view;
+}
 
 BView*
 ConfigWindow::MakeControlFor(GMessage& config)

diff --git a/src/config/ConfigWindow.h b/src/config/ConfigWindow.h
@@ -22,6 +22,7 @@ class ConfigWindow : public BWindow {
 
 		BView* MakeViewFor(const char* groupName, GMessage& config);
 		BView* MakeControlFor(GMessage& config);
+		BView* MakeNoteView(GMessage& config);
 
 private:
 

diff --git a/src/lsp-client/LSPLogLevels.h b/src/lsp-client/LSPLogLevels.h
@@ -0,0 +1,11 @@
+/*
+ * Copyright 2023, Andrea Anzani <andrea.anzani@gmail.com>
+ * All rights reserved. Distributed under the terms of the MIT license.
+ */
+#pragma once
+
+enum lsp_log_level {
+	LSP_LOG_LEVEL_ERROR		= 0,
+	LSP_LOG_LEVEL_INFO		= 1,
+	LSP_LOG_LEVEL_TRACE		= 2
+};
diff --git a/src/lsp-client/LSPProjectWrapper.cpp b/src/lsp-client/LSPProjectWrapper.cpp
@@ -10,7 +10,8 @@
 #include "LSPReaderThread.h"
 #include "LSPTextDocument.h"
 #include "protocol.h"
-
+#include "LSPLogLevels.h"
+#include "ConfigManager.h"
 #include <Url.h>
 
 
@@ -57,17 +58,14 @@ LSPProjectWrapper::_Create()
 	fLSPPipeClient = new LSPPipeClient(*((MessageHandler*) this));
 	/** configuration for clangd */
 	std::string logLevel("--log=");
-	switch (Logger::Level()) {
-		case LOG_LEVEL_UNSET:
-		case LOG_LEVEL_OFF:
-		case LOG_LEVEL_ERROR:
+	switch ((int32)gCFG["lsp_log_level"]) {
+		case LSP_LOG_LEVEL_ERROR:
 			logLevel += "error"; // Error messages only
 			break;
-		case LOG_LEVEL_INFO:
+		case LSP_LOG_LEVEL_INFO:
 			logLevel += "info"; // High level execution tracing
 			break;
-		case LOG_LEVEL_DEBUG:
-		case LOG_LEVEL_TRACE:
+		case LSP_LOG_LEVEL_TRACE:
 			logLevel += "verbose"; // Low level details
 			break;
 	};