Initialises log channel

Author: gnikit

CHANGELOG.md

@@ -16,6 +16,7 @@
 
 - Update constant parameters for `omp_lib` and `omp_lib_kinds` Interface v5.0
 - Format json files with `prettier`
+- Initialises the log channel and adds `$/setTrace` to override client's (i.e. VS Code) loglevel
 
 ### Fixes
 

fortls/constants.py

@@ -1,7 +1,10 @@
 import sys
+import logging
 
 PY3K = sys.version_info >= (3, 0)
 
+log = logging.getLogger(__name__)
+
 # Global variables
 sort_keywords = True
 

fortls/helper_functions.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-import logging
 import os
 from pathlib import Path
 
-from fortls.constants import KEYWORD_ID_DICT, KEYWORD_LIST, sort_keywords
+from fortls.constants import KEYWORD_ID_DICT, KEYWORD_LIST, log, sort_keywords
 from fortls.regex_patterns import (
     DQ_STRING_REGEX,
     FIXED_COMMENT_LINE_MATCH,
@@ -18,8 +17,6 @@
     WORD_REGEX,
 )
 
-log = logging.getLogger(__name__)
-
 
 def expand_name(line: str, char_poss: int) -> str:
     """Get full word containing given cursor position

fortls/jsonrpc.py

@@ -1,5 +1,4 @@
 import json
-import logging
 
 try:
     import Queue
@@ -16,7 +15,7 @@
     from urllib2 import quote
     from urlparse import unquote
 
-log = logging.getLogger(__name__)
+from fortls.constants import log
 
 
 def path_from_uri(uri: str) -> str:

fortls/langserver.py

@@ -11,6 +11,7 @@
 from typing import Pattern
 
 # Local modules
+from fortls._version import __version__
 from fortls.constants import (
     CLASS_TYPE_ID,
     FORTRAN_LITERAL,
@@ -21,6 +22,7 @@
     SELECT_TYPE_ID,
     SUBROUTINE_TYPE_ID,
     VAR_TYPE_ID,
+    log,
 )
 from fortls.helper_functions import (
     expand_name,
@@ -55,7 +57,6 @@
     src_file_exts,
 )
 
-log = logging.getLogger(__name__)
 # Global regexes
 # TODO: I think this can be replaced by fortls.regex_patterns type & class
 TYPE_DEF_REGEX = re.compile(r"[ ]*(TYPE|CLASS)[ ]*\([a-z0-9_ ]*$", re.I)
@@ -179,6 +180,7 @@ def noop(request):
             "workspace/didChangeWatchedFiles": noop,
             "workspace/symbol": self.serve_workspace_symbol,
             "$/cancelRequest": noop,
+            "$/setTrace": noop,
             "shutdown": noop,
             "exit": self.serve_exit,
         }.get(request["method"], self.serve_default)
@@ -190,7 +192,7 @@ def noop(request):
             try:
                 handler(request)
             except:
-                log.warning("error handling notification %s", request, exc_info=True)
+                log.exception("error handling request: %s", request, exc_info=True)
             return
         #
         try:
@@ -220,6 +222,11 @@ def serve_initialize(self, request):
             params.get("rootUri") or params.get("rootPath") or ""
         )
         self.source_dirs.add(self.root_path)
+        logging.basicConfig(
+            format="[%(levelname)-.4s - %(asctime)s] %(message)s",
+            datefmt="%H:%M:%S",
+            level=logging.INFO,
+        )
         self.__config_logger(request)
         init_debug_log = self.__load_config_file()
         if init_debug_log:
@@ -229,6 +236,7 @@ def serve_initialize(self, request):
 
         # Initialize workspace
         self.workspace_init()
+        log.info(f"fortls - Fortran Language Server v{__version__} Initialized")
         #
         server_capabilities = {
             "completionProvider": {
@@ -251,7 +259,7 @@ def serve_initialize(self, request):
         if self.enable_code_actions:
             server_capabilities["codeActionProvider"] = True
         if self.notify_init:
-            self.post_messages.append([3, "FORTLS initialization complete"])
+            self.post_messages.append([3, "fortls initialization complete"])
         return {"capabilities": server_capabilities}
 
     def serve_workspace_symbol(self, request):

fortls/parse_fortran.py

@@ -1,4 +1,4 @@
-from __future__ import print_function, annotations
+from __future__ import annotations, print_function
 
 import hashlib
 import logging
@@ -12,6 +12,7 @@
     PY3K,
     SELECT_TYPE_ID,
     SUBMODULE_TYPE_ID,
+    log,
 )
 from fortls.helper_functions import (
     detect_fixed_format,
@@ -25,6 +26,16 @@
     strip_strings,
 )
 from fortls.objects import (
+    CLASS_info,
+    FUN_info,
+    GEN_info,
+    INT_info,
+    SELECT_info,
+    SMOD_info,
+    SUB_info,
+    USE_info,
+    VAR_info,
+    VIS_info,
     fortran_associate,
     fortran_ast,
     fortran_block,
@@ -43,16 +54,6 @@
     fortran_type,
     fortran_var,
     fortran_where,
-    VAR_info,
-    SUB_info,
-    FUN_info,
-    SELECT_info,
-    CLASS_info,
-    USE_info,
-    GEN_info,
-    SMOD_info,
-    INT_info,
-    VIS_info,
 )
 from fortls.regex_patterns import (
     ASSOCIATE_REGEX,
@@ -131,8 +132,6 @@
 if not PY3K:
     import io
 
-log = logging.getLogger(__name__)
-
 
 def get_line_context(line: str) -> tuple[str, None]:
     """Get context of ending position in line (for completion)