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

Don't drop multisym delimiters at the end of a symbol

Browse Source 
added a test for completions
This commit is contained in:
Michele Campeotto 2025-10-14 16:54:52 +02:00 committed by XeroOl
parent 2b79a0955f
commit 1061db98d0
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/fennel-ls/utils.fnl
View File

@ -165,9 +165,13 @@ These functions are all pure functions, which makes me happy."
(let [offset (or ?offset (length symbol)) (let [offset (or ?offset (length symbol))
next-separator (or (symbol:find ".[.:]" offset) next-separator (or (symbol:find ".[.:]" offset)
(length symbol)) (length symbol))
symbol (symbol:sub 1 next-separator)] symbol (symbol:sub 1 next-separator)
(icollect [word (: (.. symbol ".") :gmatch "(.-)[.:]")] parts (icollect [word (symbol:gmatch "[^.:]+")]
word)))) word)]
(if (symbol:match "[.:]+$")
(tset parts (length parts)
(.. (. parts (length parts)) (symbol:match "[.:]+$"))))
parts)))
(fn multi-sym-base [symbol] (fn multi-sym-base [symbol]
(local symbol (tostring symbol)) (local symbol (tostring symbol))

12
test/completion.fnl
View File

@ -282,6 +282,15 @@
; [:os]) ; [:os])
nil) nil)
;; ensure that we get completions for both the symbol and the table fields
(fn test-sym-ending-in-delimiter []
(check "(local a {:b 1 :c 2})
(local a. 3)
(set a.|"
["a." "a.b" "a.c"]
[])
nil)
;; ;; Future tests / features ;; ;; Future tests / features
;; ;; Scope Ordering Rules ;; ;; Scope Ordering Rules
;; (it "does not suggest locals past the suggestion location when a symbol is partially typed") ;; (it "does not suggest locals past the suggestion location when a symbol is partially typed")
@ -308,4 +317,5 @@
: test-module : test-module
: test-destructure : test-destructure
: test-no-completion : test-no-completion
: test-compiler-env} : test-compiler-env
: test-sym-ending-in-delimiter}

10
test/misc.fnl
View File

@ -14,6 +14,11 @@
(faith.= ["is" "equal"] (utils.multi-sym-split "is.equal" 5)) (faith.= ["is" "equal"] (utils.multi-sym-split "is.equal" 5))
(faith.= ["a" "b" "c" "d" "e" "f"] (utils.multi-sym-split "a.b.c.d.e.f")) (faith.= ["a" "b" "c" "d" "e" "f"] (utils.multi-sym-split "a.b.c.d.e.f"))
(faith.= ["obj" "bar"] (utils.multi-sym-split (fennel.sym "obj.bar"))) (faith.= ["obj" "bar"] (utils.multi-sym-split (fennel.sym "obj.bar")))
(faith.= ["a."] (utils.multi-sym-split (fennel.sym "a.")))
(faith.= [".."] (utils.multi-sym-split (fennel.sym "..")))
(faith.= ["?."] (utils.multi-sym-split (fennel.sym "?.")))
(faith.= ["b:"] (utils.multi-sym-split (fennel.sym "b:")))
(faith.= ["b" "a."] (utils.multi-sym-split (fennel.sym "b:a.")))
nil) nil)
(fn test-find-symbol [] (fn test-find-symbol []
@ -34,6 +39,11 @@
"[[1 2 sym-one] (match [1 2 4] [1 2 sym-one] sym-one) [(match [1 2 4] [1 2 sym-one] sym-one)]]" "[[1 2 sym-one] (match [1 2 4] [1 2 sym-one] sym-one) [(match [1 2 4] [1 2 sym-one] sym-one)]]"
(fennel.view parents {:one-line? true}) (fennel.view parents {:one-line? true})
"bad parents")) "bad parents"))
(let [{: server : uri} (create-client "(local a. 1) (print a.)")
file (. server.files uri)
[symbol _parents] [(analyzer.find-symbol server file 21)]]
(faith.= symbol (fennel.sym "a.")))
nil) nil)
(fn test-failure [] (fn test-failure []