diff options
| -rw-r--r-- | lua/lvim/core/telescope/custom-finders.lua | 50 | ||||
| -rw-r--r-- | lua/lvim/plugins.lua | 2 | ||||
| -rw-r--r-- | lua/lvim/utils/git.lua | 18 | ||||
| -rw-r--r-- | snapshots/default.json | 54 | ||||
| -rw-r--r-- | tests/lvim/helpers.lua | 18 |
5 files changed, 71 insertions, 71 deletions
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", "<enter>", copy_to_clipboard_action) - map("n", "<enter>", copy_to_clipboard_action) - map("i", "<esc>", actions._close) - map("n", "<esc>", 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", "<enter>", copy_to_clipboard_action) + map("n", "<enter>", copy_to_clipboard_action) + map("i", "<esc>", actions._close) + map("n", "<esc>", 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 diff --git a/lua/lvim/plugins.lua b/lua/lvim/plugins.lua index dd40b967..fec91bc9 100644 --- a/lua/lvim/plugins.lua +++ b/lua/lvim/plugins.lua @@ -12,6 +12,7 @@ local core_plugins = { }, { "lunarvim/onedarker.nvim", + branch = "freeze", config = function() pcall(function() if lvim and lvim.colorscheme == "onedarker" then @@ -37,6 +38,7 @@ local core_plugins = { -- Telescope { "nvim-telescope/telescope.nvim", + branch = "0.1.x", config = function() require("lvim.core.telescope").setup() end, diff --git a/lua/lvim/utils/git.lua b/lua/lvim/utils/git.lua index 62915458..99c178f3 100644 --- a/lua/lvim/utils/git.lua +++ b/lua/lvim/utils/git.lua @@ -13,16 +13,14 @@ local function git_cmd(opts) opts.cwd = opts.cwd or get_lvim_base_dir() local stderr = {} - local stdout, ret = Job - :new({ - command = "git", - args = opts.args, - cwd = opts.cwd, - on_stderr = function(_, data) - table.insert(stderr, data) - end, - }) - :sync() + local stdout, ret = Job:new({ + command = "git", + args = opts.args, + cwd = opts.cwd, + on_stderr = function(_, data) + table.insert(stderr, data) + end, + }):sync() if not vim.tbl_isempty(stderr) then Log:debug(stderr) diff --git a/snapshots/default.json b/snapshots/default.json index 2918f9b0..564e26b3 100644 --- a/snapshots/default.json +++ b/snapshots/default.json @@ -1,90 +1,90 @@ { "Comment.nvim": { - "commit": "3c69bab" + "commit": "2e0572c" }, "FixCursorHold.nvim": { - "commit": "1bfb32e" + "commit": "5aa5ff1" }, "LuaSnip": { - "commit": "79b2019" + "commit": "be3083b" }, "alpha-nvim": { - "commit": "ef27a59" + "commit": "14974c3" }, "bufferline.nvim": { - "commit": "c78b3ec" + "commit": "d7b775a" }, "cmp-buffer": { - "commit": "12463cf" + "commit": "62fc67a" }, "cmp-nvim-lsp": { "commit": "affe808" }, "cmp-path": { - "commit": "466b6b8" + "commit": "981baf9" }, "cmp_luasnip": { "commit": "a9de941" }, "dap-buddy.nvim": { - "commit": "3679132" + "commit": "bbda2b0" }, "friendly-snippets": { - "commit": "d27a83a" + "commit": "40c306b" }, "gitsigns.nvim": { - "commit": "c18e016" + "commit": "bb6c3bf" }, "lua-dev.nvim": { "commit": "54149d1" }, "lualine.nvim": { - "commit": "3362b28" + "commit": "8d956c1" }, "nlsp-settings.nvim": { - "commit": "62d72bc" + "commit": "6c4e1a4" }, "null-ls.nvim": { - "commit": "ff40739" + "commit": "9c396ab" }, "nvim-autopairs": { - "commit": "fa6876f" + "commit": "972a797" }, "nvim-cmp": { - "commit": "df6734a" + "commit": "c4dcb12" }, "nvim-dap": { - "commit": "014ebd5" + "commit": "c0f43f4" }, "nvim-lsp-installer": { - "commit": "2408a0f" + "commit": "45571e1" }, "nvim-lspconfig": { - "commit": "10c3934" + "commit": "3479473" }, "nvim-notify": { - "commit": "8960269" + "commit": "74ba257" }, "nvim-tree.lua": { - "commit": "bdb6d4a" + "commit": "08ab346" }, "nvim-treesitter": { - "commit": "518e275" + "commit": "07b7221" }, "nvim-ts-context-commentstring": { "commit": "8834375" }, "nvim-web-devicons": { - "commit": "8d2c533" + "commit": "2d02a56" }, "onedarker.nvim": { "commit": "b00dd21" }, "packer.nvim": { - "commit": "00ec5ad" + "commit": "494fd59" }, "plenary.nvim": { - "commit": "968a4b9" + "commit": "986ad71" }, "popup.nvim": { "commit": "b7404d3" @@ -93,7 +93,7 @@ "commit": "541115e" }, "schemastore.nvim": { - "commit": "a32911d" + "commit": "fbc7c71" }, "structlog.nvim": { "commit": "232a8e2" @@ -102,10 +102,10 @@ "commit": "6a33ece" }, "telescope.nvim": { - "commit": "d96eaa9" + "commit": "273ccff" }, "toggleterm.nvim": { - "commit": "aaeed9e" + "commit": "9db6f98" }, "which-key.nvim": { "commit": "f03a259" diff --git a/tests/lvim/helpers.lua b/tests/lvim/helpers.lua index 2d8477de..0ce1a57b 100644 --- a/tests/lvim/helpers.lua +++ b/tests/lvim/helpers.lua @@ -3,16 +3,14 @@ local M = {} function M.search_file(file, args) local Job = require "plenary.job" local stderr = {} - local stdout, ret = Job - :new({ - command = "grep", - args = { args, file }, - cwd = get_cache_dir(), - on_stderr = function(_, data) - table.insert(stderr, data) - end, - }) - :sync() + local stdout, ret = Job:new({ + command = "grep", + args = { args, file }, + cwd = get_cache_dir(), + on_stderr = function(_, data) + table.insert(stderr, data) + end, + }):sync() return ret, stdout, stderr end |