Replace incsearch workflow with hop.nvim

Author: gregory

nvim/lazy-lock.json

@@ -16,20 +16,18 @@
   "fzf.vim": { "branch": "master", "commit": "879db51d0965515cdaef9b7f6bdeb91c65d2829e" },
   "gitsigns.nvim": { "branch": "main", "commit": "20ad4419564d6e22b189f6738116b38871082332" },
   "gruvbox": { "branch": "master", "commit": "697c00291db857ca0af00ec154e5bd514a79191f" },
-  "incsearch-easymotion.vim": { "branch": "master", "commit": "fcdd3aee6f4c0eef1a515727199ece8d6c6041b5" },
-  "incsearch-fuzzy.vim": { "branch": "master", "commit": "b08fa8fbfd633e2f756fde42bfb5251d655f5403" },
-  "incsearch.vim": { "branch": "master", "commit": "c83de6d1ac31d173d7c3ffee0ad61dc643ee4f08" },
+  "hop.nvim": { "branch": "v2", "commit": "90db1b2c61b820e230599a04fedcd2679e64bd07" },
   "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
-  "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" },
+  "lazy.nvim": { "branch": "main", "commit": "f0f5bbb9e5bfae5e6468f9359ffea3d151418176" },
   "lightline.vim": { "branch": "master", "commit": "e358557e1a9f9fc860416c8eb2e34c0404078155" },
   "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" },
   "menu": { "branch": "main", "commit": "7a0a4a2896b715c066cfbe320bdc048091874cc6" },
   "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
   "nerdcommenter": { "branch": "master", "commit": "02a3b6455fa07b61b9440a78732f1e9b7876c991" },
   "nerdtree": { "branch": "master", "commit": "690d061b591525890f1471c6675bcb5bdc8cdff9" },
   "nvim-autopairs": { "branch": "master", "commit": "7a2c97cccd60abc559344042fefb1d5a85b3e33b" },
-  "nvim-cmp": { "branch": "main", "commit": "a7bcf1d88069fc67c9ace8a62ba480b8fe879025" },
-  "nvim-lspconfig": { "branch": "master", "commit": "87d30189b24caa496b54affd65594a309ac6d929" },
+  "nvim-cmp": { "branch": "main", "commit": "cf22c9e32512de3be1fd6b65fd25e3aabead4d8b" },
+  "nvim-lspconfig": { "branch": "master", "commit": "e25994a1c2373784364852cd904cb39b6d75f227" },
   "nvim-tree.lua": { "branch": "master", "commit": "64e2192f5250796aa4a7f33c6ad888515af50640" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "8dcb311b0c92d460fac00eac706abd43d94d68af" },

nvim/lua/autocmds.lua

@@ -302,9 +302,3 @@ api.nvim_create_autocmd("FileType", {
   end,
 })
 
-api.nvim_create_autocmd("VimEnter", {
-  group = api.nvim_create_augroup("incsearch-keymap", { clear = true }),
-  callback = function()
-    user.incsearch_keymap()
-  end,
-})

nvim/lua/mappings.lua

@@ -3,7 +3,12 @@ require "nvchad.mappings"
 local map = vim.keymap.set
 local user = require "user"
 local fn = vim.fn
-local echo = vim.api.nvim_echo
+local api = vim.api
+local echo = api.nvim_echo
+
+local function feedkeys(keys)
+  api.nvim_feedkeys(api.nvim_replace_termcodes(keys, true, false, true), "n", true)
+end
 
 map("n", "zo", "zO", { remap = true })
 map("n", "bm", "<Plug>BookmarkToggle")
@@ -95,20 +100,20 @@ map("n", "<F10>", function()
   vim.cmd([[echo "hi<" . synIDattr(synID(line('.'),col('.'),1),'name') . "> trans<" . synIDattr(synID(line('.'),col('.'),0),'name') . "> lo<" . synIDattr(synIDtrans(synID(line('.'),col('.'),1)),'name') . ">"]])
 end, { silent = true })
 map("n", "g/", function()
-  return fn["incsearch#go"](user.legacy_incsearch_config { is_stay = 1 })
-end, { expr = true, silent = true, noremap = true })
+  if not user.hop_patterns { current_line_only = true } then
+    feedkeys "g/"
+  end
+end, { silent = true, noremap = true })
 map("n", "/", function()
-  return fn["incsearch#go"](user.legacy_incsearch_config { is_stay = 0 })
-end, { expr = true, silent = true, noremap = true })
+  if not user.hop_patterns() then
+    feedkeys "/"
+  end
+end, { silent = true, noremap = true })
 map("n", "f", function()
-  return fn["incsearch#go"](user.legacy_incsearch_config { converters = { fn["incsearch#config#fuzzy#converter"]() } })
-end, { expr = true, silent = true, noremap = true })
-map("n", "n", "<Plug>(incsearch-nohl-n)")
-map("n", "N", "<Plug>(incsearch-nohl-N)")
-map("n", "*", "<Plug>(incsearch-nohl-*)")
-map("n", "#", "<Plug>(incsearch-nohl-#)")
-map("n", "g*", "<Plug>(incsearch-nohl-g*)")
-map("n", "g#", "<Plug>(incsearch-nohl-g#)")
+  if not user.hop_char1 { current_line_only = true } then
+    feedkeys "f"
+  end
+end, { silent = true, noremap = true })
 map("n", "i", ":noh<CR>i", { noremap = true, silent = true })
 map("n", "<BS>", "mzJ`z", { noremap = true })
 map("n", "gj", "<Plug>(signify-next-hunk)")

nvim/lua/options.lua

@@ -115,8 +115,6 @@ g["prettier#config#bracket_spacing"] = "true"
 g["prettier#config#print_width"] = 100
 
 g["asterisk#keeppos"] = 1
-g["incsearch#auto_nohlsearch"] = 1
-
 g.coc_snippet_next = "<c-j>"
 g.coc_snippet_prev = "<c-k>"
 g.coc_node_path = fn.expand "~/.nvm/versions/node/v16.12.0/bin/node"

nvim/lua/plugins/init.lua

@@ -40,18 +40,11 @@ return {
   },
   { "kana/vim-submode" },
   {
-    "haya14busa/incsearch.vim",
-    lazy = false,
-  },
-  {
-    "haya14busa/incsearch-fuzzy.vim",
-    lazy = false,
-    dependencies = { "haya14busa/incsearch.vim" },
-  },
-  {
-    "haya14busa/incsearch-easymotion.vim",
-    lazy = false,
-    dependencies = { "haya14busa/incsearch.vim", "easymotion/vim-easymotion" },
+    "phaazon/hop.nvim",
+    branch = "v2",
+    config = function()
+      require("hop").setup {}
+    end,
   },
   { "jiangmiao/auto-pairs" },
   { "szw/vim-ctrlspace" },

nvim/lua/user/init.lua

@@ -213,91 +213,45 @@ function M.zoom_toggle()
   vim.t.zoomed = true
 end
 
-local function ensure_incsearch_core()
-  if fn.exists "*incsearch#util#deepextend" == 1 then
-    return true
-  end
+local hop_warning_shown = false
 
-  local ok, lazy = pcall(require, "lazy")
+local function load_hop()
+  local ok, hop = pcall(require, "hop")
   if ok then
-    lazy.load { plugins = { "incsearch.vim" } }
-  end
-
-  return fn.exists "*incsearch#util#deepextend" == 1
-end
-
-local function ensure_incsearch_easymotion()
-  if fn.exists "*incsearch#config#easymotion#module" == 1 then
-    return true
+    return hop
   end
 
-  local ok, lazy = pcall(require, "lazy")
-  if ok then
-    lazy.load { plugins = { "incsearch-easymotion.vim" } }
+  if not hop_warning_shown then
+    hop_warning_shown = true
+    vim.schedule(function()
+      vim.notify("hop.nvim is not available; search mappings will fall back to their defaults", vim.log.levels.WARN, {
+        title = "hop",
+      })
+    end)
   end
 
-  return fn.exists "*incsearch#config#easymotion#module" == 1
+  return nil
 end
 
-local function warn_once(msg)
-  vim.schedule(function()
-    vim.notify(msg, vim.log.levels.WARN, { title = "incsearch" })
-  end)
-end
-
-function M.incsearch_config(opts)
-  opts = opts or {}
-
-  local modules = {}
-  if ensure_incsearch_easymotion() then
-    table.insert(modules, fn["incsearch#config#easymotion#module"]())
-  else
-    warn_once "incsearch-easymotion.vim is not available; incremental search will fall back to the default behaviour"
-  end
-
-  local base = {
-    is_expr = 0,
-  }
-
-  if #modules > 0 then
-    base.modules = modules
-    base.keymap = { ["<CR>"] = "<Over>(easymotion)" }
-  else
-    base.keymap = vim.empty_dict()
-  end
-
-  if ensure_incsearch_core() then
-    local ok, extended = pcall(fn["incsearch#util#deepextend"], vim.deepcopy(base), opts)
-    if ok then
-      return extended
-    end
-    warn_once(string.format("incsearch#util#deepextend failed: %s; falling back to Lua deep extend", extended))
-  else
-    warn_once "incsearch.vim is not available; incremental search will fall back to Lua deep extend"
+function M.hop_patterns(opts)
+  local hop = load_hop()
+  if hop then
+    hop.hint_patterns(opts or {})
+    return true
   end
-
-  return vim.tbl_deep_extend("force", vim.deepcopy(base), opts)
+  return false
 end
 
-function M.legacy_incsearch_config(opts)
-  return M.incsearch_config(opts or {})
-end
-
-function M.incsearch_keymap()
-  if fn.exists ":IncSearchNoreMap" == 0 then
-    return
-  end
-
-  local function map(lhs, rhs)
-    vim.cmd(string.format([[IncSearchNoreMap %s %s]], lhs, rhs))
+function M.hop_char1(opts)
+  local hop = load_hop()
+  if hop then
+    hop.hint_char1(opts or {})
+    return true
   end
-
-  map("<Right>", "<Over>(incsearch-next)")
-  map("<Left>", "<Over>(incsearch-prev)")
-  map("<Tab>", "<Over>(incsearch-scroll-f)")
-  map("<S-Tab>", "<Over>(incsearch-scroll-b)")
+  return false
 end
 
+
 function M.print_foobar()
   vim.notify("Foo Bar!", vim.log.levels.INFO, { title = "CtrlSpace" })
 end