Merge pull request #26 from clojure-lsp/improve-traces

Improve traces for cancelled requests

Author: mainej

src/lsp4clj/server.clj

@@ -265,15 +265,14 @@
           (async/>!! output-ch (internal-error-response resp req))))))
   (receive-notification [this context {:keys [method params] :as notif}]
     (let [now (.instant clock)]
+      (some-> trace-ch (async/put! (trace/received-notification notif now)))
       (if (= method "$/cancelRequest")
         (if-let [result-promise (get @pending-received-requests* (:id params))]
           (p/cancel! result-promise)
           (some-> trace-ch (async/put! (trace/received-unmatched-cancellation-notification notif now))))
-        (do
-          (some-> trace-ch (async/put! (trace/received-notification notif now)))
-          (let [result (receive-notification method context params)]
-            (when (identical? ::method-not-found result)
-              (protocols.endpoint/log this :warn "received unexpected notification" method))))))))
+        (let [result (receive-notification method context params)]
+          (when (identical? ::method-not-found result)
+            (protocols.endpoint/log this :warn "received unexpected notification" method)))))))
 
 (defn chan-server
   [{:keys [output-ch input-ch log-ch trace? trace-ch clock on-close]

src/lsp4clj/trace.clj

@@ -59,7 +59,7 @@
                 (format-body "Body" resp)))
 
 (defn received-unmatched-cancellation-notification [notif at]
-  (format-trace at "Received" "cancellation notification" "for unmatched request:"
+  (format-trace at "Received" "cancellation notification" (format "for unmatched request (%s):" (:id (:params notif)))
                 (format-params notif)))
 
 (defn sending-notification [notif at] (format-notification "Sending" notif at))

test/lsp4clj/server_test.clj

@@ -387,7 +387,8 @@
         trace-ch (:trace-ch server)]
     (server/start server nil)
     (async/put! input-ch (lsp.requests/notification "$/cancelRequest" {:id 1}))
-    (is (= (trace-log ["[Trace - 2022-03-05T13:35:23Z] Received cancellation notification for unmatched request:"
+    (h/assert-take trace-ch) ;; trace of Received notification '$/cancelRequest'
+    (is (= (trace-log ["[Trace - 2022-03-05T13:35:23Z] Received cancellation notification for unmatched request (1):"
                        "Params: {"
                        "  \"id\" : 1"
                        "}"])