Merge remote-tracking branch 'origin/rolling'

6 files changed, 24 insertions, 30 deletions

diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua
index 10cf56be..7b0b0e6e 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
@@ -265,7 +265,7 @@ M.config = function()
       ["<C-e>"] = cmp.mapping.abort(),
       ["<CR>"] = cmp.mapping(function(fallback)
         if cmp.visible() then
-          local confirm_opts = lvim.builtin.cmp.confirm_opts
+          local confirm_opts = vim.deepcopy(lvim.builtin.cmp.confirm_opts) -- avoid mutating the original opts below
           local is_insert_mode = function()
             return vim.api.nvim_get_mode().mode:sub(1, 1) == "i"
           end
diff --git a/lua/lvim/core/lualine/components.lua b/lua/lvim/core/lualine/components.lua
index 5095cfb4..c88bf82b 100644
--- a/lua/lvim/core/lualine/components.lua
+++ b/lua/lvim/core/lualine/components.lua
@@ -47,15 +47,10 @@ return {
     function()
       local utils = require "lvim.core.lualine.utils"
       if vim.bo.filetype == "python" then
-        local venv = os.getenv "CONDA_DEFAULT_ENV"
+        local venv = os.getenv "CONDA_DEFAULT_ENV" or os.getenv "VIRTUAL_ENV"
         if venv then
           return string.format("  (%s)", utils.env_cleanup(venv))
         end
-        venv = os.getenv "VIRTUAL_ENV"
-        if venv then
-          return string.format("  (%s)", utils.env_cleanup(venv))
-        end
-        return ""
       end
       return ""
     end,
diff --git a/lua/lvim/lsp/config.lua b/lua/lvim/lsp/config.lua
index 2cd1bc6e..96a1b823 100644
--- a/lua/lvim/lsp/config.lua
+++ b/lua/lvim/lsp/config.lua
@@ -64,12 +64,11 @@ return {
       header = "",
       prefix = "",
       format = function(d)
-        local t = vim.deepcopy(d)
         local code = d.code or (d.user_data and d.user_data.lsp.code)
         if code then
-          t.message = string.format("%s [%s]", t.message, code):gsub("1. ", "")
+          return string.format("%s [%s]", d.message, code):gsub("1. ", "")
         end
-        return t.message
+        return d.message
       end,
     },
   },
diff --git a/snapshots/default.json b/snapshots/default.json
index 84990838..29822342 100644
--- a/snapshots/default.json
+++ b/snapshots/default.json
@@ -1,15 +1,15 @@
 {
   "Comment.nvim": {
-    "commit": "80e7746"
+    "commit": "30d23aa"
   },
   "FixCursorHold.nvim": {
     "commit": "5aa5ff1"
   },
   "LuaSnip": {
-    "commit": "9f454cc"
+    "commit": "a45cd5f"
   },
   "alpha-nvim": {
-    "commit": "f457f7f"
+    "commit": "09e5374"
   },
   "bufferline.nvim": {
     "commit": "13a532e"
@@ -33,7 +33,7 @@
     "commit": "e5a16f9"
   },
   "gitsigns.nvim": {
-    "commit": "1e107c9"
+    "commit": "d7e0bcb"
   },
   "lua-dev.nvim": {
     "commit": "54149d1"
@@ -42,37 +42,37 @@
     "commit": "3cf4540"
   },
   "mason-lspconfig.nvim": {
-    "commit": "74c45b3"
+    "commit": "328eb72"
   },
   "mason.nvim": {
-    "commit": "9249238"
+    "commit": "f1cb597"
   },
   "nlsp-settings.nvim": {
-    "commit": "1ffdeff"
+    "commit": "633feef"
   },
   "null-ls.nvim": {
-    "commit": "753ad51"
+    "commit": "7cd491b"
   },
   "nvim-autopairs": {
     "commit": "0a18e10"
   },
   "nvim-cmp": {
-    "commit": "058100d"
+    "commit": "33fbb2c"
   },
   "nvim-dap": {
-    "commit": "57003a0"
+    "commit": "ea25d6d"
   },
   "nvim-lspconfig": {
-    "commit": "636ce36"
+    "commit": "0fafc3e"
   },
   "nvim-notify": {
-    "commit": "cf5dc4f"
+    "commit": "6b779c9"
   },
   "nvim-tree.lua": {
-    "commit": "4a725c0"
+    "commit": "951e10a"
   },
   "nvim-treesitter": {
-    "commit": "f3c53d2"
+    "commit": "1506334"
   },
   "nvim-ts-context-commentstring": {
     "commit": "4d3a68c"
@@ -84,10 +84,10 @@
     "commit": "b00dd21"
   },
   "packer.nvim": {
-    "commit": "3a9f980"
+    "commit": "537669b"
   },
   "plenary.nvim": {
-    "commit": "a3dafaa"
+    "commit": "4b66054"
   },
   "popup.nvim": {
     "commit": "b7404d3"
@@ -96,7 +96,7 @@
     "commit": "090bb11"
   },
   "schemastore.nvim": {
-    "commit": "8f3a6e8"
+    "commit": "e729173"
   },
   "structlog.nvim": {
     "commit": "232a8e2"
@@ -108,7 +108,7 @@
     "commit": "8dce937"
   },
   "toggleterm.nvim": {
-    "commit": "f494c61"
+    "commit": "7abb25e"
   },
   "which-key.nvim": {
     "commit": "f03a259"
diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua
index 65662794..26a50edc 100644
--- a/utils/installer/config.example.lua
+++ b/utils/installer/config.example.lua
@@ -111,7 +111,7 @@ lvim.builtin.treesitter.highlight.enabled = true
 
 -- ---remove a server from the skipped list, e.g. eslint, or emmet_ls. !!Requires `:LvimCacheReset` to take effect!!
 -- ---`:LvimInfo` lists which server(s) are skipped for the current filetype
--- vim.tbl_map(function(server)
+-- lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
 --   return server ~= "emmet_ls"
 -- end, lvim.lsp.automatic_configuration.skipped_servers)
 
diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua
index 6e9a1ba0..872e6270 100644
--- a/utils/installer/config_win.example.lua
+++ b/utils/installer/config_win.example.lua
@@ -126,7 +126,7 @@ lvim.builtin.treesitter.highlight.enabled = true
 
 -- ---remove a server from the skipped list, e.g. eslint, or emmet_ls. !!Requires `:LvimCacheReset` to take effect!!
 -- ---`:LvimInfo` lists which server(s) are skipped for the current filetype
--- vim.tbl_map(function(server)
+-- lvim.lsp.automatic_configuration.skipped_servers = vim.tbl_filter(function(server)
 --   return server ~= "emmet_ls"
 -- end, lvim.lsp.automatic_configuration.skipped_servers)