refactor: config.plugins -> plugins

This commit is contained in:
Folke Lemaitre 2022-12-31 10:54:42 +01:00
parent 8625b49288
commit 09c27b5e4d
No known key found for this signature in database
GPG key ID: 41F8B1FBACAE2040
17 changed files with 43 additions and 36 deletions

View file

@ -0,0 +1,40 @@
local M = {}
M.autoformat = true
function M.toggle()
M.autoformat = not M.autoformat
vim.notify(M.autoformat and "Enabled format on save" or "Disabled format on save")
end
function M.format()
local buf = vim.api.nvim_get_current_buf()
local ft = vim.bo[buf].filetype
local have_nls = #require("null-ls.sources").get_available(ft, "NULL_LS_FORMATTING") > 0
vim.lsp.buf.format({
bufnr = buf,
filter = function(client)
if have_nls then
return client.name == "null-ls"
end
return client.name ~= "null-ls"
end,
})
end
function M.on_attach(client, buf)
if client.supports_method("textDocument/formatting") then
vim.api.nvim_create_autocmd("BufWritePre", {
group = vim.api.nvim_create_augroup("LspFormat", {}),
buffer = buf,
callback = function()
if M.autoformat then
M.format()
end
end,
})
end
end
return M

46
lua/plugins/lsp/init.lua Normal file
View file

@ -0,0 +1,46 @@
local servers = require("plugins.lsp.servers")
local function on_attach(client, bufnr)
require("plugins.lsp.format").on_attach(client, bufnr)
require("plugins.lsp.keymaps").on_attach(client, bufnr)
end
return {
-- lspconfig
{
"neovim/nvim-lspconfig",
event = "BufReadPre",
dependencies = {
{ "folke/neoconf.nvim", cmd = "Neoconf", config = true },
{ "folke/neodev.nvim", config = true },
{ "williamboman/mason.nvim", config = true },
{ "williamboman/mason-lspconfig.nvim", config = { ensure_installed = vim.tbl_keys(servers) } },
"hrsh7th/cmp-nvim-lsp",
},
config = function()
local capabilities = require("cmp_nvim_lsp").default_capabilities(vim.lsp.protocol.make_client_capabilities())
for server, opts in pairs(servers) do
opts.capabilities = capabilities
opts.on_attach = on_attach
require("lspconfig")[server].setup(opts)
end
end,
},
-- formatters
{
"jose-elias-alvarez/null-ls.nvim",
event = "BufReadPre",
config = function()
local nls = require("null-ls")
nls.setup({
on_attach = on_attach,
sources = {
-- nls.builtins.formatting.prettierd,
nls.builtins.formatting.stylua,
nls.builtins.diagnostics.flake8,
},
})
end,
},
}

View file

@ -0,0 +1,70 @@
local M = {}
function M.on_attach(client, buffer)
local cap = client.server_capabilities
require("which-key").register({
buffer = buffer,
["<leader>"] = {
c = {
name = "+code",
{
cond = client.name == "tsserver",
o = { "<cmd>:TypescriptOrganizeImports<CR>", "Organize Imports" },
R = { "<cmd>:TypescriptRenameFile<CR>", "Rename File" },
},
r = { "<cmd>lua vim.lsp.buf.rename()<cr>", "Rename", cond = cap.renameProvider },
a = {
{ vim.lsp.buf.code_action, "Code Action" },
{ "<cmd>lua vim.lsp.buf.code_action()<cr>", "Code Action", mode = "v" },
},
f = {
{
require("plugins.lsp.format").format,
"Format Document",
cond = cap.documentFormatting,
},
{
require("plugins.lsp.format").format,
"Format Range",
cond = cap.documentRangeFormatting,
mode = "v",
},
},
d = { vim.diagnostic.open_float, "Line Diagnostics" },
l = {
name = "+lsp",
i = { "<cmd>LspInfo<cr>", "Lsp Info" },
},
},
x = {
d = { "<cmd>Telescope diagnostics<cr>", "Search Diagnostics" },
},
},
g = {
name = "+goto",
d = { "<cmd>Telescope lsp_definitions<cr>", "Goto Definition" },
r = { "<cmd>Telescope lsp_references<cr>", "References" },
R = { "<cmd>Trouble lsp_references<cr>", "Trouble References" },
D = { "<cmd>Telescope lsp_declarations<CR>", "Goto Declaration" },
I = { "<cmd>Telescope lsp_implementations<CR>", "Goto Implementation" },
t = { "<cmd>Telescope lsp_type_definitions<cr>", "Goto Type Definition" },
},
["<C-k>"] = { "<cmd>lua vim.lsp.buf.signature_help()<CR>", "Signature Help", mode = { "n", "i" } },
["K"] = { "<cmd>lua vim.lsp.buf.hover()<CR>", "Hover" },
["[d"] = { "<cmd>lua vim.diagnostic.goto_prev()<CR>", "Next Diagnostic" },
["]d"] = { "<cmd>lua vim.diagnostic.goto_next()<CR>", "Prev Diagnostic" },
["[e"] = { "<cmd>lua vim.diagnostic.goto_prev({severity = vim.diagnostic.severity.ERROR})<CR>", "Next Error" },
["]e"] = { "<cmd>lua vim.diagnostic.goto_next({severity = vim.diagnostic.severity.ERROR})<CR>", "Prev Error" },
["[w"] = {
"<cmd>lua vim.diagnostic.goto_prev({severity = vim.diagnostic.severity.WARNING})<CR>",
"Next Warning",
},
["]w"] = {
"<cmd>lua vim.diagnostic.goto_next({severity = vim.diagnostic.severity.WARNING})<CR>",
"Prev Warning",
},
})
end
return M

View file

@ -0,0 +1,25 @@
---@type lspconfig.options
local servers = {
bashls = {},
clangd = {},
cssls = {},
tsserver = {},
html = {},
jsonls = {},
pyright = {},
yamlls = {},
sumneko_lua = {
settings = {
Lua = {
workspace = {
checkThirdParty = false,
},
completion = {
callSnippet = "Replace",
},
},
},
},
}
return servers