diff options
-rw-r--r-- | fnl/config/lsp/null-ls.fnl | 32 | ||||
-rw-r--r-- | fnl/config/lsp/settings/jsonls.fnl | 4 |
2 files changed, 18 insertions, 18 deletions
diff --git a/fnl/config/lsp/null-ls.fnl b/fnl/config/lsp/null-ls.fnl index 0f9e459..d1f1af1 100644 --- a/fnl/config/lsp/null-ls.fnl +++ b/fnl/config/lsp/null-ls.fnl @@ -4,26 +4,26 @@ (let [null-ls (util.load-plugin :null-ls)] (let [formatting null_ls.builtins.formatting - diagnostics null_ls.builtins.diagnostics]) + diagnostics null_ls.builtins.diagnostics] (null-ls.setup {:debug false :sources [ - (diagnostics.flake8) - (diagnostics.golangci_lint) - (diagnostics.jsonlint) - (diagnostics.shellcheck) - (diagnostics.yamllint) + diagnostics.flake8 + diagnostics.golangci_lint + diagnostics.jsonlint + diagnostics.shellcheck + diagnostics.yamllint (formatting.black.with { extra_args [ "--fast" ] }) - (formatting.erlfmt) - (formatting.fourmolu) - (formatting.gofmt) - (formatting.goimports) - (formatting.nixfmt) + formatting.erlfmt + formatting.fourmolu + formatting.gofmt + formatting.goimports + formatting.nixfmt (formatting.prettier.with { extra_args [ "--no-semi" "--single-quote" "--jsx-single-quote" ] }) - (formatting.rustfmt) - (formatting.shfmt) - (formatting.sqlformat) - (formatting.stylua) - (formatting.terraform_fmt)]})) + formatting.rustfmt + formatting.shfmt + formatting.sqlformat + formatting.stylua + formatting.terraform_fmt]}))) diff --git a/fnl/config/lsp/settings/jsonls.fnl b/fnl/config/lsp/settings/jsonls.fnl index 37c4597..c1cb710 100644 --- a/fnl/config/lsp/settings/jsonls.fnl +++ b/fnl/config/lsp/settings/jsonls.fnl @@ -11,6 +11,6 @@ :schemas (schemastore.json.schemas)}} :setup { :commands { - :Format { + :Format [ (fn [] - (vim.lsp.buf.range_formatting [] [ 0 0 ] [ (vim.fn.line "$" 0) ]))}}}})) + (vim.lsp.buf.range_formatting [] [ 0 0 ] [ (vim.fn.line "$" 0) ]))]}}})) |