fixed conflicts
This commit is contained in:
commit
cf52bb4d5b
2 changed files with 5 additions and 7 deletions
|
@ -34,13 +34,6 @@ return {
|
||||||
local lspconfig = require('lspconfig')
|
local lspconfig = require('lspconfig')
|
||||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||||
|
|
||||||
local lsps = {
|
|
||||||
"clangd", "arduino_language_server",
|
|
||||||
"lua_ls", "pylsp",
|
|
||||||
"texlab", "tinymist",
|
|
||||||
"cssls", "html",
|
|
||||||
}
|
|
||||||
|
|
||||||
lspconfig.lua_ls.setup({
|
lspconfig.lua_ls.setup({
|
||||||
capabilities = capabilities,
|
capabilities = capabilities,
|
||||||
})
|
})
|
||||||
|
|
|
@ -20,6 +20,11 @@ return {
|
||||||
require("mason-lspconfig").setup {
|
require("mason-lspconfig").setup {
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
"lua_ls",
|
"lua_ls",
|
||||||
|
"tinymist",
|
||||||
|
"arduino_language_server",
|
||||||
|
"pylsp",
|
||||||
|
"texlab",
|
||||||
|
"clangd"
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
end,
|
end,
|
||||||
|
|
Loading…
Add table
Reference in a new issue