Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix empty line out of bounds in #361 #363

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix empty line out of bounds in #361 #363

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions lua/hop/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ local function set_unmatched_lines(buf_handle, hl_ns, top_line, bottom_line, cur
local start_line = top_line
local end_line = bottom_line
local start_col = 0
local end_col = nil
local end_col = 0

if direction == hint.HintDirection.AFTER_CURSOR then
start_col = cursor_pos[2]
Expand All @@ -108,24 +108,20 @@ local function set_unmatched_lines(buf_handle, hl_ns, top_line, bottom_line, cur
end
end

local current_line = vim.api.nvim_buf_get_lines(buf_handle, cursor_pos[1] - 1, cursor_pos[1], true)[1]
local current_width = vim.fn.strdisplaywidth(current_line)
-- `col` shouldn't be out of bounds
start_col = math.min(current_width, start_col)
end_col = math.min(current_width, end_col)

local extmark_options = {
end_line = end_line,
end_col = end_col,
hl_group = 'HopUnmatched',
hl_eol = true,
priority = prio.DIM_PRIO
}

if end_col then
local current_line = vim.api.nvim_buf_get_lines(buf_handle, cursor_pos[1] - 1, cursor_pos[1], true)[1]
local current_width = vim.fn.strdisplaywidth(current_line)

if end_col > current_width then
end_col = current_width - 1
end

extmark_options.end_col = end_col
end

vim.api.nvim_buf_set_extmark(buf_handle, hl_ns, start_line, start_col,
extmark_options)
end
Expand Down