From a1557d65de4e79782a5c15df6f8930960585468a Mon Sep 17 00:00:00 2001 From: CPea <42694704+cpea2506@users.noreply.github.com> Date: Tue, 4 Jan 2022 15:44:54 +0700 Subject: fix(lsp): formatter now use new null-ls api function (#2135) --- lua/lvim/lsp/init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lua') diff --git a/lua/lvim/lsp/init.lua b/lua/lvim/lsp/init.lua index 0be13484..308eba1d 100644 --- a/lua/lvim/lsp/init.lua +++ b/lua/lvim/lsp/init.lua @@ -73,7 +73,7 @@ local function select_default_formater(client) local formatters = require "lvim.lsp.null-ls.formatters" local client_filetypes = client.config.filetypes or {} for _, filetype in ipairs(client_filetypes) do - if #vim.tbl_keys(formatters.list_registered_providers(filetype)) > 0 then + if #vim.tbl_keys(formatters.list_registered(filetype)) > 0 then Log:debug("Formatter overriding detected. Disabling formatting capabilities for " .. client.name) client.resolved_capabilities.document_formatting = false client.resolved_capabilities.document_range_formatting = false -- cgit v1.2.3 From 60e0e1a8315604665a7f7db2ef78480bac543b21 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 4 Jan 2022 09:47:59 +0100 Subject: refactor(settings): add headless-mode settings (#2134) --- lua/lvim/config/defaults.lua | 1 - lua/lvim/config/init.lua | 5 +++-- lua/lvim/config/settings.lua | 44 +++++++++++++++++++++----------------------- lua/lvim/core/autocmds.lua | 11 +++++++++++ 4 files changed, 35 insertions(+), 26 deletions(-) (limited to 'lua') diff --git a/lua/lvim/config/defaults.lua b/lua/lvim/config/defaults.lua index a5c81a01..fe2780eb 100644 --- a/lua/lvim/config/defaults.lua +++ b/lua/lvim/config/defaults.lua @@ -1,7 +1,6 @@ return { leader = "space", colorscheme = "onedarker", - line_wrap_cursor_movement = true, transparent_window = false, format_on_save = { ---@usage pattern string pattern used for the autocommand (Default: '*') diff --git a/lua/lvim/config/init.lua b/lua/lvim/config/init.lua index 145173b1..de06aa89 100644 --- a/lua/lvim/config/init.lua +++ b/lua/lvim/config/init.lua @@ -95,8 +95,9 @@ function M:load(config_path) require("lvim.keymappings").load(lvim.keys) - local settings = require "lvim.config.settings" - settings.load_commands() + if lvim.transparent_window then + autocmds.enable_transparent_mode() + end end --- Override the configuration with a user provided one diff --git a/lua/lvim/config/settings.lua b/lua/lvim/config/settings.lua index d784ce60..5d635b84 100644 --- a/lua/lvim/config/settings.lua +++ b/lua/lvim/config/settings.lua @@ -1,6 +1,7 @@ local M = {} -local utils = require "lvim.utils" -M.load_options = function() +local join_paths = require("lvim.utils").join_paths + +M.load_default_options = function() local default_options = { backup = false, -- creates a backup file clipboard = "unnamedplus", -- allows neovim to access the system clipboard @@ -28,7 +29,7 @@ M.load_options = function() timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds) title = true, -- set the title of window to the value of the titlestring -- opt.titlestring = "%<%F%=%l/%L - nvim" -- what the title of the window will be set to - undodir = utils.join_paths(get_cache_dir(), "undo"), -- set an undo directory + undodir = join_paths(get_cache_dir(), "undo"), -- set an undo directory undofile = true, -- enable persistent undo updatetime = 300, -- faster completion writebackup = false, -- if a file is being edited by another program (or was written to file while editing with another program), it is not allowed to be edited @@ -43,38 +44,35 @@ M.load_options = function() wrap = false, -- display lines as one long line spell = false, spelllang = "en", - spellfile = utils.join_paths(get_config_dir(), "spell", "en.utf-8.add"), - scrolloff = 8, -- is one of my fav - sidescrolloff = 8, + spellfile = join_paths(get_config_dir(), "spell", "en.utf-8.add"), + shadafile = join_paths(get_cache_dir(), "lvim.shada"), + scrolloff = 8, -- minimal number of screen lines to keep above and below the cursor. + sidescrolloff = 8, -- minimal number of screen lines to keep left and right of the cursor. } --- SETTINGS --- - vim.opt.shortmess:append "c" - - vim.opt.shadafile = utils.join_paths(get_cache_dir(), "lvim.shada") + vim.opt.whichwrap:append "<,>,[,],h,l" for k, v in pairs(default_options) do vim.opt[k] = v end end -M.load_commands = function() - local cmd = vim.cmd - if lvim.line_wrap_cursor_movement then - cmd "set whichwrap+=<,>,[,],h,l" - end +M.load_headless_options = function() + vim.opt.shortmess = "" -- try to prevent echom from cutting messages off or prompting + vim.opt.more = false -- don't pause listing when screen is filled + vim.opt.cmdheight = 9999 -- helps avoiding |hit-enter| prompts. + vim.opt.columns = 9999 -- set the widest screen possible + vim.opt.swapfile = false -- don't use a swap file +end - if lvim.transparent_window then - cmd "au ColorScheme * hi Normal ctermbg=none guibg=none" - cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none" - cmd "au ColorScheme * hi NormalNC ctermbg=none guibg=none" - cmd "au ColorScheme * hi MsgArea ctermbg=none guibg=none" - cmd "au ColorScheme * hi TelescopeBorder ctermbg=none guibg=none" - cmd "au ColorScheme * hi NvimTreeNormal ctermbg=none guibg=none" - cmd "au ColorScheme * hi EndOfBuffer ctermbg=none guibg=none" - cmd "let &fcs='eob: '" +M.load_options = function() + if #vim.api.nvim_list_uis() == 0 then + M.load_headless_options() + return end + M.load_default_options() end return M diff --git a/lua/lvim/core/autocmds.lua b/lua/lvim/core/autocmds.lua index 712fd323..804d7790 100644 --- a/lua/lvim/core/autocmds.lua +++ b/lua/lvim/core/autocmds.lua @@ -150,6 +150,17 @@ function M.disable_code_lens_refresh() M.disable_augroup "lsp_code_lens_refresh" end +function M.enable_transparent_mode() + vim.cmd "au ColorScheme * hi Normal ctermbg=none guibg=none" + vim.cmd "au ColorScheme * hi SignColumn ctermbg=none guibg=none" + vim.cmd "au ColorScheme * hi NormalNC ctermbg=none guibg=none" + vim.cmd "au ColorScheme * hi MsgArea ctermbg=none guibg=none" + vim.cmd "au ColorScheme * hi TelescopeBorder ctermbg=none guibg=none" + vim.cmd "au ColorScheme * hi NvimTreeNormal ctermbg=none guibg=none" + vim.cmd "au ColorScheme * hi EndOfBuffer ctermbg=none guibg=none" + vim.cmd "let &fcs='eob: '" +end + --- Disable autocommand groups if it exists --- This is more reliable than trying to delete the augroup itself ---@param name string the augroup name -- cgit v1.2.3 From 3f40828d1d8b2ec2c26ccd34b9ecc7694eb4f570 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 4 Jan 2022 10:22:52 +0100 Subject: chore: plugin version bump (#2136) --- lua/lvim/plugins.lua | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'lua') diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index 0d429ff0..0b58c791 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -1,27 +1,27 @@ local commit = { barbar = "6e638309efcad2f308eb9c5eaccf6f62b794bbab", - cmp_buffer = "a01cfeca70594f505b2f086501e90fb6c2f2aaaa", - cmp_luasnip = "7bd2612533db6863381193df83f9934b373b21e1", + cmp_buffer = "f83773e2f433a923997c5faad7ea689ec24d1785", + cmp_luasnip = "d6f837f4e8fe48eeae288e638691b91b97d1737f", cmp_nvim_lsp = "134117299ff9e34adde30a735cd8ca9cf8f3db81", cmp_path = "4d58224e315426e5ac4c5b218ca86cab85f80c79", - comment = "1840a1c085d9f662de4f3cb36fc577a305628b8d", + comment = "90df2f87c0b17193d073d1f72cea2e528e5b162d", dapinstall = "dd09e9dd3a6e29f02ac171515b8a089fb82bb425", fixcursorhold = "0e4e22d21975da60b0fd2d302285b3b603f9f71e", - friendly_snippets = "2c96761c3dbeb786875712961fcadb7aa4e16864", + friendly_snippets = "9f04462bcabfd108341a6e47ed742b09a6a5b975", gitsigns = "c18fc65c77abf95ac2e7783b9e7455a7a2fab26c", lua_dev = "03a44ec6a54b0a025a633978e8541584a02e46d9", - lualine = "a11f6d15d4d8c9ca9105838d3087ac6281bb6acc", - luasnip = "b5a72f1fbde545be101fcd10b70bcd51ea4367de", + lualine = "4b68b8dd2aa5bb74fe8cd058797322d81df1f455", + luasnip = "ed0140696fa99ea072bc485c87d22a396c477db3", nlsp_settings = "1b376a0b7dc60238e835dd0467135ba9a1557ec7", - null_ls = "0327c839c79b1e5087dac7c47dc3c0c2d8ca5d29", - nvim_autopairs = "a9b6b98de3bacacc0c986d9b0673cae6a87c4a41", + null_ls = "8c59fd5ec84e1c90c3982a40d699ebe62b243592", + nvim_autopairs = "96858723f1cba6a3eb004373a20c315d90584ea6", nvim_cmp = "1b94aacada96d2a33fef2ecf87748b27a2f50630", nvim_dap = "a6fa644f9de62c594a8a9cf6f2aaf324b5a6108b", - nvim_lsp_installer = "09e602e1ee7c14687b35a15c229d93d167698ef2", - nvim_lspconfig = "4b21740aae18ecec2d527b79d1072b3b01bb5a2a", + nvim_lsp_installer = "e8530f4059279a0d6b5e5f8891d04ffb1ade29a3", + nvim_lspconfig = "1917a52a7ccb517f76d6a6e732fb349f381fc927", nvim_notify = "15f52efacd169ea26b0f4070451d3ea53f98cd5a", nvim_tree = "0a2f6b0b6ba558a88c77a6b262af647760e6eca8", - nvim_treesitter = "fa2a6b68aaa6df0187b5bbebe6cbadc120d4a65a", + nvim_treesitter = "479fde3471ad6833d950abf645c0ebece15eaea4", nvim_ts_context_commentstring = "097df33c9ef5bbd3828105e4bee99965b758dc3f", nvim_web_devicons = "ac71ca88b1136e1ecb2aefef4948130f31aa40d1", packer = "851c62c5ecd3b5adc91665feda8f977e104162a5", @@ -29,7 +29,7 @@ local commit = { popup = "b7404d35d5d3548a82149238289fa71f7f6de4ac", project = "71d0e23dcfc43cfd6bb2a97dc5a7de1ab47a6538", structlog = "6f1403a192791ff1fa7ac845a73de9e860f781f1", - telescope = "1d1da664eb6505c318d405eea3d633c451edc2d8", + telescope = "a01ebd2793999c11d727fd15b1e5979ba20c7503", telescope_fzf_native = "b8662b076175e75e6497c59f3e2799b879d7b954", toggleterm = "265bbff68fbb8b2a5fb011272ec469850254ec9f", which_key = "312c386ee0eafc925c27869d2be9c11ebdb807eb", -- cgit v1.2.3 From 8233522e0b9b026c5ece9e420c4d9642f5a0c889 Mon Sep 17 00:00:00 2001 From: Ryan Despain <2043940+ryaminal@users.noreply.github.com> Date: Wed, 5 Jan 2022 01:33:53 -0700 Subject: fix: remove "error" message from git tag (#2141) --- lua/lvim/utils/git.lua | 1 - 1 file changed, 1 deletion(-) (limited to 'lua') diff --git a/lua/lvim/utils/git.lua b/lua/lvim/utils/git.lua index 73ba7c96..c0a67bf0 100644 --- a/lua/lvim/utils/git.lua +++ b/lua/lvim/utils/git.lua @@ -106,7 +106,6 @@ function M.get_lvim_tag(type) local lvim_full_ver = results[1] or "" if ret ~= 0 or string.match(lvim_full_ver, "%d") == nil then - Log:error "Unable to retrieve current tag. Check the log for further information" return nil end if type == "short" then -- cgit v1.2.3