Skip to content

fix: Highlight position offset #1

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

Open
Kicamon wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Highlight position offset #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
287e489
fix: Highlight position offset
Kicamon Sep 23, 2024
46d510c
update
Kicamon Sep 24, 2024
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
23 changes: 13 additions & 10 deletions lua/cwordmini/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,15 @@ local function find_occurrences(str, pattern)
if not foundPos then
return nil
end
local before_char = foundPos > 1 and str:sub(foundPos - 1, foundPos - 1) or ''
local after_char = foundPos + pattern_len <= #str
and str:sub(foundPos + pattern_len, foundPos + pattern_len)
or ''
local before_char = str:sub(foundPos - 1, foundPos - 1)
local after_char = str:sub(foundPos + pattern_len, foundPos + pattern_len)
startPos = foundPos + 1
if
(before_char == '' or before_char:match('[^%w_]'))
and (after_char == '' or after_char:match('[^%w_]'))
then
local utf_pos = vim.str_utfindex(str, foundPos - 1)
startPos = foundPos + 1
return utf8_positions[utf_pos + 1] - 1 -- Return byte position as screen column (Lua indexing starts from 1)
else
startPos = foundPos + 1
local utf_pos = vim.str_utfindex(str, startPos - 1)
return utf8_positions[utf_pos] - 1 -- Return byte position as screen column (Lua indexing starts from 1)
end
end
end
Expand All @@ -54,7 +50,14 @@ return {
return false
end
cache.cword = expand('<cword>')
if not cache.cword:find('[%w%z\192-\255]') then
local cursor_pos = api.nvim_win_get_cursor(winid)
if
not cache.cword:find('[%w%z\192-\255]')
or not ffi
.string(ml_get(cursor_pos[1]))
:sub(cursor_pos[2] + 1, cursor_pos[2] + 1)
:match('[%w_]')
then
cache.cword = nil
return false
end
Expand Down