From eabc91a2ba072dcd88d82d02f688e91d25b2c654 Mon Sep 17 00:00:00 2001 From: Matt Leong Date: Mon, 20 Dec 2021 07:00:14 -0800 Subject: [PATCH] feat(telescope): grep current word mapping --- lua/cosmic/core/pluginsInit.lua | 15 ++++++++------- lua/cosmic/plugins/telescope/init.lua | 6 ++++++ lua/cosmic/plugins/telescope/mappings.lua | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/lua/cosmic/core/pluginsInit.lua b/lua/cosmic/core/pluginsInit.lua index d6f83cf..47b3703 100644 --- a/lua/cosmic/core/pluginsInit.lua +++ b/lua/cosmic/core/pluginsInit.lua @@ -92,13 +92,6 @@ return packer.startup(function() requires = { { 'williamboman/nvim-lsp-installer' }, { 'jose-elias-alvarez/nvim-lsp-ts-utils' }, - { - 'ray-x/lsp_signature.nvim', - config = function() - require('cosmic.plugins.lsp-signature') - end, - after = 'nvim-lspconfig', - }, { 'jose-elias-alvarez/null-ls.nvim', config = function() @@ -107,6 +100,14 @@ return packer.startup(function() disable = vim.tbl_contains(user_plugins.disable, 'null-ls'), after = 'nvim-lspconfig', }, + { + 'ray-x/lsp_signature.nvim', + config = function() + require('cosmic.plugins.lsp-signature') + end, + after = 'nvim-lspconfig', + disable = vim.tbl_contains(user_plugins.disable, 'lsp_signature'), + }, }, }) diff --git a/lua/cosmic/plugins/telescope/init.lua b/lua/cosmic/plugins/telescope/init.lua index 295e294..96fe919 100644 --- a/lua/cosmic/plugins/telescope/init.lua +++ b/lua/cosmic/plugins/telescope/init.lua @@ -56,6 +56,7 @@ require('telescope').setup(vim.tbl_deep_extend('force', { '--line-number', '--column', '--smart-case', + '--trim', }, }, extensions = { @@ -118,6 +119,11 @@ require('telescope').setup(vim.tbl_deep_extend('force', { prompt_title = '✨ Live Grep ✨', mappings = default_mappings, }, + grep_string = { + initial_mode = 'normal', + prompt_title = '✨ Grep String ✨', + mappings = default_mappings, + }, }, }, config.telescope or {})) diff --git a/lua/cosmic/plugins/telescope/mappings.lua b/lua/cosmic/plugins/telescope/mappings.lua index 712d9ce..4ac1c41 100644 --- a/lua/cosmic/plugins/telescope/mappings.lua +++ b/lua/cosmic/plugins/telescope/mappings.lua @@ -15,6 +15,7 @@ M.init = function() map('n', 'fp', ':Telescope find_files') map('n', 'fk', ':Telescope buffers') map('n', 'fs', ':Telescope live_grep') + map('n', 'fw', ':Telescope grep_string') -- git navigation map('n', 'ggc', ':Telescope git_commits')