diff options
| author | Christian Chiarulli <[email protected]> | 2021-09-05 18:13:28 -0400 |
|---|---|---|
| committer | Christian Chiarulli <[email protected]> | 2021-09-05 18:13:28 -0400 |
| commit | 9eeb4f23da3967c1b01e26853163b47f5dcbdc2e (patch) | |
| tree | 2cf772efc6df73ea5f5c042eece258c3874a2e0a | |
| parent | cc6685e397a2effa6ea8346a58919d2c38c46293 (diff) | |
| parent | 4371ddbbc7d40734a69c3ba81636cb362fdd391e (diff) | |
Merge branch 'rolling' of github.com:LunarVim/LunarVim into rolling
| -rw-r--r-- | lua/core/lualine/components.lua | 5 | ||||
| -rw-r--r-- | lua/plugins.lua | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lua/core/lualine/components.lua b/lua/core/lualine/components.lua index 894d9e9b..3d3ac9af 100644 --- a/lua/core/lualine/components.lua +++ b/lua/core/lualine/components.lua @@ -81,9 +81,12 @@ return { }, lsp = { function(msg) - msg = msg or "LSP Inactive" + msg = msg or "LS Inactive" local buf_clients = vim.lsp.buf_get_clients() if next(buf_clients) == nil then + if #msg == 0 then + return "LS Inactive" + end return msg end local buf_ft = vim.bo.filetype diff --git a/lua/plugins.lua b/lua/plugins.lua index 8a0692f2..98721c6c 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -116,7 +116,7 @@ return { "terrortylor/nvim-comment", event = "BufRead", config = function() - require("nvim_comment").setup() + require("core.comment").setup() end, disable = not lvim.builtin.comment.active, }, |