diff options
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/lvim/core/cmp.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/core/lualine/components.lua | 7 | ||||
| -rw-r--r-- | lua/lvim/lsp/config.lua | 5 |
3 files changed, 4 insertions, 10 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, }, }, |