From 70aaceb3cfd73c0ca35f135cb284201123e55ad6 Mon Sep 17 00:00:00 2001 From: jc <46619361+juancwu@users.noreply.github.com> Date: Sun, 1 Oct 2023 15:04:04 -0400 Subject: [PATCH] reformat code + quit telescope with q --- .config/nvim/lazy-lock.json | 2 +- .config/nvim/lua/plugins/telescope.lua | 174 ++++++++++++------------- 2 files changed, 88 insertions(+), 88 deletions(-) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index b3ba870..f4a4437 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "gitsigns.nvim": { "branch": "main", "commit": "79127db3b127f5d125f35e0d44ba60715edf2842" }, "harpoon": { "branch": "master", "commit": "21f4c47c6803d64ddb934a5b314dcb1b8e7365dc" }, "indent-blankline.nvim": { "branch": "master", "commit": "9637670896b68805430e2f72cf5d16be5b97a22a" }, - "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" }, + "lazy.nvim": { "branch": "main", "commit": "dac844ed617dda4f9ec85eb88e9629ad2add5e05" }, "lsp-zero.nvim": { "branch": "v2.x", "commit": "f084f4a6a716f55bf9c4026e73027bb24a0325a3" }, "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" }, "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" }, diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index c9f9f1b..3de09fb 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -1,95 +1,95 @@ return { - "nvim-telescope/telescope.nvim", - version = "0.1.2", - dependencies = { "nvim-lua/plenary.nvim" }, - config = function() - local telescope = require("telescope") - local actions = require("telescope.actions") - local builtin = require("telescope.builtin") - local fb_actions = require "telescope".extensions.file_browser.actions + "nvim-telescope/telescope.nvim", + version = "0.1.2", + dependencies = { "nvim-lua/plenary.nvim" }, + config = function() + local telescope = require("telescope") + local actions = require("telescope.actions") + local builtin = require("telescope.builtin") + local fb_actions = require "telescope".extensions.file_browser.actions - local function telescope_buffer_dir() - return vim.fn.expand("%:p:h") - end + local function telescope_buffer_dir() + return vim.fn.expand("%:p:h") + end - telescope.setup({ - defaults = { - mappings = { - n = { - ['q'] = actions.close - } - } - }, - extensions = { - file_browser = { - theme = "dropdown", - hijack_netrw = false, - hidden = true, - mappings = { - ['i'] = { - [''] = function() vim.cmd("normal vbd") end, - [''] = function(bufnr) actions.move_selection_next(bufnr) end, - [''] = function(bufnr) actions.move_selection_previous(bufnr) end, - [''] = function(bufnr) actions.select_vertical(bufnr) end, + telescope.setup({ + defaults = { + mappings = { + n = { + ['q'] = actions.close + } + } }, - ['n'] = { - ['a'] = fb_actions.create, - ['h'] = fb_actions.goto_parent_dir, - ['/'] = function() vim.cmd("startinsert") end, - ['d'] = fb_actions.remove, - ['e'] = fb_actions.change_cwd, - [''] = function(bufnr) actions.select_vertical(bufnr) end, - [''] = function(bufnr) actions.toggle_all(bufnr) end, - [''] = function(bufnr) actions.move_selection_next(bufnr) end, - [''] = function(bufnr) actions.move_selection_previous(bufnr) end, + extensions = { + file_browser = { + theme = "dropdown", + hijack_netrw = false, + hidden = true, + mappings = { + ['i'] = { + [''] = function() vim.cmd("normal vbd") end, + [''] = function(bufnr) actions.move_selection_next(bufnr) end, + [''] = function(bufnr) actions.move_selection_previous(bufnr) end, + [''] = function(bufnr) actions.select_vertical(bufnr) end, + }, + ['n'] = { + ['a'] = fb_actions.create, + ['h'] = fb_actions.goto_parent_dir, + ['/'] = function() vim.cmd("startinsert") end, + ['d'] = fb_actions.remove, + ['e'] = fb_actions.change_cwd, + [''] = function(bufnr) actions.select_vertical(bufnr) end, + [''] = function(bufnr) actions.toggle_all(bufnr) end, + [''] = function(bufnr) actions.move_selection_next(bufnr) end, + [''] = function(bufnr) actions.move_selection_previous(bufnr) end, + } + } + }, } - } - }, - } - }) - - pcall(telescope.load_extension, "file_browser") - pcall(telescope.load_extension, "fzf") - pcall(telescope.load_extension, "dap") - - -- Builtin pickers - vim.keymap.set("n", "sf", function() - builtin.find_files({ no_ignore = false, hidden = true }) - end, { desc = "[S]earch [F]iles" }) - vim.keymap.set("n", "sh", builtin.help_tags, { desc = "[S]earch [H]elp Tags" }) - vim.keymap.set("n", "sb", builtin.buffers, { desc = "[S]earch [B]uffers" }) - vim.keymap.set("n", "sw", builtin.grep_string, { desc = "[S]earch [W]ord" }) - vim.keymap.set("n", "sg", builtin.live_grep, { desc = "[S]earch by [G]rep" }) - vim.keymap.set("n", "sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" }) - vim.keymap.set("n", "gr", builtin.lsp_references, { desc = "[G]o to [R]eferences", noremap = true }) - - -- Git pickers - vim.keymap.set("n", "gf", builtin.git_files, { desc = "Search [G]it [F]iles" }) - vim.keymap.set("n", "gs", builtin.git_status, { desc = "List [G]it [S]tatus" }) - vim.keymap.set("n", "gh", builtin.git_stash, { desc = "List [G]it [S]tash" }) - vim.keymap.set("n", "gbb", builtin.git_branches, { desc = "List [G]it [B]ranches" }) - vim.keymap.set("n", "gc", builtin.git_bcommits, { desc = "List Buffer [G]it [C]ommits" }) - - -- File Browser Ext - vim.keymap.set("n", "fs", - function() - telescope.extensions.file_browser.file_browser({ - path = "%:p:h", - cwd = telescope_buffer_dir(), - respect_gitignore = true, - hidden = true, - grouped = true, - previewer = false, - initial_mode = "normal", - layout_config = { height = 40 } }) - end, { desc = "Open [F]ile [S]ystem Menu" }) - vim.keymap.set('n', '/', function() - builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown({ - winblend = 10, - previewer = false, - })) - end, { desc = '[/] Fuzzily serach in current buffer' }) - end + pcall(telescope.load_extension, "file_browser") + pcall(telescope.load_extension, "fzf") + pcall(telescope.load_extension, "dap") + + -- Builtin pickers + vim.keymap.set("n", "sf", function() + builtin.find_files({ no_ignore = false, hidden = true }) + end, { desc = "[S]earch [F]iles" }) + vim.keymap.set("n", "sh", builtin.help_tags, { desc = "[S]earch [H]elp Tags" }) + vim.keymap.set("n", "sb", builtin.buffers, { desc = "[S]earch [B]uffers" }) + vim.keymap.set("n", "sw", builtin.grep_string, { desc = "[S]earch [W]ord" }) + vim.keymap.set("n", "sg", builtin.live_grep, { desc = "[S]earch by [G]rep" }) + vim.keymap.set("n", "sd", builtin.diagnostics, { desc = "[S]earch [D]iagnostics" }) + vim.keymap.set("n", "gr", builtin.lsp_references, { desc = "[G]o to [R]eferences", noremap = true }) + + -- Git pickers + vim.keymap.set("n", "gf", builtin.git_files, { desc = "Search [G]it [F]iles" }) + vim.keymap.set("n", "gs", builtin.git_status, { desc = "List [G]it [S]tatus" }) + vim.keymap.set("n", "gh", builtin.git_stash, { desc = "List [G]it [S]tash" }) + vim.keymap.set("n", "gbb", builtin.git_branches, { desc = "List [G]it [B]ranches" }) + vim.keymap.set("n", "gc", builtin.git_bcommits, { desc = "List Buffer [G]it [C]ommits" }) + + -- File Browser Ext + vim.keymap.set("n", "fs", + function() + telescope.extensions.file_browser.file_browser({ + path = "%:p:h", + cwd = telescope_buffer_dir(), + respect_gitignore = false, + hidden = true, + grouped = true, + previewer = false, + initial_mode = "normal", + layout_config = { height = 40 } + }) + end, { desc = "Open [F]ile [S]ystem Menu" }) + + vim.keymap.set('n', '/', function() + builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown({ + winblend = 10, + previewer = false, + })) + end, { desc = '[/] Fuzzily serach in current buffer' }) + end }