Skip to content

v0.0.9 #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Dec 7, 2024
Merged

v0.0.9 #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b5e19d
Handle when `handle-message` errors rather than crashing
CFiggers Aug 13, 2024
117c803
Custom `janet/tellJoke` method
CFiggers Aug 13, 2024
2d2e6ac
Formatting tweaks (`spork/fmt`)
CFiggers Dec 7, 2024
00cbd80
Version bump
CFiggers Dec 7, 2024
4752833
Move `uri-percent-encoding-peg` to `test/test-main.janet`
CFiggers Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 49 additions & 41 deletions src/main.janet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@

(use judge)

(def version "0.0.7")
(def version "0.0.9")
(def commit
(with [proc (os/spawn ["git" "rev-parse" "--short" "HEAD"] :xp {:out :pipe})]
(let [[out] (ev/gather
(ev/read (proc :out) :all)
(os/proc-wait proc))]
(if out (string/trimr out) ""))))
(let [[out] (ev/gather
(ev/read (proc :out) :all)
(os/proc-wait proc))]
(if out (string/trimr out) ""))))

(def jpm-defs (require "../libs/jpm-defs"))

Expand All @@ -34,10 +34,10 @@
[diagnostics env]
(eval/eval-buffer content
(path/relpath
(os/cwd)
(if (string/has-prefix? "file:" uri)
(string/slice uri 5) uri)))]
(os/cwd)
(if (string/has-prefix? "file:" uri)
(string/slice uri 5) uri)))]

(logging/info (string/format "`eval-buffer` returned: %m" diagnostics) [:evaluation])

(each res diagnostics
Expand Down Expand Up @@ -77,9 +77,6 @@
:semi :equals :question :at :lbracket
:rbracket '1)))})

(test (peg/match uri-percent-encoding-peg "file:///c%3A/Users/pete/Desktop/code/libmpsse")
@["file:///c:/Users/pete/Desktop/code/libmpsse"])

(defn on-document-change
``
Handler for the ["textDocument/didChange"](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#textDocument_didChange) event.
Expand All @@ -89,7 +86,7 @@
[state params]
(let [content (get-in params ["contentChanges" 0 "text"])
uri (first (peg/match uri-percent-encoding-peg
(get-in params ["textDocument" "uri"])))]
(get-in params ["textDocument" "uri"])))]
(put-in state [:documents uri :content] content)

(if (dyn :push-diagnostics)
Expand All @@ -104,7 +101,7 @@

(defn on-document-diagnostic [state params]
(let [uri (first (peg/match uri-percent-encoding-peg
(get-in params ["textDocument" "uri"])))
(get-in params ["textDocument" "uri"])))
content (get-in state [:documents uri :content])
[diagnostics env] (run-diagnostics uri content)
message {:kind "full"
Expand All @@ -115,7 +112,7 @@

(defn on-document-formatting [state params]
(let [uri (first (peg/match uri-percent-encoding-peg
(get-in params ["textDocument" "uri"])))
(get-in params ["textDocument" "uri"])))
content (get-in state [:documents uri :content])
new-content (freeze (fmt/format (string/slice content)))]
(logging/info (string/format "old content: %m" content) [:formatting] 2)
Expand All @@ -125,7 +122,7 @@
(do
(logging/info "No changes" [:formatting])
[:ok state :json/null])
(do
(do
(put-in state [:documents uri] @{:content new-content})
(let [message [{:range {:start {:line 0 :character 0}
:end {:line 1000000 :character 1000000}}
Expand All @@ -136,7 +133,7 @@
(defn on-document-open [state params]
(let [content (get-in params ["textDocument" "text"])
uri (first (peg/match uri-percent-encoding-peg
(get-in params ["textDocument" "uri"])))
(get-in params ["textDocument" "uri"])))
[diagnostics env] (run-diagnostics uri content)]
(put-in state [:documents uri] @{:content content
:eval-env env})
Expand Down Expand Up @@ -171,9 +168,9 @@

(defn on-completion [state params]
(let [uri (first (peg/match uri-percent-encoding-peg
(get-in params ["textDocument" "uri"])))
(get-in params ["textDocument" "uri"])))
eval-env (get-in state [:documents uri :eval-env])
bindings (seq [bind :in (all-bindings eval-env)]
bindings (seq [bind :in (all-bindings eval-env)]
(binding-to-lsp-item bind eval-env))
message {:isIncomplete true
:items bindings}]
Expand All @@ -185,24 +182,24 @@
(def lbl (get params "label"))
(def envs (seq [docu :in (state :documents)]
(docu :eval-env)))

(each env envs
(when (env (symbol lbl))
(set eval-env env)
(break)))

(let [message {:label lbl
:documentation
{:kind "markdown"
:value (doc/my-doc*
(symbol lbl)
(or eval-env (make-env root-env)))}}]
(symbol lbl)
(or eval-env (make-env root-env)))}}]
(logging/message message [:completion] 1)
[:ok state message]))

(defn on-document-hover [state params]
(let [uri (first (peg/match uri-percent-encoding-peg
(get-in params ["textDocument" "uri"])))
(get-in params ["textDocument" "uri"])))
content (get-in state [:documents uri :content])
eval-env (get-in state [:documents uri :eval-env])
{"line" line "character" character} (get params "position")
Expand All @@ -224,17 +221,17 @@
(logging/info (string "on-signature-help params: ") [:signature])
(logging/info (string/format "%q" params) [:signature])
(let [uri (first (peg/match uri-percent-encoding-peg
(get-in params ["textDocument" "uri"])))
(get-in params ["textDocument" "uri"])))
content (get-in state [:documents uri :content])
eval-env (get-in state [:documents uri :eval-env])
{"line" line "character" character} (get params "position")
{:source sexp-text :range [start end]} (lookup/sexp-at {:line line :character character} content)
function-symbol (or (first (peg/match '(* "(" (any :s) (<- (to " "))) sexp-text)) "none")
signature (or (doc/get-signature (symbol function-symbol) eval-env) "not found")]
(case signature
"not found"
"not found"
(do (logging/info "No signature found" [:signature]) [:ok state :json/null])
(let [message {:signatures [{:label signature}]}]
(let [message {:signatures [{:label signature}]}]
(logging/message message [:signature])
[:ok state message]))))

Expand Down Expand Up @@ -292,7 +289,7 @@
[state params]
(let [message {:server-info {:name "janet-lsp"
:version version
:commit commit}}]
:commit commit}}]
(logging/message message [:info] 1)
[:ok state message]))

Expand All @@ -302,7 +299,7 @@
``
[state params]
(let [request-uri (first (peg/match uri-percent-encoding-peg
(get-in params ["textDocument" "uri"])))
(get-in params ["textDocument" "uri"])))
content (get-in state [:documents request-uri :content])
eval-env (get-in state [:documents request-uri :eval-env])
{"line" line "character" character} (get params "position")
Expand All @@ -318,7 +315,7 @@
end is: %d
-------------------------
``
request-uri (length content) line character define-word start end) [:definition] 2)
request-uri (length content) line character define-word start end) [:definition] 2)
(logging/info (string/format "symbol is: %s" (symbol define-word)) [:definition] 2)
(logging/info (string/format "eval-env is: %m" eval-env) [:definition] 3)
(logging/info (string/format "symbol lookup is: %m" (get eval-env (symbol define-word) nil)) [:definition] 2)
Expand All @@ -330,12 +327,12 @@
message {:uri filepath
:range {:start {:line (max 0 (dec line)) :character col}
:end {:line (max 0 (dec line)) :character col}}}]
(do
(logging/message message [:definition])
[:ok state message])
(do
(logging/info "Couldn't find definition" [:definition])
[:ok state :json/null]))))
(do
(logging/message message [:definition])
[:ok state message])
(do
(logging/info "Couldn't find definition" [:definition])
[:ok state :json/null]))))

(defn on-set-trace [state params]
(logging/info (string/format "on-set-trace: %m" params) [:settrace] 2)
Expand All @@ -345,6 +342,13 @@
"verbose" nil)
[:noresponse state])

(defn on-janet-tell-joke [state params]
# (eprint "What's brown and sticky? A stick!")
(let [message {:question "What's brown and sticky?"
:answer "A stick!"}]
(logging/message message [:joke])
[:ok state message]))

(defn handle-message [message state]
(let [id (get message "id")
method (get message "method")
Expand All @@ -365,10 +369,11 @@
# "textDocument/documentSymbol" (on-document-symbols state params) TODO: Implement this? See src/lsp/api.ts:121
"textDocument/definition" (on-document-definition state params)
"janet/serverInfo" (on-janet-serverinfo state params)
"janet/tellJoke" (on-janet-tell-joke state params)
"shutdown" (on-shutdown state params)
"exit" (on-exit state params)
"$/setTrace" (on-set-trace state params)
(do
(do
(logging/info (string/format "Received unrecognized RPC: %m" method) [:handle] 1)
[:noresponse state]))))

Expand All @@ -395,14 +400,17 @@
(logging/info (string/format "current state is: %m" state) [:priority] 3)
(let [message (read-message)]
(logging/info (string/format "got: %q" message) [:core] 3)
(match (handle-message message state)
(match (try (handle-message message state) ([err fib] [:error state err fib]))
[:ok new-state & response] (do
(write-response stdout (rpc/success-response (get message "id") ;response))
(logging/info "successful rpc" [:core] (get message "id"))
(message-loop :state new-state))
[:noresponse new-state] (message-loop :state new-state)

[:error new-state err] (printf "unhandled error response: %m" err)
[:error new-state err fib] (do
(logging/err (string/format "%m" err) [:core])
(debug/stacktrace fib err "")
(message-loop :state new-state))
[:exit] (do (file/flush stdout) (ev/sleep 0.1) (os/exit 0)))))

(defn find-all-module-files [path &opt search-jpm-tree explicit results]
Expand Down Expand Up @@ -472,8 +480,8 @@
(when (or (has-value? parsed-args "--version")
(has-value? parsed-args "-v"))
(print "Janet LSP v" version "-" commit)
(os/exit 0))
(os/exit 0))

(cmd/run
(cmd/fn
"A Language Server (LSP) for the Janet Programming Language."
Expand Down
3 changes: 3 additions & 0 deletions test/test-main.janet
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
(test (main/parse-content-length "123:456:789") 456)
(test (main/parse-content-length "0123:456::::789") 456))

(test (peg/match uri-percent-encoding-peg "file:///c%3A/Users/pete/Desktop/code/libmpsse")
@["file:///c:/Users/pete/Desktop/code/libmpsse"])

(deftest "test binding-to-lsp-item"
(def eval-env (table/proto-flatten (make-env root-env)))

Expand Down