refactor: simpify some logging code

Author: d-biehl

packages/core/src/robotcode/core/utils/logging.py

@@ -198,7 +198,7 @@ def log(
         extra: Optional[Mapping[str, object]] = None,
         **kwargs: Any,
     ) -> None:
-        if (self.is_enabled_for(level) and condition is not None and condition()) or condition is None:
+        if self.is_enabled_for(level) and (condition is None or condition()):
             depth = 0
             if context_name is not None:
                 depth = self._measure_contexts.get(context_name, 0)
@@ -238,7 +238,6 @@ def debug(
             **kwargs,
         )
 
-    _log_measure_time = log
     _measure_contexts: Dict[str, int] = {}
 
     @contextmanager
@@ -259,11 +258,12 @@ def measure_time(
 
                 self._measure_contexts[context_name] = depth
 
-            self._log_measure_time(
+            self.log(
                 level,
                 lambda: f"Start {msg() if callable(msg) else msg}",
                 *args,
                 context_name=context_name,
+                stacklevel=3,
                 extra=extra,
                 **kwargs,
             )
@@ -280,11 +280,12 @@ def measure_time(
                 if context_name is not None:
                     self._measure_contexts[context_name] = depth
 
-                self._log_measure_time(
+                self.log(
                     level,
                     lambda: f"End {msg() if callable(msg) else msg} took {duration:.4f} seconds",
                     *args,
                     context_name=context_name,
+                    stacklevel=3,
                     extra=extra,
                     **kwargs,
                 )

packages/language_server/src/robotcode/language_server/common/protocol.py

@@ -98,15 +98,6 @@ def emit(self, record: logging.LogRecord) -> None:
             if self.trace != TraceValues.OFF:
                 self.protocol.log_trace(record.getMessage())
 
-        type = self.MAPPING.get(record.levelno, None)
-        if type is None:
-            type = MessageType.LOG
-
-        self.protocol.window_log_message(
-            type=type,
-            message=record.getMessage(),
-        )
-
 
 class LanguageServerProtocol(JsonRPCProtocol):
     __logger = LoggingDescriptor()

tests/robotcode/language_server/robotframework/parts/data/.vscode/settings.json

@@ -12,15 +12,19 @@
             "justMyCode": false
         }
     },
-    // "robotcode.languageServer.extraArgs": [
-    //     "--verbose",
-    //     "--debugpy",
-    //     //"--debugpy-wait-for-client",
-    //     "--log",
-    //     "--log-level", "DEBUG",
-    // ],
+    "robotcode.languageServer.extraArgs": [
+        "--verbose",
+        "--debugpy",
+        //"--debugpy-wait-for-client",
+        "--log",
+        "--log-level", "DEBUG",
+        // "--log-format", "%(indent)s%(levelname)s:%(name)s:%(filename)s:%(lineno)d: %(message)s"
+    ],
+    // "robotcode.robocop.configFile": "pyproject.toml",
     "robotcode.robocop.enabled": true,
-    "robotcode.robocop.exclude": ["E0303"],
+    "robotcode.robocop.exclude": [
+        "E0303"
+    ],
     "robotcode.analysis.referencesCodeLens": false,
     "robotcode.analysis.diagnosticMode": "openFilesOnly",
     "robotcode.analysis.progressMode": "detailed",
@@ -43,6 +47,6 @@
         }
     },
     "robotcode.debug.attachPython": true,
-    "debugpy.debugJustMyCode": false
+    "debugpy.debugJustMyCode": false,
 
 }