Merge pull request #479 from Jafaral/ulsp-crash-res

Fix crash in ulsp, additional logging and cleanup
uniconproject · Sep 18, 2024 · 776266e · 776266e
2 parents 0105ad9 + f77285b
commit 776266e
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 25 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -15,6 +15,7 @@
       "**/*.so": true,
       "**/*.o": true,
       "**/*.u": true,
+      "**/*.exe": true,
       "**/*.tmp": true,
       "config.status": true,
       "**/uniclass.*": true,

diff --git a/Makedefs.in b/Makedefs.in
@@ -68,7 +68,7 @@ OSREL=@unicon_osrel@
 SHELL = /bin/sh
 RTT=../../bin/urtt
 RM = rm -f
-CP = cp
+CP = cp -f
 AR = ar
 MAKEINFO = makeinfo
 TEXI2DVI = texi2dvi

diff --git a/Makedefs.uni.in b/Makedefs.uni.in
@@ -24,7 +24,7 @@ BIN=$(BASE)/bin
 RM=rm -f
 RMDIR=rm -rf
 MKDIR=mkdir
-CP=cp
+CP=cp -f
 TOUCH=touch
 ARC=zip
 ARCEXT=zip

diff --git a/uni/ulsp/launch-lsp.icn b/uni/ulsp/launch-lsp.icn
@@ -57,7 +57,7 @@ procedure main(args)
    # If validate_args() fails, it will display usage() and never return.
    opts := validate_args(args)
 
-   Logger(opts["-loglevel"] | 7, opts["-logfile"] | &null) #  # default to informational, stdout
+   Logger((opts["-loglevel"]), opts["-logfile"]) #  # default to informational, stdout
 
    if \opts["-debug-class"] then
       Logger.add_debug_class(opts["-debug-class"])
@@ -74,7 +74,6 @@ procedure main(args)
    # Set mode for server to run in, based on opts.
    member(opts, mode := "c") | (mode := "s")
 
-
    ulsp_server := Server(sock, mode)
    ulsp_server.run()
 end
diff --git a/uni/ulsp/server.icn b/uni/ulsp/server.icn
@@ -40,8 +40,8 @@ class Logger(
    # private
    method _log(loglvl, msgs)
       local msg
-      clock := &date || " " || &clock
       if loglvl <= current_log_level then {
+         clock := &date || " " || &clock
          msg := ""; every msg ||:=!msgs
          self._log_to_file(msg, loglvl)
          self._log_std(msg, loglvl)
@@ -60,9 +60,10 @@ class Logger(
       #    }
       # }
 
-      clock := &date || " " || &clock
-      if loglvl <= current_log_level |
-         (loglvl >= 8 & member(debug_class_set, filter))  then {
+      if current_log_level < 8 then fail
+
+      if loglvl <= current_log_level | member(debug_class_set, filter)  then {
+         clock := &date || " " || &clock
          msg := ""; every msg ||:=!msgs
          self._log_to_file(msg, loglvl, filter)
          self._log_std(msg, loglvl, filter)
@@ -285,7 +286,7 @@ class Logger(
       enable_timestamp := "file"
       enable_loginfo := "all"
       debug_class_set := set("")
-      current_log_level := \init_log_level | 5
+      current_log_level := \init_log_level | 7
       log_destinations := []
       if \log_file_path then
          if f := open(log_file_path, "a") then
@@ -317,11 +318,13 @@ class Server(
             request_params := jsontable["params"]
             request_id := jsontable["id"]
 
-            write("-----------------------------------------")
-            write(request_method)
-            write("-----------------------------------------")
+            Logger.debug2_class("lsp:jrpc:request", "-----------------------------------------")
+            Logger.debug2_class("lsp:jrpc:request", request_method)
+            Logger.debug2_class("lsp:jrpc:request", "-----------------------------------------")
+            Logger.debug5_class("lsp:jrpc:request:", image(request_body) )
 
             case request_method of {
+               # requests
                "initialize" : initialize(request_id)
                "textDocument/didOpen" : didOpen(request_params)
                "textDocument/didClose" : didClose(request_params)
@@ -330,8 +333,15 @@ class Server(
                "textDocument/signatureHelp" : signatureHelp(request_id, request_params)
                "textDocument/hover" : hoverHelp(request_id, request_params)
                "textDocument/definition" : definitionHelp(request_id, request_params)
+
+               # notifications
+               "initialized" : Logger.debug2_class("lsp:jrpc:notification:", image(request_body))
+
+               # utils?
                "$/cancelRequest" : cancelRequest(request_id)
-               default: { write("Don't know what to do with: ", request_method) }
+               default: {
+                  Logger.debug1_class("lsp:jrpc", "Unsupported request: ", image(request_method), ">>", image(request_body))
+                  }
             }
          }
       }
@@ -379,6 +389,7 @@ class Server(
 
    method build_response(id, results)
       local responseBody, responseHeader
+      /results := "{}"
       responseBody := "{\"jsonrpc\":\"2.0\",\"id\":"||id||",\"result\":"||results||"}"
       responseHeader := "Content-Length:" || *responseBody || "\r\n\r\n"
       return responseHeader || responseBody
@@ -404,18 +415,20 @@ class Server(
    method initialize(request_id)
       local capabilitiesTable, result
 
-      capabilitiesTable := ["capabilities": [
-         "completionProvider": [
-            "triggerCharacters": [".", ":"]
-         ];
-         "textDocumentSync": 1;
-         "signatureHelpProvider": [
-            "contextSupport": "__true__";
-            "triggerCharacters": ["("]
-         ];
-         "hoverProvider": "__true__";
-         "definitionProvider": "__true__"
-      ]]
+      capabilitiesTable := [
+         "capabilities": [
+            "completionProvider": [
+               "triggerCharacters": [".", ":"]
+            ];
+            "textDocumentSync": 1;
+            "signatureHelpProvider": [
+               "contextSupport": "__true__";
+               "triggerCharacters": ["("]
+            ];
+            "hoverProvider": "__true__";
+            "definitionProvider": "__true__"
+         ]
+      ]
 
       result := build_response(request_id, tojson(capabilitiesTable))
       write(result)