[nvim] replace null-ls with efm-langserver
This commit is contained in:
parent
37b60e7fa8
commit
708c99e306
|
|
@ -12,14 +12,14 @@ function fish_title --argument-names last_cmd
|
|||
if [ fish != $_ ]
|
||||
switch $_
|
||||
case vi vim nvim
|
||||
set last_path (string split ' ' $last_cmd)[2..]
|
||||
set last_path (string split ' ' $last_cmd)[2..]
|
||||
|
||||
if test -n "$last_path"
|
||||
and test -f "$last_path"
|
||||
echo "$prefix$_ $(path basename $last_path)"
|
||||
else
|
||||
echo "$prefix$last_cmd"
|
||||
end
|
||||
if test -n "$last_path"
|
||||
and test -f "$last_path"
|
||||
echo "$prefix$_ $(path basename $last_path)"
|
||||
else
|
||||
echo "$prefix$last_cmd"
|
||||
end
|
||||
case '*'
|
||||
echo "$prefix$last_cmd"
|
||||
end
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ return {
|
|||
["<C-e>"] = cmp.mapping.abort(),
|
||||
["<CR>"] = cmp.mapping.confirm({ select = true }),
|
||||
}),
|
||||
sources = {
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "nvim_diagnostic" },
|
||||
{ name = "buffer" },
|
||||
|
|
@ -50,7 +50,7 @@ return {
|
|||
{ name = "nvim_lua" },
|
||||
{ name = "nvim_lsp_signature_help" },
|
||||
{ name = "emoji" },
|
||||
},
|
||||
}),
|
||||
formatting = {
|
||||
format = lspkind.cmp_format({
|
||||
mode = "symbol_text",
|
||||
|
|
|
|||
|
|
@ -1,126 +1,195 @@
|
|||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
"hrsh7th/nvim-cmp",
|
||||
},
|
||||
config = function()
|
||||
local lspconfig = require("lspconfig")
|
||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
local lspwindow = require("lspconfig.ui.windows")
|
||||
"neovim/nvim-lspconfig",
|
||||
dependencies = {
|
||||
"hrsh7th/nvim-cmp",
|
||||
"creativenull/efmls-configs-nvim",
|
||||
},
|
||||
config = function()
|
||||
local lspconfig = require("lspconfig")
|
||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
|
||||
local lspwindow = require("lspconfig.ui.windows")
|
||||
|
||||
capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
|
||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||
capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
|
||||
capabilities.textDocument.completion.completionItem.snippetSupport = true
|
||||
|
||||
-- disable showing diagnostics in virtual text
|
||||
vim.diagnostic.config({ virtual_text = false })
|
||||
-- disable showing diagnostics in virtual text
|
||||
vim.diagnostic.config({ virtual_text = false })
|
||||
|
||||
-- close quickfix menu after selecting choice
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = { "qf" },
|
||||
command = [[nnoremap <buffer> <CR> <CR>:cclose<CR>]],
|
||||
})
|
||||
-- close quickfix menu after selecting choice
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = { "qf" },
|
||||
command = [[nnoremap <buffer> <CR> <CR>:cclose<CR>]],
|
||||
})
|
||||
|
||||
-- override all window borders
|
||||
local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
|
||||
local border = "rounded"
|
||||
-- override all window borders
|
||||
local orig_util_open_floating_preview = vim.lsp.util.open_floating_preview
|
||||
local border = "rounded"
|
||||
|
||||
function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
|
||||
opts = opts or {}
|
||||
opts.border = border
|
||||
return orig_util_open_floating_preview(contents, syntax, opts, ...)
|
||||
end
|
||||
function vim.lsp.util.open_floating_preview(contents, syntax, opts, ...)
|
||||
opts = opts or {}
|
||||
opts.border = border
|
||||
return orig_util_open_floating_preview(contents, syntax, opts, ...)
|
||||
end
|
||||
|
||||
-- lspinfo needs a separate override
|
||||
lspwindow.default_options = {
|
||||
border = border,
|
||||
}
|
||||
-- lspinfo needs a separate override
|
||||
lspwindow.default_options = {
|
||||
border = border,
|
||||
}
|
||||
|
||||
-- LSP settings (for overriding per client)
|
||||
local handlers = {}
|
||||
local opts = { noremap = true, silent = true }
|
||||
-- LSP settings (for overriding per client)
|
||||
local handlers = {}
|
||||
|
||||
local on_attach = function(_, bufnr)
|
||||
-- Mappings.
|
||||
local bufopts = { noremap = true, silent = true, buffer = bufnr }
|
||||
local on_attach = function(_, bufnr)
|
||||
-- Mappings.
|
||||
local bufopts = { noremap = true, silent = true, buffer = bufnr }
|
||||
|
||||
-- See `:help vim.lsp.*` for more methods
|
||||
vim.keymap.set("n", "<leader>bf", function()
|
||||
vim.lsp.buf.format({ timeout = 2000, async = true })
|
||||
end, bufopts)
|
||||
end
|
||||
-- See `:help vim.lsp.*` for more methods
|
||||
vim.keymap.set("n", "<leader>bf", function()
|
||||
vim.lsp.buf.format({ timeout = 2000, async = true })
|
||||
end, bufopts)
|
||||
end
|
||||
|
||||
local function organize_imports()
|
||||
local params = {
|
||||
command = "_typescript.organizeImports",
|
||||
arguments = { vim.api.nvim_buf_get_name(0) },
|
||||
title = "",
|
||||
}
|
||||
vim.lsp.buf.execute_command(params)
|
||||
end
|
||||
local function organize_imports()
|
||||
local params = {
|
||||
command = "_typescript.organizeImports",
|
||||
arguments = { vim.api.nvim_buf_get_name(0) },
|
||||
title = "",
|
||||
}
|
||||
vim.lsp.buf.execute_command(params)
|
||||
end
|
||||
|
||||
local servers = {
|
||||
{
|
||||
"tsserver",
|
||||
commands = {
|
||||
LspOrganizeImports = {
|
||||
organize_imports,
|
||||
description = "Organize Imports",
|
||||
},
|
||||
},
|
||||
},
|
||||
{ "tailwindcss" },
|
||||
{ "flow" },
|
||||
{ "graphql" },
|
||||
{ "html" },
|
||||
{ "intelephense" },
|
||||
{ "jsonls" },
|
||||
{ "pyright" },
|
||||
{ "vimls" },
|
||||
{ "prismals" },
|
||||
{ "solargraph" },
|
||||
{ "bashls" },
|
||||
{ "dockerls" },
|
||||
{ "gopls", {
|
||||
root_dir = function()
|
||||
return vim.loop.cwd()
|
||||
end,
|
||||
} },
|
||||
{
|
||||
"yamlls",
|
||||
{
|
||||
settings = {
|
||||
yaml = {
|
||||
schemas = {
|
||||
["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*",
|
||||
["https://raw.githubusercontent.com/woodpecker-ci/woodpecker/master/pipeline/schema/schema.json"] = "/.woodpecker",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{ "cssls" },
|
||||
{ "lua_ls" },
|
||||
}
|
||||
local servers = {
|
||||
{
|
||||
"tsserver",
|
||||
commands = {
|
||||
LspOrganizeImports = {
|
||||
organize_imports,
|
||||
description = "Organize Imports",
|
||||
},
|
||||
},
|
||||
},
|
||||
{ "tailwindcss" },
|
||||
{ "graphql" },
|
||||
{ "html" },
|
||||
{ "intelephense" },
|
||||
{ "jsonls" },
|
||||
{ "pyright" },
|
||||
{ "vimls" },
|
||||
{ "bashls" },
|
||||
{ "dockerls" },
|
||||
{ "solargraph" },
|
||||
-- { "rubocop" }, -- needs rubocop >= 1.54
|
||||
-- { "ruby_ls" }, -- wait for nvim 0.10
|
||||
{ "gopls", {
|
||||
root_dir = function()
|
||||
return vim.loop.cwd()
|
||||
end,
|
||||
} },
|
||||
{ "eslint" },
|
||||
{
|
||||
"yamlls",
|
||||
settings = {
|
||||
yaml = {
|
||||
schemas = {
|
||||
["https://json.schemastore.org/github-workflow.json"] = "/.github/workflows/*",
|
||||
["https://raw.githubusercontent.com/woodpecker-ci/woodpecker/master/pipeline/schema/schema.json"] = "/.woodpecker",
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{ "stylelint_lsp" },
|
||||
{ "cssls" },
|
||||
{
|
||||
"efm",
|
||||
filetypes = {
|
||||
"lua",
|
||||
"fish",
|
||||
"ruby",
|
||||
"javascript",
|
||||
"typescript",
|
||||
"javascriptreact",
|
||||
"typescriptreact",
|
||||
"javascript.tsx",
|
||||
"typescript.tsx"
|
||||
},
|
||||
init_options = {
|
||||
documentFormatting = true,
|
||||
hover = true,
|
||||
documentSymbol = true,
|
||||
codeAction = true,
|
||||
completion = true,
|
||||
},
|
||||
settings = {
|
||||
rootMarkers = { ".git/" },
|
||||
languages = {
|
||||
lua = {
|
||||
require("efmls-configs.linters.luacheck"),
|
||||
},
|
||||
fish = {
|
||||
require("efmls-configs.linters.fish"),
|
||||
require("efmls-configs.formatters.fish_indent"),
|
||||
},
|
||||
ruby = {
|
||||
require("efmls-configs.linters.rubocop"),
|
||||
},
|
||||
javascript = {
|
||||
require("efmls-configs.formatters.prettier"),
|
||||
},
|
||||
typescript = {
|
||||
require("efmls-configs.formatters.prettier"),
|
||||
},
|
||||
javascriptreact = {
|
||||
require("efmls-configs.formatters.prettier"),
|
||||
},
|
||||
typescriptreact = {
|
||||
require("efmls-configs.formatters.prettier"),
|
||||
},
|
||||
["javascript.tsx"] = {
|
||||
require("efmls-configs.formatters.prettier"),
|
||||
},
|
||||
["typescript.tsx"] = {
|
||||
require("efmls-configs.formatters.prettier"),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"lua_ls",
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
version = 'LuaJIT',
|
||||
},
|
||||
diagnostics = {
|
||||
globals = { 'vim' },
|
||||
},
|
||||
workspace = {
|
||||
library = vim.api.nvim_get_runtime_file("", true),
|
||||
},
|
||||
telemetry = {
|
||||
enable = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, server in pairs(servers) do
|
||||
local config = lspconfig[server[1]]
|
||||
-- Only setup a language server if we have the binary available!
|
||||
if vim.fn.executable(config.document_config.default_config.cmd[1]) == 1 then
|
||||
local opts = {
|
||||
on_attach = on_attach,
|
||||
handlers = handlers,
|
||||
capabilities = capabilities,
|
||||
}
|
||||
for _, server in pairs(servers) do
|
||||
local config = lspconfig[server[1]]
|
||||
local setup_config = {
|
||||
on_attach = on_attach,
|
||||
handlers = handlers,
|
||||
capabilities = capabilities,
|
||||
}
|
||||
|
||||
-- Add custom config if available
|
||||
for k, v in pairs(server) do
|
||||
if type(k) ~= "number" then
|
||||
opts[k] = v
|
||||
end
|
||||
end
|
||||
-- Add custom config if available
|
||||
for k, v in pairs(server) do
|
||||
if type(k) ~= "number" then
|
||||
setup_config[k] = v
|
||||
end
|
||||
end
|
||||
|
||||
config.setup(opts)
|
||||
end
|
||||
end
|
||||
end,
|
||||
config.setup(setup_config)
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue