Skip to content

Use faster highlighting when available #420

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use faster highlighting when available #420

Show file tree
Hide file tree
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
108 changes: 85 additions & 23 deletions autoload/EasyMotion.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ set cpo&vim
let s:TRUE = !0
let s:FALSE = 0
let s:DIRECTION = { 'forward': 0, 'backward': 1, 'bidirection': 2}
let s:HAS_NVIM = exists('*nvim_buf_add_highlight') &&
\ exists('*nvim_create_namespace') &&
\ exists('*nvim_buf_clear_namespace')


" Init: {{{
Expand Down Expand Up @@ -988,6 +991,15 @@ function! s:PromptUser(groups) "{{{
let coord_key_dict = s:CreateCoordKeyDict(a:groups)

let prev_col_num = 0

if s:HAS_NVIM
let ns = nvim_create_namespace("easymotion")
endif

let hl_lists = {}
let hl_lists[g:EasyMotion_hl_group_target] = []
let hl_lists[g:EasyMotion_hl2_first_group_target] = []
let hl_lists[g:EasyMotion_hl2_second_group_target] = []
for dict_key in sort(coord_key_dict[0])
" NOTE: {{{
" let g:EasyMotion_keys = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
Expand Down Expand Up @@ -1073,9 +1085,13 @@ function! s:PromptUser(groups) "{{{
\ : (i == 0) ? g:EasyMotion_hl2_first_group_target
\ : g:EasyMotion_hl2_second_group_target

if exists('*matchaddpos')
call EasyMotion#highlight#add_pos_highlight(
\ line_num, col_num + col_add, _hl_group)
if s:HAS_NVIM
call nvim_buf_add_highlight(0, ns, _hl_group,
\ line_num - 1, col_num + col_add - 1, col_num + col_add)
elseif exists('*matchaddpos')
call add(hl_lists[_hl_group], [line_num, col_num + col_add])
" call EasyMotion#highlight#add_pos_highlight(
" \ line_num, col_num + col_add, _hl_group)
else
call EasyMotion#highlight#add_highlight(
\ '\%' . line_num . 'l' . target_col_regexp,
Expand All @@ -1091,6 +1107,9 @@ function! s:PromptUser(groups) "{{{
endfor
"}}}
endfor
for [group, hl_list] in items(hl_lists)
call EasyMotion#highlight#add_pos_highlight_batch(hl_list, group)
endfor

let lines_items = items(lines)
" }}}
Expand Down Expand Up @@ -1137,11 +1156,15 @@ function! s:PromptUser(groups) "{{{
call s:SetLines(lines_items, 'orig')

" Un-highlight targets {{{
call EasyMotion#highlight#delete_highlight(
\ g:EasyMotion_hl_group_target,
\ g:EasyMotion_hl2_first_group_target,
\ g:EasyMotion_hl2_second_group_target,
\ )
if s:HAS_NVIM
call nvim_buf_clear_namespace(0, ns, 0, -1)
else
call EasyMotion#highlight#delete_highlight(
\ g:EasyMotion_hl_group_target,
\ g:EasyMotion_hl2_first_group_target,
\ g:EasyMotion_hl2_second_group_target,
\ )
endif
" }}}

" Restore undo tree
Expand Down Expand Up @@ -1376,27 +1399,62 @@ function! s:EasyMotion(regexp, direction, visualmode, is_inclusive, ...) " {{{
let groups = GroupingFn(targets, split(g:EasyMotion_keys, '\zs'))

" -- Shade inactive source --------------- {{{
if s:HAS_NVIM
let ns = nvim_create_namespace('easymotion')
endif
if g:EasyMotion_do_shade && targets_len != 1 && s:flag.dot_repeat != 1
let cur = s:current.cursor_position
if a:direction == 1 " Backward
let shade_hl_re = s:flag.within_line
\ ? '^.*\%#'
\ : '\%'. win_first_line .'l\_.*\%#'
if s:HAS_NVIM
for line_num in range(win_first_line-1, cur[0]-2)
call nvim_buf_add_highlight(0, ns,
\ g:EasyMotion_hl_group_shade, line_num, 0, -1)
endfor
call nvim_buf_add_highlight(0, ns,
\ g:EasyMotion_hl_group_shade, cur[0]-1, 0, cur[1]-1)
else
let shade_hl_re = s:flag.within_line
\ ? '^.*\%#'
\ : '\%'. win_first_line .'l\_.*\%#'
endif
elseif a:direction == 0 " Forward
let shade_hl_re = s:flag.within_line
\ ? '\%#.*$'
\ : '\%#\_.*\%'. win_last_line .'l'
if s:HAS_NVIM
for line_num in range(cur[0], win_last_line-1)
call nvim_buf_add_highlight(0, ns,
\ g:EasyMotion_hl_group_shade, line_num, 0, -1)
endfor
call nvim_buf_add_highlight(0, ns,
\ g:EasyMotion_hl_group_shade, cur[0]-1, cur[1], -1)
else
let shade_hl_re = s:flag.within_line
\ ? '\%#.*$'
\ : '\%#\_.*\%'. win_last_line .'l'
endif
else " Both directions
let shade_hl_re = s:flag.within_line
\ ? '^.*\%#.*$'
\ : '\_.*'
if s:HAS_NVIM
for line_num in range(win_first_line-1, win_last_line-1)
call nvim_buf_add_highlight(0, ns,
\ g:EasyMotion_hl_group_shade, line_num, 0, -1)
endfor
else
let shade_hl_re = s:flag.within_line
\ ? '^.*\%#.*$'
\ : '\_.*'
endif
endif

call EasyMotion#highlight#add_highlight(
\ shade_hl_re, g:EasyMotion_hl_group_shade)
if !s:HAS_NVIM
call EasyMotion#highlight#add_highlight(
\ shade_hl_re, g:EasyMotion_hl_group_shade)
endif
if g:EasyMotion_cursor_highlight
let cursor_hl_re = '\%#'
call EasyMotion#highlight#add_highlight(cursor_hl_re,
\ g:EasyMotion_hl_inc_cursor)
if s:HAS_NVIM
call nvim_buf_add_highlight(0, ns, g:EasyMotion_hl_inc_cursor, cur[0]-1, cur[1]-1, cur[1])
else
let cursor_hl_re = '\%#'
call EasyMotion#highlight#add_highlight(cursor_hl_re,
\ g:EasyMotion_hl_inc_cursor)
endif
endif
endif
" }}}
Expand Down Expand Up @@ -1577,7 +1635,11 @@ function! s:EasyMotion(regexp, direction, visualmode, is_inclusive, ...) " {{{
call EasyMotion#reset()
" }}}
" -- Remove shading ---------------------- {{{
call EasyMotion#highlight#delete_highlight()
if s:HAS_NVIM
call nvim_buf_clear_namespace(0, ns, 0, -1)
else
call EasyMotion#highlight#delete_highlight()
endif
" }}}

if s:EasyMotion_is_cancelled == 0 " Success
Expand Down
7 changes: 7 additions & 0 deletions autoload/EasyMotion/highlight.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ endfunction "}}}
function! EasyMotion#highlight#add_pos_highlight(line_num, col_num, group) "{{{
call add(s:h.ids[a:group], matchaddpos(a:group, [[a:line_num, a:col_num]], s:priorities[a:group]))
endfunction "}}}
function! EasyMotion#highlight#add_pos_highlight_batch(pos_list, group) "{{{
let n = len(a:pos_list)
for i in range(0, n - 1, 8)
call add(s:h.ids[a:group], matchaddpos(a:group, a:pos_list[i:i + 7], s:priorities[a:group]))
endfor
call add(s:h.ids[a:group], matchaddpos(a:group, a:pos_list[(n / 8) * 8:], s:priorities[a:group]))
endfunction "}}}
function! EasyMotion#highlight#attach_autocmd() "{{{
" Reference: https://github.com/justinmk/vim-sneak
augroup plugin-easymotion
Expand Down