From 53fb663efeac9a7b3a4503c59849b13a6afc33ff Mon Sep 17 00:00:00 2001 From: Opal Mizrahi Date: Sat, 8 Oct 2022 23:10:28 +0300 Subject: fix: telescope delete_buffer binds correct scope --- lua/lvim/core/telescope.lua | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua index 6e614dd9..e7b8db8e 100644 --- a/lua/lvim/core/telescope.lua +++ b/lua/lvim/core/telescope.lua @@ -19,6 +19,14 @@ local pickers = { theme = "dropdown", previewer = false, initial_mode = "normal", + mappings = { + i = { + [""] = require("telescope.actions").delete_buffer, + }, + n = { + ["dd"] = require("telescope.actions").delete_buffer, + }, + }, }, planets = { show_pluto = true, @@ -95,6 +103,7 @@ function M.config() "--hidden", "--glob=!.git/", }, + ---@usage Mappings are fully customizable. Many familiar mapping patterns are setup as defaults. mappings = { i = { [""] = actions.move_selection_next, @@ -104,13 +113,11 @@ function M.config() [""] = actions.cycle_history_prev, [""] = actions.smart_send_to_qflist + actions.open_qflist, [""] = actions.select_default, - [""] = require("telescope.actions").delete_buffer, }, n = { [""] = actions.move_selection_next, [""] = actions.move_selection_previous, [""] = actions.smart_send_to_qflist + actions.open_qflist, - ["dd"] = require("telescope.actions").delete_buffer, }, }, pickers = pickers, @@ -137,7 +144,6 @@ end function M.setup() local previewers = require "telescope.previewers" local sorters = require "telescope.sorters" - local actions = require "telescope.actions" lvim.builtin.telescope = vim.tbl_extend("keep", { file_previewer = previewers.vim_buffer_cat.new, @@ -145,24 +151,6 @@ function M.setup() qflist_previewer = previewers.vim_buffer_qflist.new, file_sorter = sorters.get_fuzzy_file, generic_sorter = sorters.get_generic_fuzzy_sorter, - ---@usage Mappings are fully customizable. Many familiar mapping patterns are setup as defaults. - mappings = { - i = { - [""] = actions.move_selection_next, - [""] = actions.move_selection_previous, - [""] = actions.close, - [""] = actions.cycle_history_next, - [""] = actions.cycle_history_prev, - [""] = actions.smart_send_to_qflist + actions.open_qflist, - [""] = actions.select_default + actions.center, - }, - n = { - [""] = actions.move_selection_next, - [""] = actions.move_selection_previous, - [""] = actions.smart_send_to_qflist + actions.open_qflist, - ["dd"] = require("telescope.actions").delete_buffer, - }, - }, }, lvim.builtin.telescope) local telescope = require "telescope" -- cgit v1.2.3 From 3d36b20de20ab9d3a92fd27c70adb83a5467e62c Mon Sep 17 00:00:00 2001 From: Opal Mizrahi Date: Sun, 9 Oct 2022 01:48:59 +0300 Subject: fix: move telescope.actions pcall to the top --- lua/lvim/core/telescope.lua | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua index e7b8db8e..b854a6c1 100644 --- a/lua/lvim/core/telescope.lua +++ b/lua/lvim/core/telescope.lua @@ -1,5 +1,10 @@ local M = {} +local ok, actions = pcall(require, "telescope.actions") +if not ok then + return +end + local pickers = { find_files = { theme = "dropdown", @@ -21,10 +26,10 @@ local pickers = { initial_mode = "normal", mappings = { i = { - [""] = require("telescope.actions").delete_buffer, + [""] = actions.delete_buffer, }, n = { - ["dd"] = require("telescope.actions").delete_buffer, + ["dd"] = actions.delete_buffer, }, }, }, @@ -65,10 +70,6 @@ function M.config() on_config_done = nil, } - local ok, actions = pcall(require, "telescope.actions") - if not ok then - return - end lvim.builtin.telescope = vim.tbl_extend("force", lvim.builtin.telescope, { defaults = { prompt_prefix = lvim.icons.ui.Telescope .. " ", -- cgit v1.2.3 From 096c5ca83a89fe19e05ee4c3bbbc034620cac916 Mon Sep 17 00:00:00 2001 From: Opal Mizrahi Date: Sun, 9 Oct 2022 02:20:35 +0300 Subject: fix: use function for pickers --- lua/lvim/core/telescope.lua | 121 ++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 60 deletions(-) (limited to 'lua/lvim/core') diff --git a/lua/lvim/core/telescope.lua b/lua/lvim/core/telescope.lua index b854a6c1..77bf552d 100644 --- a/lua/lvim/core/telescope.lua +++ b/lua/lvim/core/telescope.lua @@ -1,65 +1,62 @@ local M = {} -local ok, actions = pcall(require, "telescope.actions") -if not ok then - return -end - -local pickers = { - find_files = { - theme = "dropdown", - hidden = true, - previewer = false, - }, - live_grep = { - --@usage don't include the filename in the search results - only_sort_text = true, - theme = "dropdown", - }, - grep_string = { - only_sort_text = true, - theme = "dropdown", - }, - buffers = { - theme = "dropdown", - previewer = false, - initial_mode = "normal", - mappings = { - i = { - [""] = actions.delete_buffer, - }, - n = { - ["dd"] = actions.delete_buffer, +local function get_pickers(actions) + return { + find_files = { + theme = "dropdown", + hidden = true, + previewer = false, + }, + live_grep = { + --@usage don't include the filename in the search results + only_sort_text = true, + theme = "dropdown", + }, + grep_string = { + only_sort_text = true, + theme = "dropdown", + }, + buffers = { + theme = "dropdown", + previewer = false, + initial_mode = "normal", + mappings = { + i = { + [""] = actions.delete_buffer, + }, + n = { + ["dd"] = actions.delete_buffer, + }, }, }, - }, - planets = { - show_pluto = true, - show_moon = true, - }, - git_files = { - theme = "dropdown", - hidden = true, - previewer = false, - show_untracked = true, - }, - lsp_references = { - theme = "dropdown", - initial_mode = "normal", - }, - lsp_definitions = { - theme = "dropdown", - initial_mode = "normal", - }, - lsp_declarations = { - theme = "dropdown", - initial_mode = "normal", - }, - lsp_implementations = { - theme = "dropdown", - initial_mode = "normal", - }, -} + planets = { + show_pluto = true, + show_moon = true, + }, + git_files = { + theme = "dropdown", + hidden = true, + previewer = false, + show_untracked = true, + }, + lsp_references = { + theme = "dropdown", + initial_mode = "normal", + }, + lsp_definitions = { + theme = "dropdown", + initial_mode = "normal", + }, + lsp_declarations = { + theme = "dropdown", + initial_mode = "normal", + }, + lsp_implementations = { + theme = "dropdown", + initial_mode = "normal", + }, + } +end function M.config() -- Define this minimal config so that it's available if telescope is not yet available. @@ -70,6 +67,10 @@ function M.config() on_config_done = nil, } + local ok, actions = pcall(require, "telescope.actions") + if not ok then + return + end lvim.builtin.telescope = vim.tbl_extend("force", lvim.builtin.telescope, { defaults = { prompt_prefix = lvim.icons.ui.Telescope .. " ", @@ -121,7 +122,7 @@ function M.config() [""] = actions.smart_send_to_qflist + actions.open_qflist, }, }, - pickers = pickers, + pickers = get_pickers(actions), file_ignore_patterns = {}, path_display = { "smart" }, winblend = 0, @@ -130,7 +131,7 @@ function M.config() color_devicons = true, set_env = { ["COLORTERM"] = "truecolor" }, -- default = nil, }, - pickers = pickers, + pickers = get_pickers(actions), extensions = { fzf = { fuzzy = true, -- false will only do exact matching -- cgit v1.2.3