diff --git a/src/fennel-ls/config.fnl b/src/fennel-ls/config.fnl index eb3b23a..362169b 100644 --- a/src/fennel-ls/config.fnl +++ b/src/fennel-ls/config.fnl @@ -17,7 +17,12 @@ There are no global settings. They're all stored in the `server` object. (local default-configuration {: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") :lints {:unused-definition (option true) :unknown-module-field (option true) diff --git a/src/fennel-ls/message.fnl b/src/fennel-ls/message.fnl index 3519a21..0c2008f 100644 --- a/src/fennel-ls/message.fnl +++ b/src/fennel-ls/message.fnl @@ -95,12 +95,12 @@ LSP json objects." (let [params-count (length signature.parameters) {:label last} (. signature.parameters params-count)] {:signatures [signature] - :activeSignature 0 ; we only ever have one signature - :activeParameter (if (and (>= active-parameter params-count) - (= last "...")) - (- params-count 1) - (>= active-parameter 0) - active-parameter)})) + :activeSignature 0 ; we only ever have one signature + :activeParameter (if (and (>= active-parameter params-count) + (= last "...")) + (- params-count 1) + (>= active-parameter 0) + active-parameter)})) (λ multisym->range [server file ast n] (let [spl (utils.multi-sym-split ast)