From 7071c2c9830a52d2e845b642952a3f91b7bb8778 Mon Sep 17 00:00:00 2001 From: Heiko Blobner Date: Tue, 7 Nov 2023 18:57:22 +0100 Subject: [PATCH] nvim: lsp-zero-cfg warn removed --- .../nvim/lua/core/plugins/coding/lsp-zero.lua | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/dot_files/.config/nvim/lua/core/plugins/coding/lsp-zero.lua b/dot_files/.config/nvim/lua/core/plugins/coding/lsp-zero.lua index 27e72b6..5301a55 100644 --- a/dot_files/.config/nvim/lua/core/plugins/coding/lsp-zero.lua +++ b/dot_files/.config/nvim/lua/core/plugins/coding/lsp-zero.lua @@ -1,7 +1,7 @@ -- lsp-zero return { 'VonHeikemen/lsp-zero.nvim', - branch = 'v2.x', + branch = 'v3.x', dependencies = { -- LSP Support { @@ -47,6 +47,9 @@ return { {'rafamadriz/friendly-snippets'}, -- external collection of snippets }, config = function(_, opts) + local lsp = require('lsp-zero') + lsp.extend_lspconfig() + require("mason").setup() require("mason-lspconfig").setup() require("mason-lspconfig").setup_handlers { @@ -63,7 +66,7 @@ return { end, } - local lsp = require('lsp-zero').preset({}) + lsp.preset({}) lsp.on_attach(function(_, bufnr) lsp.default_keymaps({buffer = bufnr}) @@ -72,30 +75,6 @@ return { -- (Optional) Configure lua language server for neovim require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls()) - --lsp.ensure_installed({ - -- 'ansiblels', - -- 'bashls', - -- 'cairols', - -- 'clangd', - -- 'cmake', - -- 'cssmodules_ls', - -- 'diagnosticls', - -- 'dockerls', - -- 'docker_compose_language_service', - -- 'html', - -- 'java-language-server', - -- 'jedi-language-server', - -- 'jsonls', - -- 'kotlin-language-server', - -- 'marksman', - -- 'metals', - -- 'ruby_ls', - -- 'rust_analyzer', - -- 'yamlls', - - -- 'prettierd' - --}) - lsp.setup() local capabilities = vim.lsp.protocol.make_client_capabilities() @@ -104,11 +83,11 @@ return { local Util = require("core.util") -- setup autoformat - require("core.plugins.coding.lsp.format").setup(opts) + --require("core.plugins.coding.lsp.format").setup(opts) -- setup formatting and keymaps - Util.on_attach(function(client, buffer) - require("core.plugins.coding.lsp.keymaps").on_attach(client, buffer) - end) + --Util.on_attach(function(client, buffer) + --require("core.plugins.coding.lsp.keymaps").on_attach(client, buffer) + --end) local cmp = require('cmp') local cmp_action = require('lsp-zero').cmp_action()