mirror of
https://github.com/stevenproctor/dotfiles.git
synced 2026-11-22 15:08:25 -06:00
nvim: update lsp and treesitter configs
This commit is contained in:
1 parent
f2dbbdf779
commit
c328151670
6 files changed
+207
-146
No files matched your search
@@ -37,13 +37,62 @@ local function _11_()
|
||||
end
|
||||
client_command_lnmappings = {clojure_lsp = {ai = {"add-import-to-namespace", {_1_}}, am = {"add-missing-libspec", {}}, as = {"add-require-suggestion", {_2_, _3_, _4_}}, cc = {"cycle-coll", {}}, cn = {"clean-ns", {}}, cp = {"cycle-privacy", {}}, ct = {"create-test", {}}, df = {"drag-forward", {}}, db = {"drag-backward", {}}, dk = {"destructure-keys", {}}, ed = {"extract-to-def", {_5_}}, ref = {"extract-function", {_6_}}, el = {"expand-let", {}}, fe = {"create-function", {}}, il = {"introduce-let", {_7_}}, is = {"inline-symbol", {}}, ma = {"resolve-macro-as", {}}, mf = {"move-form", {_8_}}, ml = {"move-to-let", {_9_}}, pf = {"promote-fn", {_10_}}, sc = {"change-collection", {_11_, "input('Collection type: ')"}}, sm = {"sort-map", {}}, tf = {"thread-first-all", {}}, tF = {"thread-first", {}}, tl = {"thread-last-all", {}}, tL = {"thread-last", {}}, ua = {"unwind-all", {}}, uw = {"unwind-thread", {}}}}
|
||||
local vim = _G.vim
|
||||
local lsps = {"clojure_lsp", "lua_ls", "jsonls", "yamlls", "marksman", "html", "basedpyright", "ts_ls", "terraformls", "dockerls", "docker_compose_language_service", "bashls", "taplo", "sqlls"}
|
||||
local filetype__3eformatters = {lua = {"stylua"}, sh = {"shfmt"}, python = {"ruff_organize_imports", "ruff_format"}, rust = {"rustfmt"}, toml = {"taplo"}, clojure = {"cljfmt"}, json = {"prettierd"}, javascript = {"prettierd"}, typescript = {"prettierd"}, jsx = {"prettierd"}, html = {"prettierd"}, css = {"prettierd"}, yaml = {"prettierd"}, markdown = {"prettierd"}, fennel = {"fnlfmt"}, sql = {"sqlfmt"}, gleam = {"gleam"}, ["*"] = {"trim_whitespace", "trim_newlines"}}
|
||||
local lsps = {"clojure_lsp", "lua_ls", "jsonls", "yamlls", "marksman", "html", "terraformls", "dockerls", "docker_compose_language_service", "bashls", "sqlls"}
|
||||
local filetype__3eformatters = {lua = {"stylua"}, sh = {"shfmt"}, python = {"ruff_organize_imports", "ruff_format"}, rust = {"rustfmt"}, toml = {"taplo"}, json = {"prettierd"}, javascript = {"prettierd"}, typescript = {"prettierd"}, jsx = {"prettierd"}, html = {"prettierd"}, css = {"prettierd"}, yaml = {"prettierd"}, markdown = {"prettierd"}, fennel = {"fnlfmt"}, sql = {"sqlfmt"}, gleam = {"gleam"}, _ = {lsp_format = "prefer"}, ["*"] = {"trim_whitespace", "trim_newlines"}}
|
||||
local formatter__3epackage = {ruff_organize_imports = "ruff", ruff_format = "ruff"}
|
||||
local disable_formatter_on_save = {fennel = true, sql = true}
|
||||
local disable_formatter_auto_install = {cljfmt = true, fnlfmt = true, rustfmt = true, trim_whitespace = true, trim_newlines = true, gleam = true}
|
||||
vim.lsp.enable({"clojure", "fennel-ls", "typedclojure"})
|
||||
local function _12_()
|
||||
local function _12_(_, opts)
|
||||
local conform = require("conform")
|
||||
local registry = require("mason-registry")
|
||||
local formatters_for_mason = {}
|
||||
conform.formatters.shfmt = {prepend_args = {"-i", "2", "-ci"}}
|
||||
local function _13_()
|
||||
for _ft, formatters in pairs(filetype__3eformatters) do
|
||||
for _idx, formatter in ipairs(formatters) do
|
||||
if not disable_formatter_auto_install[formatter] then
|
||||
formatters_for_mason[(formatter__3epackage[formatter] or formatter)] = true
|
||||
else
|
||||
end
|
||||
end
|
||||
end
|
||||
for formatter, _true in pairs(formatters_for_mason) do
|
||||
local pkg = registry.get_package(formatter)
|
||||
if not pkg:is_installed() then
|
||||
vim.notify(("Automatically installing " .. formatter .. " with Mason."))
|
||||
pkg:install()
|
||||
else
|
||||
end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
vim.schedule(_13_)
|
||||
vim.g.dotfiles_format_on_save = true
|
||||
conform.setup(opts)
|
||||
vim.o.formatexpr = "v:lua.require'conform'.formatexpr()"
|
||||
return nil
|
||||
end
|
||||
local function _16_()
|
||||
if (nil == vim.b.dotfiles_format_on_save) then
|
||||
vim.b.dotfiles_format_on_save = false
|
||||
else
|
||||
vim.b.dotfiles_format_on_save = not vim.b.dotfiles_format_on_save
|
||||
end
|
||||
return vim.notify(("Set vim.b.dotfiles_format_on_save to " .. tostring(vim.b.dotfiles_format_on_save)))
|
||||
end
|
||||
local function _18_()
|
||||
vim.g.dotfiles_format_on_save = not vim.g.dotfiles_format_on_save
|
||||
return vim.notify(("Set vim.g.dotfiles_format_on_save to " .. tostring(vim.g.dotfiles_format_on_save)))
|
||||
end
|
||||
local function _19_(_buf)
|
||||
if (vim.g.dotfiles_format_on_save and ((nil == vim.b.dotfiles_format_on_save) or vim.b.dotfiles_format_on_save) and not disable_formatter_on_save[vim.bo.filetype]) then
|
||||
return {timeout_ms = 500, lsp_format = "fallback"}
|
||||
else
|
||||
return nil
|
||||
end
|
||||
end
|
||||
local function _21_()
|
||||
local caps = require("cmp_nvim_lsp").default_capabilities()
|
||||
local mlsp = require("mason-lspconfig")
|
||||
local a = require("nfnl.core")
|
||||
@@ -86,24 +135,24 @@ local function _12_()
|
||||
local lsp_cmd = a.first(command_mapping)
|
||||
local mapping = ("<leader>" .. lnmapping)
|
||||
local cmd
|
||||
local function _14_()
|
||||
local function _23_()
|
||||
local opts
|
||||
do
|
||||
local s = ""
|
||||
for _i, opt in ipairs(a.second(command_mapping)) do
|
||||
local _15_
|
||||
local _24_
|
||||
if ("function" == type(opt)) then
|
||||
_15_ = opt()
|
||||
_24_ = opt()
|
||||
else
|
||||
_15_ = opt
|
||||
_24_ = opt
|
||||
end
|
||||
s = (s .. _15_)
|
||||
s = (s .. _24_)
|
||||
end
|
||||
opts = s
|
||||
end
|
||||
return lsp_execute_command(client, lsp_cmd, opts)
|
||||
end
|
||||
cmd = _14_
|
||||
cmd = _23_
|
||||
nbufmap(mapping, cmd, {desc = ("LSP command `" .. lsp_cmd .. "`")})
|
||||
end
|
||||
return nil
|
||||
@@ -119,29 +168,35 @@ local function _12_()
|
||||
vim.api.nvim_set_hl(0, hlgroup, a.merge(vim.api.nvim_get_hl_by_name(base_group, true), {italic = true, foreground = "#6c71c4", background = "NONE"}))
|
||||
end
|
||||
local group = vim.api.nvim_create_augroup("LspDocumentHighlight", {clear = true})
|
||||
local function _18_()
|
||||
local function _27_()
|
||||
return vim.lsp.buf.document_highlight()
|
||||
end
|
||||
vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {group = group, pattern = "<buffer>", callback = _18_})
|
||||
local function _19_()
|
||||
vim.api.nvim_create_autocmd({"CursorHold", "CursorHoldI"}, {group = group, pattern = "<buffer>", callback = _27_})
|
||||
local function _28_()
|
||||
return vim.lsp.buf.clear_references()
|
||||
end
|
||||
vim.api.nvim_create_autocmd({"CursorMoved"}, {group = group, pattern = "<buffer>", callback = _19_})
|
||||
vim.api.nvim_create_autocmd({"CursorMoved"}, {group = group, pattern = "<buffer>", callback = _28_})
|
||||
else
|
||||
end
|
||||
if client.server_capabilities.documentFormattingProvider then
|
||||
vim.api.nvim_create_autocmd({"BufWritePre"}, {pattern = "<buffer>", callback = vim.lsp.buf.format})
|
||||
local function _30_()
|
||||
return require("conform").format()
|
||||
end
|
||||
vim.api.nvim_create_autocmd({"BufWritePre"}, {pattern = "<buffer>", callback = _30_})
|
||||
else
|
||||
end
|
||||
return print("LSP Client Attached.")
|
||||
end
|
||||
local function _22_(server_name)
|
||||
local function _32_(server_name)
|
||||
vim.lsp.config(server_name, {capabilities = caps, on_attach = on_attach})
|
||||
return vim.lsp.enable(server_name)
|
||||
end
|
||||
return mlsp.setup_handlers({_22_})
|
||||
return mlsp.setup_handlers({_32_})
|
||||
end
|
||||
local function _23_()
|
||||
local function _33_()
|
||||
return vim.lsp.buf.code_action()
|
||||
end
|
||||
return {{"folke/lsp-colors.nvim"}, {"williamboman/mason.nvim", opts = {}, tag = "v1.11.0"}, {"williamboman/mason-lspconfig.nvim", dependencies = {"williamboman/mason.nvim"}, opts = {ensure_installed = lsps, automatic_installation = true}, tag = "v1.32.0"}, {"neovim/nvim-lspconfig", config = _12_, dependencies = {"williamboman/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"<leader>ca", _23_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"<leader>fa", vim.lsp.buf.format, desc = "LSP format"}, {"<leader>rn", vim.lsp.buf.rename, desc = "LSP rename"}, {"gd", vim.lsp.buf.definition, desc = "Go to Definition"}, {"gD", vim.lsp.buf.declaration, desc = "Go to Declaration"}, {"gi", vim.lsp.buf.implementation, desc = "Go to Implementation"}, {"gr", vim.lsp.buf.references, desc = "Show References"}, {"K", vim.lsp.buf.hover, desc = "LSP Hover"}, {"[g", vim.lsp.diagnostic.goto_prev, desc = "Previous Diagnostic"}, {"]g", vim.lsp.diagnostic.goto_next, desc = "Next Diagnostic"}, {"<c-k>", vim.lsp.buf.signature_help, desc = "Signature Help"}}, lazy = false}, {"RubixDev/mason-update-all", cmd = "MasonUpdateAll", dependencies = {"williamboman/mason.nvim", "Olical/nfnl"}, main = "mason-update-all", opts = {}}}
|
||||
local function _34_()
|
||||
return require("conform").format()
|
||||
end
|
||||
return {{"folke/lsp-colors.nvim"}, {"williamboman/mason.nvim", opts = {}, tag = "v1.11.0"}, {"stevearc/conform.nvim", config = _12_, dependencies = {"rcarriga/nvim-notify"}, keys = {{"<leader>tbf", _16_, desc = "Toggle buffer formatting"}, {"<leader>tgf", _18_, desc = "Toggle global formatting"}}, opts = {formatters_by_ft = filetype__3eformatters, format_on_save = _19_}}, {"williamboman/mason-lspconfig.nvim", dependencies = {"williamboman/mason.nvim"}, opts = {ensure_installed = lsps, automatic_installation = true}, tag = "v1.32.0"}, {"neovim/nvim-lspconfig", config = _21_, dependencies = {"williamboman/mason-lspconfig.nvim", "hrsh7th/cmp-nvim-lsp", "stevearc/conform.nvim", "Olical/nfnl"}, keys = {{"<leader>ca", _33_, desc = "Invoke code_action, prompting for an action to take at the cursor"}, {"<leader>fa", _34_, desc = "LSP format"}, {"<leader>rn", vim.lsp.buf.rename, desc = "LSP rename"}, {"gd", vim.lsp.buf.definition, desc = "Go to Definition"}, {"gD", vim.lsp.buf.declaration, desc = "Go to Declaration"}, {"gi", vim.lsp.buf.implementation, desc = "Go to Implementation"}, {"gr", vim.lsp.buf.references, desc = "Show References"}, {"K", vim.lsp.buf.hover, desc = "LSP Hover"}, {"[g", vim.lsp.diagnostic.goto_prev, desc = "Previous Diagnostic"}, {"]g", vim.lsp.diagnostic.goto_next, desc = "Next Diagnostic"}, {"<c-k>", vim.lsp.buf.signature_help, desc = "Signature Help"}}, lazy = false}, {"RubixDev/mason-update-all", cmd = "MasonUpdateAll", dependencies = {"williamboman/mason.nvim", "Olical/nfnl"}, main = "mason-update-all", opts = {}}}
|
||||
Reference in new issue
Block a user