Skip to content

Configuable highlight priority #25

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
yuki-yano wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Configuable highlight priority #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60dee3e
Add highlight priority
yuki-yano Feb 20, 2020
b18e752
Fix highlight_priority add to matchaddpos
yuki-yano Feb 20, 2020
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
4 changes: 4 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ let g:ruby_hl_lvar_hl_group = 'RubyLocalVariable'
" Default: 1
let g:ruby_hl_lvar_auto_enable = 0

" g:ruby_hl_lvar_hl_group highlight priority
" Default: 0
let g:ruby_hl_lvar_highlight_priority = 0

" If you wish to control the plugin manually, map these functions.
nmap <leader>he <Plug>(ruby_hl_lvar-enable)
nmap <leader>hd <Plug>(ruby_hl_lvar-disable)
Expand Down
4 changes: 2 additions & 2 deletions autoload/ruby_hl_lvar.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ function! s:redraw_window()
let i = 0
while i < size
let poses = b:ruby_hl_lvar_match_poses[i : i + 7]
let m = matchaddpos(g:ruby_hl_lvar_hl_group, poses, 0)
let m = matchaddpos(g:ruby_hl_lvar_hl_group, poses, g:ruby_hl_lvar_highlight_priority)
call add(w:ruby_hl_lvar_match_ids, m)
let i += 8
endwhile
endif
else
if get(b:, 'ruby_hl_lvar_match_pattern', '') != ''
let w:ruby_hl_lvar_match_id = matchadd(g:ruby_hl_lvar_hl_group, b:ruby_hl_lvar_match_pattern, 0)
let w:ruby_hl_lvar_match_id = matchadd(g:ruby_hl_lvar_hl_group, b:ruby_hl_lvar_match_pattern, g:ruby_hl_lvar_highlight_priority)
Copy link
Collaborator

@pocke pocke Feb 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you replace 0 on L62 with the option?

ruby_hl_lvar.vim/autoload/ruby_hl_lvar.vim

Line 62 in 10b6f79

let m = matchaddpos(g:ruby_hl_lvar_hl_group, poses, 0)

This plugin uses both of matchadd and matchaddpos functions, so we need to update both function callings.

By the way, I guess we can drop to support matchadd function.
matchaddpos is available since Vim 7.4.330 (ref: #9), but we can use Vim 8.1 now.
It is not a too edge API already, so we have no reason to keep compatibility of old Vim 7.4.

Copy link
Author

@yuki-yano yuki-yano Feb 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed b18e752

endif
endif

Expand Down
3 changes: 3 additions & 0 deletions plugin/ruby_hl_lvar.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ let g:ruby_hl_lvar_auto_enable =
let g:ruby_hl_lvar_show_warnings =
\ get(g:, 'ruby_hl_lvar_show_warnings', 0)

let g:ruby_hl_lvar_highlight_priority =
\ get(g:, 'ruby_hl_lvar_highlight_priority', 0)

augroup ruby_hl_lvar
autocmd!
autocmd Filetype * call Ruby_hl_lvar_filetype()
Expand Down