From e809e8dca629c37b5ff069801a84c5a9c3c346ef Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 14 Dec 2021 12:54:38 +0100 Subject: chore: bump plugins version (#2079) --- lua/lvim/plugins.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 8ef72bda..b0d25af1 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -1,28 +1,28 @@ local commit = { barbar = "6e638309efcad2f308eb9c5eaccf6f62b794bbab", cmp_buffer = "a0fe52489ff6e235d62407f8fa72aef80222040a", - cmp_luasnip = "75bf6434f175206cd219f9d2bbcae154a009346c", + cmp_luasnip = "7bd2612533db6863381193df83f9934b373b21e1", cmp_nvim_lsp = "134117299ff9e34adde30a735cd8ca9cf8f3db81", cmp_nvim_lua = "d276254e7198ab7d00f117e88e223b4bd8c02d21", cmp_path = "d83839ae510d18530c6d36b662a9e806d4dceb73", - comment = "58d489fb7f18c3652adf7e8e1fff9d3281a8fc6a", + comment = "eb0a84a2ea42858a2bb3cdf5fabe54e7c700555d", dapinstall = "dd09e9dd3a6e29f02ac171515b8a089fb82bb425", fixcursorhold = "0e4e22d21975da60b0fd2d302285b3b603f9f71e", - friendly_snippets = "4a9516c116f8d3a5766fcb8ac91b176979612d5d", - gitsigns = "aaf680472187798d5945e39179b540bd3bf80341", - lualine = "5596c2a25a49ca235613c804169b9063e20b05f5", - luasnip = "577045e9adf325e58f690f4d4b4a293f3dcec1b3", - nlsp_settings = "599edc32707f53bd9b0739879f013b3bf162ea4e", + friendly_snippets = "4bd6974bd3fcf036a29810bf0570acea55cecfb6", + gitsigns = "a451f97117bd1ede582a6b9db61c387c48d880b6", + lualine = "c4a09735a68c30981c223310848f0649235ec2be", + luasnip = "21bdf396438b98e12d5cd7c0210804e379babae3", + nlsp_settings = "5647a930a0883362b609acb6bfe29cce4202f75d", null_ls = "fb9e2a64ae8e43c2255025064cfee37dc7d6a752", nvim_autopairs = "04cd1779f81e9d50d5a116c5dccd054b275bd191", - nvim_cmp = "af07ff9b7973e95eff9e0275e13fe0350281208b", - nvim_dap = "3b3027e0ca98775000e1ba727d8f292e821f9f03", + nvim_cmp = "47d7cfc06abd8661e28dc919882a2fcf01c99729", + nvim_dap = "9b8c27d6dcc21b69834fe9c2d344e49030783390", nvim_lsp_installer = "d7b10b13d72d4bf8f7b34779ddc3514bcc26b0f2", - nvim_lspconfig = "2293320aa824e25327c5a10675ae091d1ff83fbc", + nvim_lspconfig = "dd15974986619b1f3143a9e666e36f41763ccdb4", nvim_notify = "ef027e34b618eac42fb0111c1db670ba01793039", - nvim_tree = "2e33b1654384921ec1cc9656a2018744f3f1ce81", - nvim_treesitter = "1d66657e6d0f1f8f79ddc48ff1dac9788694cc2d", - nvim_ts_context_commentstring = "9f5e422e1030e7073e593ad32c5354aa0bcb0176", + nvim_tree = "f408781a463c2edc3a49091b1bca5a18f790ee3d", + nvim_treesitter = "7474cb06c2be750eae92da51ff7791deb3b21397", + nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f", nvim_web_devicons = "344331467509802e1af200f08ec3da278be5cbba", packer = "851c62c5ecd3b5adc91665feda8f977e104162a5", plenary = "e6267f79481064eee53950571f53cbaafb08417d", -- cgit v1.2.3 From ccb5a6f0605c9429c2a44f3a800d7c6da6ca7752 Mon Sep 17 00:00:00 2001 From: Landon Schropp Date: Wed, 15 Dec 2021 11:33:39 -0600 Subject: fix: remove autopairs cmp completion (#2083) --- lua/lvim/core/autopairs.lua | 8 -------- 1 file changed, 8 deletions(-) (limited to 'lua') diff --git a/lua/lvim/core/autopairs.lua b/lua/lvim/core/autopairs.lua index 365d00d5..15c17032 100644 --- a/lua/lvim/core/autopairs.lua +++ b/lua/lvim/core/autopairs.lua @@ -85,14 +85,6 @@ M.setup = function() end), } - local cmp_status_ok, cmp = pcall(require, "cmp") - if cmp_status_ok then - -- If you want insert `(` after select function or method item - local cmp_autopairs = require "nvim-autopairs.completion.cmp" - local map_char = lvim.builtin.autopairs.map_char - cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done { map_char = map_char }) - end - require("nvim-treesitter.configs").setup { autopairs = { enable = true } } local ts_conds = require "nvim-autopairs.ts-conds" -- cgit v1.2.3 From f1ca79e628090d10c46cccdb6387f13b696c70cf Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 20 Dec 2021 08:59:47 +0100 Subject: refactor: remove unused old language configs (#2094) --- lua/lvim/config/init.lua | 3 +- lua/lvim/config/supported_languages.lua | 95 --------------------------------- lua/lvim/interface/popup.lua | 4 +- lua/lvim/lsp/manager.lua | 1 + lua/lvim/lsp/templates.lua | 1 + lua/lvim/lsp/utils.lua | 21 ++++++-- 6 files changed, 23 insertions(+), 102 deletions(-) delete mode 100644 lua/lvim/config/supported_languages.lua (limited to 'lua') diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua index fba6213d..9b6d36f0 100644 --- a/lua/lvim/config/init.lua +++ b/lua/lvim/config/init.lua @@ -40,8 +40,7 @@ function M:init() local lvim_lsp_config = require "lvim.lsp.config" lvim.lsp = apply_defaults(lvim.lsp, vim.deepcopy(lvim_lsp_config)) - local supported_languages = require "lvim.config.supported_languages" - require("lvim.lsp.manager").init_defaults(supported_languages) + require("lvim.lsp.manager").init_defaults() end local function handle_deprecated_settings() diff --git a/lua/lvim/config/supported_languages.lua b/lua/lvim/config/supported_languages.lua deleted file mode 100644 index ce5bc0db..00000000 --- a/lua/lvim/config/supported_languages.lua +++ /dev/null @@ -1,95 +0,0 @@ -return { - "asm", - "bash", - "beancount", - "bibtex", - "bicep", - "c", - "c_sharp", - "clojure", - "cmake", - "comment", - "commonlisp", - "cpp", - "crystal", - "cs", - "css", - "cuda", - "d", - "dart", - "dockerfile", - "dot", - "elixir", - "elm", - "emmet", - "erlang", - "fennel", - "fish", - "fortran", - "fsharp", - "gdscript", - "glimmer", - "go", - "gomod", - "graphql", - "haskell", - "hcl", - "heex", - "html", - "java", - "javascript", - "javascriptreact", - "jsdoc", - "json", - "json5", - "jsonc", - "julia", - "kotlin", - "latex", - "ledger", - "less", - "lua", - "markdown", - "nginx", - "nix", - "ocaml", - "ocaml_interface", - "perl", - "php", - "pioasm", - "ps1", - "puppet", - "python", - "ql", - "query", - "r", - "regex", - "rst", - "ruby", - "rust", - "scala", - "scss", - "sh", - "solidity", - "sparql", - "sql", - "supercollider", - "surface", - "svelte", - "swift", - "tailwindcss", - "terraform", - "tex", - "tlaplus", - "toml", - "tsx", - "turtle", - "typescript", - "typescriptreact", - "verilog", - "vim", - "vue", - "yaml", - "yang", - "zig", -} diff --git a/lua/lvim/interface/popup.lua b/lua/lvim/interface/popup.lua index b628125c..6587f5d4 100644 --- a/lua/lvim/interface/popup.lua +++ b/lua/lvim/interface/popup.lua @@ -43,7 +43,9 @@ end -- @param content_provider A function accepting the popup's layout and returning the content to display function Popup:display(content_provider) self.win_id = vim.api.nvim_open_win(self.buffer, true, self.layout) - vim.lsp.util.close_preview_autocmd({ "BufHidden", "BufLeave" }, self.win_id) + vim.api.nvim_command( + string.format("autocmd BufHidden,BufLeave ++once lua pcall(vim.api.nvim_win_close, %d, true)", self.win_id) + ) local lines = content_provider(self.layout) vim.api.nvim_buf_set_lines(self.bufnr, 0, -1, false, lines) diff --git a/lua/lvim/lsp/manager.lua b/lua/lvim/lsp/manager.lua index 7a35f1ff..c95b9f69 100644 --- a/lua/lvim/lsp/manager.lua +++ b/lua/lvim/lsp/manager.lua @@ -4,6 +4,7 @@ local Log = require "lvim.core.log" local lvim_lsp_utils = require "lvim.lsp.utils" function M.init_defaults(languages) + languages = languages or lvim_lsp_utils.get_all_supported_filetypes() for _, entry in ipairs(languages) do if not lvim.lang[entry] then lvim.lang[entry] = { diff --git a/lua/lvim/lsp/templates.lua b/lua/lvim/lsp/templates.lua index 3478f4fb..eb05615e 100644 --- a/lua/lvim/lsp/templates.lua +++ b/lua/lvim/lsp/templates.lua @@ -53,6 +53,7 @@ function M.generate_templates(servers_names) for _, server in pairs(available_servers) do table.insert(servers_names, server.name) + table.sort(servers_names) end end diff --git a/lua/lvim/lsp/utils.lua b/lua/lvim/lsp/utils.lua index df3846ce..6d1ed09c 100644 --- a/lua/lvim/lsp/utils.lua +++ b/lua/lvim/lsp/utils.lua @@ -49,12 +49,15 @@ function M.get_client_capabilities(client_id) return enabled_caps end +---Get supported filetypes per server +---@param server_name string can be any server supported by nvim-lsp-installer +---@return table supported filestypes as a list of strings function M.get_supported_filetypes(server_name) - -- temporary workaround: https://github.com/neovim/nvim-lspconfig/pull/1358 - if server_name == "dockerls" then - return { "dockerfile" } + local status_ok, lsp_installer_servers = pcall(require, "nvim-lsp-installer.servers") + if not status_ok then + return {} end - local lsp_installer_servers = require "nvim-lsp-installer.servers" + local server_available, requested_server = lsp_installer_servers.get_server(server_name) if not server_available then return {} @@ -63,4 +66,14 @@ function M.get_supported_filetypes(server_name) return requested_server:get_supported_filetypes() end +---Get all supported filetypes by nvim-lsp-installer +---@return table supported filestypes as a list of strings +function M.get_all_supported_filetypes() + local status_ok, lsp_installer_filetypes = pcall(require, "nvim-lsp-installer._generated.filetype_map") + if not status_ok then + return {} + end + return vim.tbl_keys(lsp_installer_filetypes or {}) +end + return M -- cgit v1.2.3 From 5e44e6d59bb8bac477c230dd8a463ddc1dd91799 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 21 Dec 2021 09:09:03 +0100 Subject: chore: core plugins version bump (#2103) --- lua/lvim/lsp/config.lua | 2 ++ lua/lvim/plugins.lua | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'lua') diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua index 1fbaf3a9..5cfe5b1f 100644 --- a/lua/lvim/lsp/config.lua +++ b/lua/lvim/lsp/config.lua @@ -61,6 +61,7 @@ return { "angularls", "ansiblels", "ccls", + "cssmodules_ls", "csharp_ls", "denols", "ember", @@ -78,6 +79,7 @@ return { "sqlls", "sqls", "solang", + "sourcekit", "spectral", "stylelint_lsp", "tailwindcss", diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index b0d25af1..ef53c3d4 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -17,8 +17,8 @@ local commit = { nvim_autopairs = "04cd1779f81e9d50d5a116c5dccd054b275bd191", nvim_cmp = "47d7cfc06abd8661e28dc919882a2fcf01c99729", nvim_dap = "9b8c27d6dcc21b69834fe9c2d344e49030783390", - nvim_lsp_installer = "d7b10b13d72d4bf8f7b34779ddc3514bcc26b0f2", - nvim_lspconfig = "dd15974986619b1f3143a9e666e36f41763ccdb4", + nvim_lsp_installer = "4d4677739f52b4aeab8909548b37cc88479c315e", + nvim_lspconfig = "c018b1e92e66b3429a2f167d59211846774f1e3b", nvim_notify = "ef027e34b618eac42fb0111c1db670ba01793039", nvim_tree = "f408781a463c2edc3a49091b1bca5a18f790ee3d", nvim_treesitter = "7474cb06c2be750eae92da51ff7791deb3b21397", -- cgit v1.2.3