Merge pull request hadronized#279 from ii14/fix_col_range_error

fix: fix "col value outside range" error
mongrel-labs · Jul 22, 2022 · ced6c94 · ced6c94
2 parents e23fdb8 + da3affb
commit ced6c94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lua/hop/init.lua b/lua/hop/init.lua
@@ -93,7 +93,7 @@ local function set_unmatched_lines(buf_handle, hl_ns, top_line, bottom_line, cur
     start_col = cursor_pos[2]
   elseif direction == hint.HintDirection.BEFORE_CURSOR then
     end_line = bottom_line - 1
-    if cursor_pos[2] ~= 0 then end_col = cursor_pos[2] + 1 end
+    if cursor_pos[2] ~= 0 then end_col = cursor_pos[2] end
   end
 
   if current_line_only then

diff --git a/lua/hop/window.lua b/lua/hop/window.lua
@@ -53,9 +53,11 @@ function M.get_window_context(multi_windows)
   -- Generate contexts of windows
   local cur_hwin = vim.api.nvim_get_current_win()
   local cur_hbuf = vim.api.nvim_win_get_buf(cur_hwin)
+  local cur_col = vim.fn.strwidth(vim.api.nvim_get_current_line():sub(1, vim.fn.col('.')))
+
   all_ctxs[#all_ctxs + 1] = {
     hbuf = cur_hbuf,
-    contexts = { window_context(cur_hwin, {vim.fn.getcurpos()[2], vim.fn.getcurpos()[5]} ) },
+    contexts = { window_context(cur_hwin, {vim.fn.line('.'), cur_col} ) },
   }
 
   if not multi_windows then