From 12f8798bb05038a6269c6e50fe20c53ac47f75e3 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Sun, 26 Jun 2022 13:53:44 +0200 Subject: fix(installer): always use check shallow clones (#2763) --- lua/lvim/core/log.lua | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/log.lua b/lua/lvim/core/log.lua index 49c70f83..48891139 100644 --- a/lua/lvim/core/log.lua +++ b/lua/lvim/core/log.lua @@ -12,17 +12,27 @@ vim.tbl_add_reverse_lookup(Log.levels) local notify_opts = {} function Log:set_level(level) - -- package.loaded["lvim.core.log"] = nil - local log_level = Log.levels[level:upper()] - local status_ok, logger = pcall(require("structlog").get_logger, "lvim") - if status_ok then - for _, s in ipairs(logger.sinks) do - s.level = log_level + local logger_ok, _ = xpcall(function() + local log_level = Log.levels[level:upper()] + local structlog = require "structlog" + if structlog then + local logger = structlog.get_logger "lvim" + for _, s in ipairs(logger.sinks) do + s.level = log_level + end end + end, debug.traceback) + if not logger_ok then + Log:debug("Unable to set logger's level: " .. debug.traceback()) end - package.loaded["packer.log"] = nil - require("packer.log").new { level = lvim.log.level } + local packer_ok, _ = xpcall(function() + package.loaded["packer.log"] = nil + require("packer.log").new { level = lvim.log.level } + end, debug.traceback) + if not packer_ok then + Log:debug("Unable to set packer's log level: " .. debug.traceback()) + end end function Log:init() @@ -36,7 +46,7 @@ function Log:init() lvim = { sinks = { structlog.sinks.Console(log_level, { - async = false, + async = true, processors = { structlog.processors.Namer(), structlog.processors.StackWriter({ "line", "file" }, { max_parents = 0, stack_level = 2 }), -- cgit v1.2.3 From 709873702f692a013f059f8f5c5532f0366df35e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Rodr=C3=ADguez=20Rivero?= Date: Sat, 2 Jul 2022 09:23:04 +0200 Subject: feat: add commands to open/edit lvim logs (#2709) --- lua/lvim/core/commands.lua | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/commands.lua b/lua/lvim/core/commands.lua index 80c5bb03..65f01355 100644 --- a/lua/lvim/core/commands.lua +++ b/lua/lvim/core/commands.lua @@ -65,6 +65,12 @@ M.defaults = { print(require("lvim.utils.git").get_lvim_version()) end, }, + { + name = "LvimOpenlog", + fn = function() + vim.fn.execute("edit " .. require("lvim.core.log").get_path()) + end, + }, } function M.load(collection) -- cgit v1.2.3 From 8dca3a915cc30718b3f6392fdfd2ab9c26bf1f60 Mon Sep 17 00:00:00 2001 From: Ben Cooper <63478578+bncpr@users.noreply.github.com> Date: Sun, 3 Jul 2022 20:51:51 +0300 Subject: fix(core.comment): fix default extra mappings (#2768) Comment default config was set with extra = false with a comment suggesting this was for `g>`, `g<`, etc. mappings. However the `extra` argument is for the `gco`, `gcO`, and `gcA` mappings which are enabled by default and, in my opinion are very useful. The extended mappings are still disabled by default. --- lua/lvim/core/comment.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/comment.lua b/lua/lvim/core/comment.lua index 0b454074..86a2091a 100644 --- a/lua/lvim/core/comment.lua +++ b/lua/lvim/core/comment.lua @@ -26,9 +26,12 @@ function M.config() ---operator-pending mapping ---Includes `gcc`, `gcb`, `gc[count]{motion}` and `gb[count]{motion}` basic = true, - ---extended mapping + ---Extra mapping + ---Includes `gco`, `gcO`, `gcA` + extra = true, + ---Extended mapping ---Includes `g>`, `g<`, `g>[count]{motion}` and `g<[count]{motion}` - extra = false, + extended = false, }, ---LHS of line and block comment toggle mapping in NORMAL/VISUAL mode -- cgit v1.2.3 From 6d43a7946489764b57d2771fcfba260109ef984b Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Mon, 4 Jul 2022 19:26:33 +0200 Subject: refactor(whichkey): use vim.keymap.set directly (#2786) --- lua/lvim/core/terminal.lua | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/terminal.lua b/lua/lvim/core/terminal.lua index 6c190dd5..6f543d06 100644 --- a/lua/lvim/core/terminal.lua +++ b/lua/lvim/core/terminal.lua @@ -41,7 +41,6 @@ M.config = function() -- lvim.builtin.terminal.execs[#lvim.builtin.terminal.execs+1] = {"gdb", "tg", "GNU Debugger"} execs = { { "lazygit", "gg", "LazyGit", "float" }, - { "lazygit", "", "LazyGit", "float" }, }, } end @@ -76,23 +75,9 @@ M.add_exec = function(opts) return end - local exec_func = string.format( - "lua require('lvim.core.terminal')._exec_toggle({ cmd = '%s', count = %d, direction = '%s'})", - opts.cmd, - opts.count, - opts.direction - ) - - require("lvim.keymappings").load { - normal_mode = { [opts.keymap] = exec_func }, - term_mode = { [opts.keymap] = exec_func }, - } - - local wk_status_ok, wk = pcall(require, "which-key") - if not wk_status_ok then - return - end - wk.register({ [opts.keymap] = { opts.label } }, { mode = "n" }) + vim.keymap.set({ "n", "t" }, opts.keymap, function() + M._exec_toggle { cmd = opts.cmd, count = opts.count, direction = opts.direction } + end, { desc = opts.label, noremap = true, silent = true }) end M._exec_toggle = function(opts) -- cgit v1.2.3 From 6ab3e8a73920e3d2e02e57f7dd3a1f3d8e54ee63 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 23 Jul 2022 14:16:43 +0200 Subject: chore: bump plugins version (#2723) --- lua/lvim/core/telescope/custom-finders.lua | 50 ++++++++++++++++-------------- 1 file changed, 26 insertions(+), 24 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/telescope/custom-finders.lua b/lua/lvim/core/telescope/custom-finders.lua index b0ee1c07..69428a44 100644 --- a/lua/lvim/core/telescope/custom-finders.lua +++ b/lua/lvim/core/telescope/custom-finders.lua @@ -55,33 +55,35 @@ function M.view_lunarvim_changelog() } opts.entry_maker = make_entry.gen_from_git_commits(opts) - pickers.new(opts, { - prompt_title = "~ LunarVim Changelog ~", + pickers + .new(opts, { + prompt_title = "~ LunarVim Changelog ~", - finder = finders.new_oneshot_job( - vim.tbl_flatten { - "git", - "log", - "--pretty=oneline", - "--abbrev-commit", + finder = finders.new_oneshot_job( + vim.tbl_flatten { + "git", + "log", + "--pretty=oneline", + "--abbrev-commit", + }, + opts + ), + previewer = { + previewers.git_commit_diff_as_was.new(opts), }, - opts - ), - previewer = { - previewers.git_commit_diff_as_was.new(opts), - }, - --TODO: consider opening a diff view when pressing enter - attach_mappings = function(_, map) - map("i", "", copy_to_clipboard_action) - map("n", "", copy_to_clipboard_action) - map("i", "", actions._close) - map("n", "", actions._close) - map("n", "q", actions._close) - return true - end, - sorter = sorters.generic_sorter, - }):find() + --TODO: consider opening a diff view when pressing enter + attach_mappings = function(_, map) + map("i", "", copy_to_clipboard_action) + map("n", "", copy_to_clipboard_action) + map("i", "", actions._close) + map("n", "", actions._close) + map("n", "q", actions._close) + return true + end, + sorter = sorters.generic_sorter, + }) + :find() end -- Smartly opens either git_files or find_files, depending on whether the working directory is -- cgit v1.2.3