vim/vim-easymotion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve highlight

Browse Source
This commit is contained in:
haya14busa 2014-02-05 16:03:40 +09:00
parent 949448ec24
commit 8a11e55e60
1 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
autoload/EasyMotion.vim
View File

@ -3,7 +3,7 @@
" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com> " Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
" haya14busa <hayabusa1419@gmail.com> " haya14busa <hayabusa1419@gmail.com>
" Source: https://github.com/Lokaltog/vim-easymotion " Source: https://github.com/Lokaltog/vim-easymotion
" Last Change: 04 Feb 2014. " Last Change: 05 Feb 2014.
"============================================================================= "=============================================================================
" Saving 'cpoptions' {{{ " Saving 'cpoptions' {{{
scriptencoding utf-8 scriptencoding utf-8
@ -807,9 +807,6 @@ function! s:PromptUser(groups) "{{{
" }}} " }}}
" -- Prepare marker lines ---------------- {{{ " -- Prepare marker lines ---------------- {{{
let lines = {} let lines = {}
let hl_coords = []
let hl2_first_coords = [] " Highlight for two characters
let hl2_second_coords = [] " Highlight for two characters
let coord_key_dict = s:CreateCoordKeyDict(a:groups) let coord_key_dict = s:CreateCoordKeyDict(a:groups)
@ -881,15 +878,20 @@ function! s:PromptUser(groups) "{{{
let lines[line_num]['marker'] = target_key let lines[line_num]['marker'] = target_key
endif endif
" Add highlighting coordinates " -- Highlight targets ------------------- {{{
if target_key_len == 1 if target_key_len == 1
call add(hl_coords, '\%' . line_num . 'l\%' . col_num . 'c') call EasyMotion#highlight#add_highlight(
\ '\%' . line_num . 'l\%' . col_num . 'c',
\ g:EasyMotion_hl_group_target)
else else
call add(hl2_first_coords, call EasyMotion#highlight#add_highlight(
\ '\%' . line_num . 'l\%' . col_num . 'c') \ '\%' . line_num . 'l\%' . col_num . 'c',
call add(hl2_second_coords, \ g:EasyMotion_hl2_first_group_target)
\ '\%' . line_num . 'l\%' . (col_num + 1) . 'c') call EasyMotion#highlight#add_highlight(
\ '\%' . line_num . 'l\%' . (col_num + 1) . 'c',
\ g:EasyMotion_hl2_second_group_target)
endif endif
"}}}
" Add marker/target length difference for multibyte " Add marker/target length difference for multibyte
" compensation " compensation
@ -899,23 +901,6 @@ function! s:PromptUser(groups) "{{{
let lines_items = items(lines) let lines_items = items(lines)
" }}} " }}}
" -- Highlight targets ------------------- {{{
if len(hl_coords) > 0
let hl_coords_re = '\%(' . join(hl_coords, '\|') . '\)'
call EasyMotion#highlight#add_highlight(
\ hl_coords_re, g:EasyMotion_hl_group_target)
endif
if len(hl2_first_coords) > 0
let hl2_first_coords_re = '\%(' . join(hl2_first_coords, '\|') . '\)'
call EasyMotion#highlight#add_highlight(
\ hl2_first_coords_re, g:EasyMotion_hl2_first_group_target)
endif
if len(hl2_second_coords) > 0
let hl2_second_coords_re = '\%(' . join(hl2_second_coords, '\|') . '\)'
call EasyMotion#highlight#add_highlight(
\ hl2_second_coords_re, g:EasyMotion_hl2_second_group_target)
endif
" }}}
" -- Put labels on targets & Get User Input & Restore all {{{ " -- Put labels on targets & Get User Input & Restore all {{{
" Save undo tree {{{ " Save undo tree {{{