fey.naomi/fennel-ls
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only set default completion kind when it's not already present!

Browse Source
This commit is contained in:
Phil Hagelberg 2025-02-26 01:12:02 -08:00
parent 415c6e95c9
commit d7b88efe69
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/fennel-ls/handlers.fnl
View File

@ -113,14 +113,22 @@ Every time the client sends a message, it gets handled by a function in the corr
:range (message.ast->range server file symbol)}
(catch _ nil))))
(λ make-completion-item [server file name scope]
(case (analyzer.search-name-and-scope server file name scope)
def (formatter.completion-item-format name def)
_ {:label name}))
;; All of the helper functions for textDocument/completion are here until I
;; finish refactoring them, and then they can find a home in analyzer.fnl
(λ collect-scope [scope typ callback ?target]
(λ collect-scope [scope typ server file ?target ?default-kind]
(let [result (or ?target [])]
(var scope scope)
(while scope
(icollect [i v (pairs (. scope typ)) &into result]
(callback i v))
(icollect [name (pairs (. scope typ)) &into result]
(let [item (make-completion-item server file name scope)]
(when (= nil item.kind)
(set item.kind ?default-kind))
item))
(set scope scope.parent))
result))
@ -131,11 +139,6 @@ Every time the client sends a message, it gets handled by a function in the corr
:Snippet 15 :Color 16 :File 17 :Reference 18 :Folder 19 :EnumMember 20
:Constant 21 :Struct 22 :Event 23 :Operator 24 :TypeParameter 25})
(λ make-completion-item [server file name scope]
(case (analyzer.search-name-and-scope server file name scope)
def (formatter.completion-item-format name def)
_ {:label name}))
(λ scope-completion [server file _byte ?symbol parents]
(let [scope (or (accumulate [result nil
_ parent (ipairs parents)
@ -146,11 +149,11 @@ Every time the client sends a message, it gets handled by a function in the corr
result []
in-call-position? (and (fennel.list? ?parent)
(= ?symbol (. ?parent 1)))]
(collect-scope scope :manglings #(doto (make-completion-item server file $ scope) (tset :kind kinds.Variable)) result)
(collect-scope scope :manglings server file result kinds.Variable)
(when in-call-position?
(collect-scope scope :macros #(doto (make-completion-item server file $ scope) (tset :kind kinds.Keyword)) result)
(collect-scope scope :specials #(doto (make-completion-item server file $ scope) (tset :kind kinds.Operator)) result))
(collect-scope scope :macros server file result kinds.Keyword)
(collect-scope scope :specials server file result kinds.Operator))
(icollect [_ k (ipairs file.allowed-globals) &into result]
(make-completion-item server file k scope))))

10
test/completion.fnl
View File

@ -72,8 +72,10 @@
(fn test-global []
(check "(" [{:label :setmetatable :kind kinds.Function}] [])
(check "(" [:_G :debug :table :io :getmetatable :setmetatable :_VERSION :ipairs :pairs :next] [:this-is-not-a-global])
(check "#nil\n(" [:_G :debug :table :io :getmetatable :setmetatable :_VERSION :ipairs :pairs :next] [])
(check "(" [:_G :debug :table :io :getmetatable :setmetatable :_VERSION
:ipairs :pairs :next] [:this-is-not-a-global])
(check "#nil\n(" [:_G :debug :table :io :getmetatable :setmetatable
:_VERSION :ipairs :pairs :next] [])
(check "(if ge" [:getmetatable] [])
nil)
@ -174,8 +176,8 @@
(fn test-docs []
(check "(fn xyzzy [x y z] \"docstring\" nil)\n(xyzz"
[{:label :xyzzy :kind kinds.Variable :documentation true}] ;; TODO shouldn't this be kinds.Function
[])
[{:label :xyzzy :kind kinds.Function :documentation true}]
[])
;; things that aren't present in lua5.4 but are in other versions, I guess??
(local things-that-are-allowed-to-have-missing-docs