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

Put .fnlm on the macro path.

Browse Source
This commit is contained in:
Phil Hagelberg 2025-04-02 08:58:16 -07:00
parent f3d5984091
commit b7984ca51b
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/fennel-ls/config.fnl
View File

@ -17,7 +17,12 @@ There are no global settings. They're all stored in the `server` object.
(local default-configuration (local default-configuration
{:fennel-path (option "./?.fnl;./?/init.fnl;src/?.fnl;src/?/init.fnl") {:fennel-path (option "./?.fnl;./?/init.fnl;src/?.fnl;src/?/init.fnl")
:macro-path (option "./?.fnl;./?/init-macros.fnl;./?/init.fnl;src/?.fnl;src/?/init-macros.fnl;src/?/init.fnl") :macro-path (option (table.concat ["./?.fnlm" "./?/init.fnlm"
"./?.fnl" "./?/init-macros.fnl"
"./?/init.fnl"
"src/?.fnlm" "src/?/init.fnlm"
"src/?.fnl" "src/?/init-macros.fnl"
"src/?/init.fnl"] ";"))
:lua-version (option "lua54") :lua-version (option "lua54")
:lints {:unused-definition (option true) :lints {:unused-definition (option true)
:unknown-module-field (option true) :unknown-module-field (option true)

12
src/fennel-ls/message.fnl
View File

@ -95,12 +95,12 @@ LSP json objects."
(let [params-count (length signature.parameters) (let [params-count (length signature.parameters)
{:label last} (. signature.parameters params-count)] {:label last} (. signature.parameters params-count)]
{:signatures [signature] {:signatures [signature]
:activeSignature 0 ; we only ever have one signature :activeSignature 0 ; we only ever have one signature
:activeParameter (if (and (>= active-parameter params-count) :activeParameter (if (and (>= active-parameter params-count)
(= last "...")) (= last "..."))
(- params-count 1) (- params-count 1)
(>= active-parameter 0) (>= active-parameter 0)
active-parameter)})) active-parameter)}))
(λ multisym->range [server file ast n] (λ multisym->range [server file ast n]
(let [spl (utils.multi-sym-split ast) (let [spl (utils.multi-sym-split ast)