feat: use null-ls for goimports and format instead of gopls
This commit is contained in:
parent
e450731fbe
commit
319b4078b9
|
@ -3,8 +3,44 @@ if not lspconfig_ok then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- Use an on_attach function to only map the following keys
|
||||||
|
-- after the language server attaches to the current buffer
|
||||||
|
local on_attach = function(client, bufnr)
|
||||||
|
-- Enable completion triggered by <c-x><c-o>
|
||||||
|
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||||
|
|
||||||
|
-- Mappings.
|
||||||
|
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
||||||
|
local bufopts = { noremap = true, silent = true, buffer = bufnr }
|
||||||
|
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
|
||||||
|
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
|
||||||
|
vim.keymap.set('n', 'od', vim.lsp.buf.hover, bufopts)
|
||||||
|
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
|
||||||
|
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
|
||||||
|
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
|
||||||
|
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
|
||||||
|
vim.keymap.set('n', '<space>wl', function()
|
||||||
|
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
||||||
|
end, bufopts)
|
||||||
|
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
|
||||||
|
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
|
||||||
|
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
|
||||||
|
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||||
|
vim.keymap.set('n', '<leader>fd', vim.lsp.buf.formatting, bufopts)
|
||||||
|
end
|
||||||
|
|
||||||
local language_servers = {
|
local language_servers = {
|
||||||
gopls = {},
|
gopls = {
|
||||||
|
-- capabilities = {
|
||||||
|
-- document_formatting = false,
|
||||||
|
-- document_range_formatting = false,
|
||||||
|
-- }
|
||||||
|
on_attach = function(client, bufnr)
|
||||||
|
on_attach(client, bufnr)
|
||||||
|
client.resolved_capabilities.document_formatting = false
|
||||||
|
client.resolved_capabilities.document_range_formatting = false
|
||||||
|
end
|
||||||
|
},
|
||||||
-- grammarly = {},
|
-- grammarly = {},
|
||||||
-- marksman = {},
|
-- marksman = {},
|
||||||
jsonls = {},
|
jsonls = {},
|
||||||
|
@ -33,32 +69,6 @@ local language_servers = {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
-- Use an on_attach function to only map the following keys
|
|
||||||
-- after the language server attaches to the current buffer
|
|
||||||
local on_attach = function(client, bufnr)
|
|
||||||
-- Enable completion triggered by <c-x><c-o>
|
|
||||||
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
|
|
||||||
|
|
||||||
-- Mappings.
|
|
||||||
-- See `:help vim.lsp.*` for documentation on any of the below functions
|
|
||||||
local bufopts = { noremap = true, silent = true, buffer = bufnr }
|
|
||||||
vim.keymap.set('n', 'gD', vim.lsp.buf.declaration, bufopts)
|
|
||||||
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, bufopts)
|
|
||||||
vim.keymap.set('n', 'od', vim.lsp.buf.hover, bufopts)
|
|
||||||
vim.keymap.set('n', 'gi', vim.lsp.buf.implementation, bufopts)
|
|
||||||
vim.keymap.set('n', '<C-k>', vim.lsp.buf.signature_help, bufopts)
|
|
||||||
vim.keymap.set('n', '<space>wa', vim.lsp.buf.add_workspace_folder, bufopts)
|
|
||||||
vim.keymap.set('n', '<space>wr', vim.lsp.buf.remove_workspace_folder, bufopts)
|
|
||||||
vim.keymap.set('n', '<space>wl', function()
|
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
|
||||||
end, bufopts)
|
|
||||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, bufopts)
|
|
||||||
vim.keymap.set('n', '<leader>rn', vim.lsp.buf.rename, bufopts)
|
|
||||||
vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, bufopts)
|
|
||||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
|
||||||
vim.keymap.set('n', '<leader>fd', vim.lsp.buf.formatting, bufopts)
|
|
||||||
end
|
|
||||||
|
|
||||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||||
|
|
||||||
|
|
||||||
|
@ -71,70 +81,68 @@ if cmp_status_ok then
|
||||||
end
|
end
|
||||||
|
|
||||||
for langsvr, settings in pairs(language_servers) do
|
for langsvr, settings in pairs(language_servers) do
|
||||||
settings["on_attach"] = on_attach
|
settings = vim.tbl_deep_extend("keep", settings, {
|
||||||
settings["capabilities"] = capabilities
|
on_attach = on_attach,
|
||||||
|
capabilities = capabilities,
|
||||||
|
})
|
||||||
lspconfig[langsvr].setup(settings)
|
lspconfig[langsvr].setup(settings)
|
||||||
end
|
end
|
||||||
|
|
||||||
if not cmp_status_ok then
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local luasnip_status_ok, luasnip = pcall(require, "luasnip")
|
local luasnip_status_ok, luasnip = pcall(require, "luasnip")
|
||||||
|
if cmp_status_ok and luasnip_status_ok then
|
||||||
cmp.setup {
|
cmp.setup {
|
||||||
snippet = {
|
snippet = {
|
||||||
expand = function(args)
|
expand = function(args)
|
||||||
if luasnip_status_ok then
|
if luasnip_status_ok then
|
||||||
luasnip.lsp_expand(args.body)
|
luasnip.lsp_expand(args.body)
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
},
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
|
||||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
|
||||||
['<CR>'] = cmp.mapping.confirm {
|
|
||||||
behavior = cmp.ConfirmBehavior.Replace,
|
|
||||||
select = true,
|
|
||||||
},
|
},
|
||||||
['<Tab>'] = cmp.mapping(function(fallback)
|
mapping = cmp.mapping.preset.insert({
|
||||||
if cmp.visible() then
|
['<C-d>'] = cmp.mapping.scroll_docs(-4),
|
||||||
cmp.select_next_item()
|
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||||
elseif luasnip_status_ok and luasnip.expand_or_jumpable() then
|
['<CR>'] = cmp.mapping.confirm {
|
||||||
luasnip.expand_or_jump()
|
behavior = cmp.ConfirmBehavior.Replace,
|
||||||
else
|
select = true,
|
||||||
fallback()
|
},
|
||||||
end
|
['<Tab>'] = cmp.mapping(function(fallback)
|
||||||
end, { 'i', 's' }),
|
if cmp.visible() then
|
||||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
cmp.select_next_item()
|
||||||
if cmp.visible() then
|
elseif luasnip_status_ok and luasnip.expand_or_jumpable() then
|
||||||
cmp.select_prev_item()
|
luasnip.expand_or_jump()
|
||||||
elseif luasnip_status_ok and luasnip.jumpable(-1) then
|
else
|
||||||
luasnip.jump(-1)
|
fallback()
|
||||||
else
|
end
|
||||||
fallback()
|
end, { 'i', 's' }),
|
||||||
end
|
['<S-Tab>'] = cmp.mapping(function(fallback)
|
||||||
end, { 'i', 's' }),
|
if cmp.visible() then
|
||||||
}),
|
cmp.select_prev_item()
|
||||||
sources = {
|
elseif luasnip_status_ok and luasnip.jumpable(-1) then
|
||||||
{ name = 'nvim_lsp' },
|
luasnip.jump(-1)
|
||||||
{ name = 'luasnip' },
|
else
|
||||||
{ name = 'buffer' },
|
fallback()
|
||||||
{ name = 'path' },
|
end
|
||||||
},
|
end, { 'i', 's' }),
|
||||||
}
|
}),
|
||||||
|
sources = {
|
||||||
local null_ls_ok, null_ls = pcall(require, "null_ls")
|
{ name = 'nvim_lsp' },
|
||||||
if not null_ls_ok then
|
{ name = 'luasnip' },
|
||||||
return
|
{ name = 'buffer' },
|
||||||
|
{ name = 'path' },
|
||||||
|
},
|
||||||
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
null_ls.setup({
|
|
||||||
sources = {
|
local null_ls_ok, null_ls = pcall(require, "null-ls")
|
||||||
null_ls.builtins.formatting.stylua,
|
if null_ls_ok then
|
||||||
null_ls.builtins.diagnostics.eslint,
|
null_ls.setup({
|
||||||
null_ls.builtins.completion.spell,
|
sources = {
|
||||||
null_ls.builtins.formatting.goimports,
|
null_ls.builtins.formatting.stylua,
|
||||||
null_ls.builtins.formatting.gofumpt,
|
null_ls.builtins.diagnostics.eslint,
|
||||||
},
|
null_ls.builtins.completion.spell,
|
||||||
})
|
null_ls.builtins.formatting.goimports,
|
||||||
|
null_ls.builtins.formatting.gofumpt,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in New Issue
Block a user