Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/codegen/plugins/lsp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ pub fn generate(state: &WizardState) -> String {
}

let setup = format!(
" lspconfig.{}.setup({{ capabilities = capabilities }})",
" vim.lsp.config(\"{}\", {{ capabilities = capabilities }})",
entry.lspconfig_name
);
if !server_setups.contains(&setup) {
Expand Down Expand Up @@ -52,7 +52,7 @@ pub fn generate(state: &WizardState) -> String {
if !mason_pkgs.iter().any(|p| p.contains("lua-language-server")) {
mason_pkgs.push(lua_ls_pkg.to_string());
server_setups.push(
" lspconfig.lua_ls.setup({\n capabilities = capabilities,\n settings = { Lua = { diagnostics = { globals = { \"vim\" } } } },\n })".to_string(),
" vim.lsp.config(\"lua_ls\", {\n capabilities = capabilities,\n settings = { Lua = { diagnostics = { globals = { \"vim\" } } } },\n })".to_string(),
);
}

Expand Down Expand Up @@ -122,8 +122,6 @@ return {{{{
"folke/neodev.nvim",
}},
config = function()
local lspconfig = require("lspconfig")

-- Extend LSP capabilities with nvim-cmp completion support.
-- This tells the server what completion features the client supports.
local capabilities = require("cmp_nvim_lsp").default_capabilities()
Expand Down
Loading