From a5095db20d5bd4e8ce946ef7d1ea18e15b86bd23 Mon Sep 17 00:00:00 2001
From: Benedikt Schnatterbeck <benediktms@hey.com>
Date: Mon, 1 Aug 2022 20:13:48 +0100
Subject: feat(whichkey): add default keybindings to cycle to next buffer
 (#2873)

---
 lua/lvim/core/which-key.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lua')

diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index 3015781b..8f0f964f 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -1,5 +1,4 @@
 local M = {}
-
 M.config = function()
   lvim.builtin.which_key = {
     ---@usage disable which-key completely [not recommended]
@@ -92,6 +91,7 @@ M.config = function()
         j = { "<cmd>BufferLinePick<cr>", "Jump" },
         f = { "<cmd>Telescope buffers<cr>", "Find" },
         b = { "<cmd>BufferLineCyclePrev<cr>", "Previous" },
+        n = { "<cmd>BufferLineCycleNext<cr>", "Next" },
         -- w = { "<cmd>BufferWipeout<cr>", "Wipeout" }, -- TODO: implement this for bufferline
         e = {
           "<cmd>BufferLinePickClose<cr>",
-- 
cgit v1.2.3


From eefde00ae80f91ecf88a93e869e346fdd04c7ba4 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Tue, 9 Aug 2022 10:41:17 +0200
Subject: refactor!: migrate to mason.nvim (#2880)

---
 lua/lvim/config/init.lua        |  7 +++++
 lua/lvim/core/builtins/init.lua |  1 +
 lua/lvim/core/info.lua          |  4 +--
 lua/lvim/core/mason.lua         | 41 +++++++++++++++++++++++++
 lua/lvim/core/which-key.lua     |  2 +-
 lua/lvim/lsp/config.lua         | 13 +++-----
 lua/lvim/lsp/init.lua           |  5 ++-
 lua/lvim/lsp/manager.lua        | 67 ++++++++++++++++++++++++++++++-----------
 lua/lvim/lsp/templates.lua      | 11 +------
 lua/lvim/lsp/utils.lua          | 29 ++++++++----------
 lua/lvim/plugins.lua            |  6 +++-
 11 files changed, 130 insertions(+), 56 deletions(-)
 create mode 100644 lua/lvim/core/mason.lua

(limited to 'lua')

diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua
index 4343ace9..c6765f56 100644
--- a/lua/lvim/config/init.lua
+++ b/lua/lvim/config/init.lua
@@ -99,6 +99,13 @@ local function handle_deprecated_settings()
       "Use vim.api.nvim_create_autocmd instead or check LunarVim#2592 to learn about the new syntax"
     )
   end
+
+  if lvim.lsp.automatic_servers_installation then
+    deprecation_notice(
+      "lvim.lsp.automatic_servers_installation",
+      "Use `lvim.lsp.installer.setup.automatic_installation` instead"
+    )
+  end
 end
 
 --- Override the configuration with a user provided one
diff --git a/lua/lvim/core/builtins/init.lua b/lua/lvim/core/builtins/init.lua
index e219d45e..5cad2a00 100644
--- a/lua/lvim/core/builtins/init.lua
+++ b/lua/lvim/core/builtins/init.lua
@@ -16,6 +16,7 @@ local builtins = {
   "lvim.core.notify",
   "lvim.core.lualine",
   "lvim.core.alpha",
+  "lvim.core.mason",
 }
 
 function M.config(config)
diff --git a/lua/lvim/core/info.lua b/lua/lvim/core/info.lua
index ac7d690a..da9ddbe6 100644
--- a/lua/lvim/core/info.lua
+++ b/lua/lvim/core/info.lua
@@ -111,9 +111,9 @@ local function make_auto_lsp_info(ft)
     return info_lines
   end
 
-  local available = lsp_utils.get_supported_servers_per_filetype(ft)
+  local supported = lsp_utils.get_supported_servers(ft)
   local skipped = vim.tbl_filter(function(name)
-    return vim.tbl_contains(available, name)
+    return vim.tbl_contains(supported, name)
   end, skipped_servers)
 
   if #skipped == 0 then
diff --git a/lua/lvim/core/mason.lua b/lua/lvim/core/mason.lua
new file mode 100644
index 00000000..39be4f42
--- /dev/null
+++ b/lua/lvim/core/mason.lua
@@ -0,0 +1,41 @@
+local M = {}
+
+function M.config()
+  lvim.builtin.mason = {
+    ui = {
+      keymaps = {
+        toggle_package_expand = "<CR>",
+        install_package = "i",
+        update_package = "u",
+        check_package_version = "c",
+        update_all_packages = "U",
+        check_outdated_packages = "C",
+        uninstall_package = "X",
+        cancel_installation = "<C-c>",
+        apply_language_filter = "<C-f>",
+      },
+    },
+    log_level = vim.log.levels.INFO,
+    max_concurrent_installers = 4,
+
+    github = {
+      -- The template URL to use when downloading assets from GitHub.
+      -- The placeholders are the following (in order):
+      -- 1. The repository (e.g. "rust-lang/rust-analyzer")
+      -- 2. The release version (e.g. "v0.3.0")
+      -- 3. The asset name (e.g. "rust-analyzer-v0.3.0-x86_64-unknown-linux-gnu.tar.gz")
+      download_url_template = "https://github.com/%s/releases/download/%s/%s",
+    },
+  }
+end
+
+function M.setup()
+  local status_ok, mason = pcall(require, "mason")
+  if not status_ok then
+    return
+  end
+
+  mason.setup(lvim.builtin.mason)
+end
+
+return M
diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index 8f0f964f..6d0dc9fc 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -160,7 +160,7 @@ M.config = function()
         w = { "<cmd>Telescope diagnostics<cr>", "Diagnostics" },
         f = { require("lvim.lsp.utils").format, "Format" },
         i = { "<cmd>LspInfo<cr>", "Info" },
-        I = { "<cmd>LspInstallInfo<cr>", "Installer Info" },
+        I = { "<cmd>Mason<cr>", "Mason Info" },
         j = {
           vim.diagnostic.goto_next,
           "Next Diagnostic",
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index e3cd503b..41290787 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -88,7 +88,6 @@ return {
   },
   on_attach_callback = nil,
   on_init_callback = nil,
-  automatic_servers_installation = true,
   automatic_configuration = {
     ---@usage list of servers that the automatic installer will skip
     skipped_servers = skipped_servers,
@@ -131,12 +130,8 @@ return {
   installer = {
     setup = {
       ensure_installed = {},
-      ui = {
-        icons = {
-          server_installed = "✓",
-          server_pending = "",
-          server_uninstalled = "✗",
-        },
+      automatic_installation = {
+        exclude = {},
       },
     },
   },
@@ -153,6 +148,8 @@ return {
     setup = {},
     config = {},
   },
-  ---@deprecated use automatic_configuration.skipped_servers instead
+  ---@deprecated use lvim.lsp.automatic_configuration.skipped_servers instead
   override = {},
+  ---@deprecated use lvim.lsp.installer.setup.automatic_installation instead
+  automatic_servers_installation = nil,
 }
diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua
index 53b4f248..0b361972 100644
--- a/lua/lvim/lsp/init.lua
+++ b/lua/lvim/lsp/init.lua
@@ -110,7 +110,10 @@ function M.setup()
   end)
 
   pcall(function()
-    require("nvim-lsp-installer").setup(lvim.lsp.installer.setup)
+    require("mason-lspconfig").setup(lvim.lsp.installer.setup)
+    local util = require "lspconfig.util"
+    -- automatic_installation is handled by lsp-manager
+    util.on_setup = nil
   end)
 
   require("lvim.lsp.null-ls").setup()
diff --git a/lua/lvim/lsp/manager.lua b/lua/lvim/lsp/manager.lua
index 00643815..aa76af6c 100644
--- a/lua/lvim/lsp/manager.lua
+++ b/lua/lvim/lsp/manager.lua
@@ -1,7 +1,30 @@
 local M = {}
 
 local Log = require "lvim.core.log"
+local fmt = string.format
 local lvim_lsp_utils = require "lvim.lsp.utils"
+local is_windows = vim.loop.os_uname().version:match "Windows"
+
+local function resolve_mason_config(server_name)
+  local found, mason_config = pcall(require, "mason-lspconfig.server_configurations." .. server_name)
+  if not found then
+    Log:debug(fmt("mason configuration not found for %s", server_name))
+    return {}
+  end
+  local server_mapping = require "mason-lspconfig.mappings.server"
+  local path = require "mason-core.path"
+  local pkg_name = server_mapping.lspconfig_to_package[server_name]
+  local install_dir = path.package_prefix(pkg_name)
+  local conf = mason_config(install_dir)
+  if is_windows and conf.cmd and conf.cmd[1] then
+    local exepath = vim.fn.exepath(conf.cmd[1])
+    if exepath ~= "" then
+      conf.cmd[1] = exepath
+    end
+  end
+  Log:debug(fmt("resolved mason configuration for %s, got %s", server_name, vim.inspect(mason_config)))
+  return mason_config or {}
+end
 
 ---Resolve the configuration for a server by merging with the default config
 ---@param server_name string
@@ -65,35 +88,45 @@ function M.setup(server_name, user_config)
     return
   end
 
-  local servers = require "nvim-lsp-installer.servers"
-  local server_available, server = servers.get_server(server_name)
+  local server_mapping = require "mason-lspconfig.mappings.server"
+  local registry = require "mason-registry"
 
-  if not server_available then
+  local pkg_name = server_mapping.lspconfig_to_package[server_name]
+  if not pkg_name then
     local config = resolve_config(server_name, user_config)
     launch_server(server_name, config)
     return
   end
 
-  local install_in_progress = false
+  local should_auto_install = function()
+    local installer_settings = lvim.lsp.installer.setup
+    return installer_settings.automatic_installation
+      and not vim.tbl_contains(installer_settings.automatic_installation.exclude, server_name)
+  end
 
-  if not server:is_installed() then
-    if lvim.lsp.automatic_servers_installation then
+  if not registry.is_installed(pkg_name) then
+    if should_auto_install(server_name) then
       Log:debug "Automatic server installation detected"
-      server:install()
-      install_in_progress = true
+      vim.notify_once(string.format("Installation in progoress for [%s] server", server_name), vim.log.levels.INFO)
+      local pkg = registry.get_package(pkg_name)
+      pkg:install():once("closed", function()
+        if pkg:is_installed() then
+          vim.schedule(function()
+            vim.notify_once(string.format("Installation complete for [%s] server", server_name), vim.log.levels.INFO)
+            -- mason config is only available once the server has been installed
+            local config = resolve_config(server_name, resolve_mason_config(server_name), user_config)
+            launch_server(server_name, config)
+          end)
+        end
+      end)
+      return
     else
-      Log:debug(server.name .. " is not managed by the automatic installer")
+      Log:debug(server_name .. " is not managed by the automatic installer")
     end
   end
 
-  server:on_ready(function()
-    if install_in_progress then
-      vim.notify(string.format("Installation complete for [%s] server", server.name), vim.log.levels.INFO)
-    end
-    install_in_progress = false
-    local config = resolve_config(server_name, server:get_default_options(), user_config)
-    launch_server(server_name, config)
-  end)
+  local config = resolve_config(server_name, resolve_mason_config(server_name), user_config)
+  launch_server(server_name, config)
 end
 
 return M
diff --git a/lua/lvim/lsp/templates.lua b/lua/lvim/lsp/templates.lua
index 578362a7..dc2e5b11 100644
--- a/lua/lvim/lsp/templates.lua
+++ b/lua/lvim/lsp/templates.lua
@@ -56,21 +56,12 @@ end
 ---The files are generated to a runtimepath: "$LUNARVIM_RUNTIME_DIR/site/after/ftplugin/template.lua"
 ---@param servers_names? table list of servers to be enabled. Will add all by default
 function M.generate_templates(servers_names)
-  servers_names = servers_names or {}
+  servers_names = servers_names or lvim_lsp_utils.get_supported_servers()
 
   Log:debug "Templates installation in progress"
 
   M.remove_template_files()
 
-  if vim.tbl_isempty(servers_names) then
-    local available_servers = require("nvim-lsp-installer.servers").get_available_servers()
-
-    for _, server in pairs(available_servers) do
-      table.insert(servers_names, server.name)
-      table.sort(servers_names)
-    end
-  end
-
   -- create the directory if it didn't exist
   if not utils.is_directory(lvim.lsp.templates_dir) then
     vim.fn.mkdir(ftplugin_dir, "p")
diff --git a/lua/lvim/lsp/utils.lua b/lua/lvim/lsp/utils.lua
index fa1ac6d9..b92ef11c 100644
--- a/lua/lvim/lsp/utils.lua
+++ b/lua/lvim/lsp/utils.lua
@@ -51,37 +51,34 @@ 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
+---@return string[] supported filestypes as a list of strings
 function M.get_supported_filetypes(server_name)
-  local status_ok, lsp_installer_servers = pcall(require, "nvim-lsp-installer.servers")
+  local status_ok, config = pcall(require, ("lspconfig.server_configurations.%s"):format(server_name))
   if not status_ok then
     return {}
   end
 
-  local server_available, requested_server = lsp_installer_servers.get_server(server_name)
-  if not server_available then
-    return {}
-  end
-
-  return requested_server:get_supported_filetypes()
+  return config.default_config.filetypes or {}
 end
 
 ---Get supported servers per filetype
----@param filetype string
----@return table list of names of supported servers
-function M.get_supported_servers_per_filetype(filetype)
-  local filetype_server_map = require "nvim-lsp-installer._generated.filetype_map"
-  return filetype_server_map[filetype]
+---@param filter { filetype: string | string[] }?: (optional) Used to filter the list of server names.
+---@return string[] list of names of supported servers
+function M.get_supported_servers(filter)
+  local _, supported_servers = pcall(function()
+    return require("mason-lspconfig").get_available_servers(filter)
+  end)
+  return supported_servers or {}
 end
 
 ---Get all supported filetypes by nvim-lsp-installer
----@return table supported filestypes as a list of strings
+---@return string[] 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")
+  local status_ok, filetype_server_map = pcall(require, "mason-lspconfig.mappings.filetype")
   if not status_ok then
     return {}
   end
-  return vim.tbl_keys(lsp_installer_filetypes or {})
+  return vim.tbl_keys(filetype_server_map or {})
 end
 
 function M.setup_document_highlight(client, bufnr)
diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua
index fec91bc9..24f71204 100644
--- a/lua/lvim/plugins.lua
+++ b/lua/lvim/plugins.lua
@@ -7,8 +7,12 @@ local core_plugins = {
     "jose-elias-alvarez/null-ls.nvim",
   },
   { "antoinemadec/FixCursorHold.nvim" }, -- Needed while issue https://github.com/neovim/neovim/issues/12587 is still open
+  { "williamboman/mason-lspconfig.nvim" },
   {
-    "williamboman/nvim-lsp-installer",
+    "williamboman/mason.nvim",
+    config = function()
+      require("lvim.core.mason").setup()
+    end,
   },
   {
     "lunarvim/onedarker.nvim",
-- 
cgit v1.2.3


From 5f9a0a5b203fa16acf433296f11a3fb93725785e Mon Sep 17 00:00:00 2001
From: Dlani <dlanileonardo@gmail.com>
Date: Tue, 9 Aug 2022 08:15:20 -0300
Subject: fix: handle deprecated telescope.builtin.internal (#2885)

---
 lua/lvim/core/which-key.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lua')

diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index 6d0dc9fc..b1cfdc03 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -252,7 +252,7 @@ M.config = function()
         k = { "<cmd>Telescope keymaps<cr>", "Keymaps" },
         C = { "<cmd>Telescope commands<cr>", "Commands" },
         p = {
-          "<cmd>lua require('telescope.builtin.internal').colorscheme({enable_preview = true})<cr>",
+          "<cmd>lua require('telescope.builtin').colorscheme({enable_preview = true})<cr>",
           "Colorscheme with Preview",
         },
       },
-- 
cgit v1.2.3


From 67366cdf89e98c285eef57a9282fc61c06aeb789 Mon Sep 17 00:00:00 2001
From: lvimuser <109605931+lvimuser@users.noreply.github.com>
Date: Tue, 9 Aug 2022 08:27:47 -0300
Subject: feat(lvim/lsp): enable tailwindcss by default (#2870)

---
 lua/lvim/lsp/config.lua                | 1 -
 lua/lvim/lsp/providers/tailwindcss.lua | 8 ++++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 lua/lvim/lsp/providers/tailwindcss.lua

(limited to 'lua')

diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 41290787..2cd1bc6e 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -30,7 +30,6 @@ local skipped_servers = {
   "sqlls",
   "sqls",
   "stylelint_lsp",
-  "tailwindcss",
   "tflint",
   "svlangserver",
   "verible",
diff --git a/lua/lvim/lsp/providers/tailwindcss.lua b/lua/lvim/lsp/providers/tailwindcss.lua
new file mode 100644
index 00000000..063cf89f
--- /dev/null
+++ b/lua/lvim/lsp/providers/tailwindcss.lua
@@ -0,0 +1,8 @@
+local opts = {
+  root_dir = function(fname)
+    local util = require "lspconfig/util"
+    return util.root_pattern("tailwind.config.js", "tailwind.config.cjs", "tailwind.js", "tailwind.cjs")(fname)
+  end,
+}
+
+return opts
-- 
cgit v1.2.3


From 3bc52f9988a58e3e1a2a48ee2299383d967a1573 Mon Sep 17 00:00:00 2001
From: Myles Mo <54089360+emxxjnm@users.noreply.github.com>
Date: Tue, 9 Aug 2022 19:32:35 +0800
Subject: fix(lualine): set icon color according to the status of treesitter
 (#2754)

Co-authored-by: emxxjnm <emxxjnm@example>
---
 lua/lvim/core/lualine/components.lua | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/core/lualine/components.lua b/lua/lvim/core/lualine/components.lua
index 49a8ff81..5095cfb4 100644
--- a/lua/lvim/core/lualine/components.lua
+++ b/lua/lvim/core/lualine/components.lua
@@ -70,13 +70,13 @@ return {
   },
   treesitter = {
     function()
-      local b = vim.api.nvim_get_current_buf()
-      if next(vim.treesitter.highlighter.active[b]) then
-        return ""
-      end
-      return ""
+      return ""
+    end,
+    color = function()
+      local buf = vim.api.nvim_get_current_buf()
+      local ts = vim.treesitter.highlighter.active[buf]
+      return { fg = ts and not vim.tbl_isempty(ts) and colors.green or colors.red }
     end,
-    color = { fg = colors.green },
     cond = conditions.hide_in_width,
   },
   lsp = {
-- 
cgit v1.2.3


From 2e4620cb4f3ffea328f8b0e57daa42d8f54024e8 Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Tue, 9 Aug 2022 16:11:45 +0200
Subject: fix(lsp): return the actual resolved mason-config (#2889)

---
 lua/lvim/lsp/manager.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/lsp/manager.lua b/lua/lvim/lsp/manager.lua
index aa76af6c..258a4983 100644
--- a/lua/lvim/lsp/manager.lua
+++ b/lua/lvim/lsp/manager.lua
@@ -22,8 +22,8 @@ local function resolve_mason_config(server_name)
       conf.cmd[1] = exepath
     end
   end
-  Log:debug(fmt("resolved mason configuration for %s, got %s", server_name, vim.inspect(mason_config)))
-  return mason_config or {}
+  Log:debug(fmt("resolved mason configuration for %s, got %s", server_name, vim.inspect(conf)))
+  return conf or {}
 end
 
 ---Resolve the configuration for a server by merging with the default config
@@ -107,12 +107,12 @@ function M.setup(server_name, user_config)
   if not registry.is_installed(pkg_name) then
     if should_auto_install(server_name) then
       Log:debug "Automatic server installation detected"
-      vim.notify_once(string.format("Installation in progoress for [%s] server", server_name), vim.log.levels.INFO)
+      vim.notify_once(string.format("Installation in progress for [%s]", server_name), vim.log.levels.INFO)
       local pkg = registry.get_package(pkg_name)
       pkg:install():once("closed", function()
         if pkg:is_installed() then
           vim.schedule(function()
-            vim.notify_once(string.format("Installation complete for [%s] server", server_name), vim.log.levels.INFO)
+            vim.notify_once(string.format("Installation complete for [%s]", server_name), vim.log.levels.INFO)
             -- mason config is only available once the server has been installed
             local config = resolve_config(server_name, resolve_mason_config(server_name), user_config)
             launch_server(server_name, config)
-- 
cgit v1.2.3


From 45f9825d1e666890ed37baf15a14707ae40e5cff Mon Sep 17 00:00:00 2001
From: Benedikt Schnatterbeck <48836135+benediktms@users.noreply.github.com>
Date: Fri, 12 Aug 2022 17:01:11 +0100
Subject: refactor(keymaps)!: don't hijack H/L by default (#2874)

---
 lua/lvim/keymappings.lua | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/keymappings.lua b/lua/lvim/keymappings.lua
index 8c91b761..63835f75 100644
--- a/lua/lvim/keymappings.lua
+++ b/lua/lvim/keymappings.lua
@@ -61,10 +61,6 @@ local defaults = {
     ["<C-Left>"] = ":vertical resize -2<CR>",
     ["<C-Right>"] = ":vertical resize +2<CR>",
 
-    -- Tab switch buffer
-    ["<S-l>"] = ":BufferLineCycleNext<CR>",
-    ["<S-h>"] = ":BufferLineCyclePrev<CR>",
-
     -- Move current line / block with Alt-j/k a la vscode.
     ["<A-j>"] = ":m .+1<CR>==",
     ["<A-k>"] = ":m .-2<CR>==",
-- 
cgit v1.2.3


From d259efd40b2ebab57ff364da565e280981fec410 Mon Sep 17 00:00:00 2001
From: Akihiro Okuno <choplin.choplin@gmail.com>
Date: Fri, 19 Aug 2022 18:50:52 +0900
Subject: fix(statusline): display null-ls linters properly (#2921)

---
 lua/lvim/lsp/null-ls/linters.lua | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'lua')

diff --git a/lua/lvim/lsp/null-ls/linters.lua b/lua/lvim/lsp/null-ls/linters.lua
index 07c8094b..ba7670d3 100644
--- a/lua/lvim/lsp/null-ls/linters.lua
+++ b/lua/lvim/lsp/null-ls/linters.lua
@@ -6,9 +6,19 @@ local null_ls = require "null-ls"
 local services = require "lvim.lsp.null-ls.services"
 local method = null_ls.methods.DIAGNOSTICS
 
+local alternative_methods = {
+  null_ls.methods.DIAGNOSTICS,
+  null_ls.methods.DIAGNOSTICS_ON_OPEN,
+  null_ls.methods.DIAGNOSTICS_ON_SAVE,
+}
+
 function M.list_registered(filetype)
   local registered_providers = services.list_registered_providers_names(filetype)
-  return registered_providers[method] or {}
+  local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
+    return registered_providers[m] or {}
+  end, alternative_methods))
+
+  return providers_for_methods
 end
 
 function M.list_supported(filetype)
-- 
cgit v1.2.3


From 0fc1e423097485035bd6c1f19d64ce8424387ca9 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 20 Aug 2022 11:06:34 +0200
Subject: chore: bump plugins version (#2895)

---
 lua/lvim/core/bufferline.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/core/bufferline.lua b/lua/lvim/core/bufferline.lua
index 28e0f06d..7e8f1376 100644
--- a/lua/lvim/core/bufferline.lua
+++ b/lua/lvim/core/bufferline.lua
@@ -45,10 +45,10 @@ M.config = function()
     },
     highlights = {
       background = {
-        gui = "italic",
+        italic = true,
       },
       buffer_selected = {
-        gui = "bold",
+        bold = true,
       },
     },
     options = {
-- 
cgit v1.2.3


From 06fa62e6e9ea9b362d3c2340f4f4f843eb3cbc14 Mon Sep 17 00:00:00 2001
From: "Ed (Wright) Rosewright" <edmundrosewright@gmail.com>
Date: Mon, 22 Aug 2022 22:24:38 +0900
Subject: fix: update key bindings for comment.nvim to use new api (#2926)

---
 lua/lvim/core/which-key.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/core/which-key.lua b/lua/lvim/core/which-key.lua
index b1cfdc03..2301943f 100644
--- a/lua/lvim/core/which-key.lua
+++ b/lua/lvim/core/which-key.lua
@@ -76,13 +76,13 @@ M.config = function()
     -- NOTE: Prefer using : over <cmd> as the latter avoids going back in normal-mode.
     -- see https://neovim.io/doc/user/map.html#:map-cmd
     vmappings = {
-      ["/"] = { "<ESC><CMD>lua require('Comment.api').toggle_linewise_op(vim.fn.visualmode())<CR>", "Comment" },
+      ["/"] = { "<Plug>(comment_toggle_linewise_visual)", "Comment toggle linewise (visual)" },
     },
     mappings = {
       [";"] = { "<cmd>Alpha<CR>", "Dashboard" },
       ["w"] = { "<cmd>w!<CR>", "Save" },
       ["q"] = { "<cmd>lua require('lvim.utils.functions').smart_quit()<CR>", "Quit" },
-      ["/"] = { "<cmd>lua require('Comment.api').toggle_current_linewise()<CR>", "Comment" },
+      ["/"] = { "<Plug>(comment_toggle_linewise_current)", "Comment toggle current line" },
       ["c"] = { "<cmd>BufferKill<CR>", "Close Buffer" },
       ["f"] = { require("lvim.core.telescope.custom-finders").find_project_files, "Find File" },
       ["h"] = { "<cmd>nohlsearch<CR>", "No Highlight" },
-- 
cgit v1.2.3


From 9fcb6bbd8116caa498433f6ecb47e7acccfd0dcd Mon Sep 17 00:00:00 2001
From: kylo252 <59826753+kylo252@users.noreply.github.com>
Date: Mon, 29 Aug 2022 13:53:58 +0200
Subject: refactor(cmp)!: adapt new recommendations (#2913)

---
 lua/lvim/core/autopairs.lua |   4 ++
 lua/lvim/core/cmp.lua       | 101 +++++++++++++++++++++-----------------------
 2 files changed, 53 insertions(+), 52 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/core/autopairs.lua b/lua/lvim/core/autopairs.lua
index 4d9f33f4..469a38a4 100644
--- a/lua/lvim/core/autopairs.lua
+++ b/lua/lvim/core/autopairs.lua
@@ -79,6 +79,10 @@ M.setup = function()
   if lvim.builtin.autopairs.on_config_done then
     lvim.builtin.autopairs.on_config_done(autopairs)
   end
+  pcall(function()
+    local cmp_autopairs = require "nvim-autopairs.completion.cmp"
+    require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done())
+  end)
 end
 
 return M
diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua
index 942a72f6..10cf56be 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
@@ -1,24 +1,23 @@
 local M = {}
 M.methods = {}
 
----checks if the character preceding the cursor is a space character
----@return boolean true if it is a space character, false otherwise
-local check_backspace = function()
-  local col = vim.fn.col "." - 1
-  return col == 0 or vim.fn.getline("."):sub(col, col):match "%s"
+local has_words_before = function()
+  local line, col = unpack(vim.api.nvim_win_get_cursor(0))
+  return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match "%s" == nil
 end
-M.methods.check_backspace = check_backspace
+M.methods.has_words_before = has_words_before
 
-local function T(str)
+---@deprecated use M.methods.has_words_before instead
+M.methods.check_backspace = function()
+  return not has_words_before()
+end
+
+local T = function(str)
   return vim.api.nvim_replace_termcodes(str, true, true, true)
 end
 
----wraps vim.fn.feedkeys while replacing key codes with escape codes
----Ex: feedkeys("<CR>", "n") becomes feedkeys("^M", "n")
----@param key string
----@param mode string
 local function feedkeys(key, mode)
-  vim.fn.feedkeys(T(key), mode)
+  vim.api.nvim_feedkeys(T(key), mode, true)
 end
 M.methods.feedkeys = feedkeys
 
@@ -28,39 +27,21 @@ M.methods.feedkeys = feedkeys
 local function jumpable(dir)
   local luasnip_ok, luasnip = pcall(require, "luasnip")
   if not luasnip_ok then
-    return
+    return false
   end
 
   local win_get_cursor = vim.api.nvim_win_get_cursor
   local get_current_buf = vim.api.nvim_get_current_buf
 
-  local function inside_snippet()
-    -- for outdated versions of luasnip
-    if not luasnip.session.current_nodes then
-      return false
-    end
-
-    local node = luasnip.session.current_nodes[get_current_buf()]
-    if not node then
-      return false
-    end
-
-    local snip_begin_pos, snip_end_pos = node.parent.snippet.mark:pos_begin_end()
-    local pos = win_get_cursor(0)
-    pos[1] = pos[1] - 1 -- LuaSnip is 0-based not 1-based like nvim for rows
-    return pos[1] >= snip_begin_pos[1] and pos[1] <= snip_end_pos[1]
-  end
-
   ---sets the current buffer's luasnip to the one nearest the cursor
   ---@return boolean true if a node is found, false otherwise
   local function seek_luasnip_cursor_node()
+    -- TODO(kylo252): upstream this
     -- for outdated versions of luasnip
     if not luasnip.session.current_nodes then
       return false
     end
 
-    local pos = win_get_cursor(0)
-    pos[1] = pos[1] - 1
     local node = luasnip.session.current_nodes[get_current_buf()]
     if not node then
       return false
@@ -69,6 +50,9 @@ local function jumpable(dir)
     local snippet = node.parent.snippet
     local exit_node = snippet.insert_nodes[0]
 
+    local pos = win_get_cursor(0)
+    pos[1] = pos[1] - 1
+
     -- exit early if we're past the exit node
     if exit_node then
       local exit_pos_end = exit_node.mark:pos_end()
@@ -124,9 +108,9 @@ local function jumpable(dir)
   end
 
   if dir == -1 then
-    return inside_snippet() and luasnip.jumpable(-1)
+    return luasnip.in_snippet() and luasnip.jumpable(-1)
   else
-    return inside_snippet() and seek_luasnip_cursor_node() and luasnip.jumpable()
+    return luasnip.in_snippet() and seek_luasnip_cursor_node() and luasnip.jumpable(1)
   end
 end
 M.methods.jumpable = jumpable
@@ -241,48 +225,61 @@ M.config = function()
     mapping = cmp.mapping.preset.insert {
       ["<C-k>"] = cmp.mapping.select_prev_item(),
       ["<C-j>"] = cmp.mapping.select_next_item(),
+      ["<Down>"] = cmp.mapping(cmp.mapping.select_next_item { behavior = cmp.SelectBehavior.Select }, { "i" }),
+      ["<Up>"] = cmp.mapping(cmp.mapping.select_prev_item { behavior = cmp.SelectBehavior.Select }, { "i" }),
       ["<C-d>"] = cmp.mapping.scroll_docs(-4),
       ["<C-f>"] = cmp.mapping.scroll_docs(4),
+      ["<C-y>"] = cmp.mapping {
+        i = cmp.mapping.confirm { behavior = cmp.ConfirmBehavior.Replace, select = false },
+        c = function(fallback)
+          if cmp.visible() then
+            cmp.confirm { behavior = cmp.ConfirmBehavior.Replace, select = false }
+          else
+            fallback()
+          end
+        end,
+      },
       ["<Tab>"] = cmp.mapping(function(fallback)
         if cmp.visible() then
           cmp.select_next_item()
-        elseif luasnip.expandable() then
-          luasnip.expand()
-        elseif jumpable() then
+        elseif luasnip.expand_or_locally_jumpable() then
+          luasnip.expand_or_jump()
+        elseif jumpable(1) then
           luasnip.jump(1)
-        elseif check_backspace() then
-          fallback()
+        elseif has_words_before() then
+          cmp.complete()
         else
           fallback()
         end
-      end, {
-        "i",
-        "s",
-      }),
+      end, { "i", "s" }),
       ["<S-Tab>"] = cmp.mapping(function(fallback)
         if cmp.visible() then
           cmp.select_prev_item()
-        elseif jumpable(-1) then
+        elseif luasnip.jumpable(-1) then
           luasnip.jump(-1)
         else
           fallback()
         end
-      end, {
-        "i",
-        "s",
-      }),
-
+      end, { "i", "s" }),
       ["<C-Space>"] = cmp.mapping.complete(),
       ["<C-e>"] = cmp.mapping.abort(),
       ["<CR>"] = cmp.mapping(function(fallback)
-        if cmp.visible() and cmp.confirm(lvim.builtin.cmp.confirm_opts) then
-          if jumpable() then
+        if cmp.visible() then
+          local confirm_opts = lvim.builtin.cmp.confirm_opts
+          local is_insert_mode = function()
+            return vim.api.nvim_get_mode().mode:sub(1, 1) == "i"
+          end
+          if is_insert_mode() then -- prevent overwriting brackets
+            confirm_opts.behavior = cmp.ConfirmBehavior.Insert
+          end
+          cmp.confirm(confirm_opts)
+          if jumpable(1) then
             luasnip.jump(1)
           end
           return
         end
 
-        if jumpable() then
+        if jumpable(1) then
           if not luasnip.jump(1) then
             fallback()
           end
-- 
cgit v1.2.3


From 537a192179c1123618489b2faaf58204d899f3a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Rodr=C3=ADguez=20Rivero?= <rdanielo@gmail.com>
Date: Mon, 29 Aug 2022 14:04:46 +0200
Subject: fix(lsp): pass name arg to should_auto_install (#2958)

---
 lua/lvim/lsp/manager.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/lsp/manager.lua b/lua/lvim/lsp/manager.lua
index 258a4983..1323ace7 100644
--- a/lua/lvim/lsp/manager.lua
+++ b/lua/lvim/lsp/manager.lua
@@ -98,10 +98,10 @@ function M.setup(server_name, user_config)
     return
   end
 
-  local should_auto_install = function()
+  local should_auto_install = function(name)
     local installer_settings = lvim.lsp.installer.setup
     return installer_settings.automatic_installation
-      and not vim.tbl_contains(installer_settings.automatic_installation.exclude, server_name)
+      and not vim.tbl_contains(installer_settings.automatic_installation.exclude, name)
   end
 
   if not registry.is_installed(pkg_name) then
-- 
cgit v1.2.3


From 68e8132b909dab6a748340f81c4b3a6ef452079d Mon Sep 17 00:00:00 2001
From: zenVentzi <11378653+zenVentzi@users.noreply.github.com>
Date: Mon, 29 Aug 2022 15:13:57 +0300
Subject: fix(ts_context_commentstring): block comment match new api (#2948)

---
 lua/lvim/core/comment.lua | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'lua')

diff --git a/lua/lvim/core/comment.lua b/lua/lvim/core/comment.lua
index 86a2091a..d07739c6 100644
--- a/lua/lvim/core/comment.lua
+++ b/lua/lvim/core/comment.lua
@@ -3,8 +3,24 @@ local M = {}
 function M.config()
   local pre_hook = nil
   if lvim.builtin.treesitter.context_commentstring.enable then
-    pre_hook = function(_ctx)
-      return require("ts_context_commentstring.internal").calculate_commentstring()
+    pre_hook = function(ctx)
+      local U = require "Comment.utils"
+
+      -- Determine whether to use linewise or blockwise commentstring
+      local type = ctx.ctype == U.ctype.linewise and "__default" or "__multiline"
+
+      -- Determine the location where to calculate commentstring from
+      local location = nil
+      if ctx.ctype == U.ctype.blockwise then
+        location = require("ts_context_commentstring.utils").get_cursor_location()
+      elseif ctx.cmotion == U.cmotion.v or ctx.cmotion == U.cmotion.V then
+        location = require("ts_context_commentstring.utils").get_visual_start_location()
+      end
+
+      return require("ts_context_commentstring.internal").calculate_commentstring {
+        key = type,
+        location = location,
+      }
     end
   end
   lvim.builtin.comment = {
-- 
cgit v1.2.3