From 949448ec24411b3dc579ff8e2d3dbff2f362ab9b Mon Sep 17 00:00:00 2001 From: haya14busa Date: Wed, 5 Feb 2014 13:30:51 +0900 Subject: [PATCH] Move highlight to autoload/ from plugin/ --- autoload/EasyMotion.vim | 1 + autoload/EasyMotion/highlight.vim | 95 +++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) diff --git a/autoload/EasyMotion.vim b/autoload/EasyMotion.vim index 62c6ec5..f3b9ef1 100644 --- a/autoload/EasyMotion.vim +++ b/autoload/EasyMotion.vim @@ -12,6 +12,7 @@ set cpo&vim " }}} " Init: {{{ function! EasyMotion#init() + call EasyMotion#highlight#init() " Store previous motion info let s:previous = {} " Store previous operator-pending motion info for '.' repeat diff --git a/autoload/EasyMotion/highlight.vim b/autoload/EasyMotion/highlight.vim index b913d70..d75885e 100644 --- a/autoload/EasyMotion/highlight.vim +++ b/autoload/EasyMotion/highlight.vim @@ -30,6 +30,99 @@ let s:save_cpo = &cpo set cpo&vim " }}} +function! EasyMotion#highlight#init() "{{{ + " -- Default highlighting ---------------- {{{ + let g:EasyMotion_hl_group_target = get(g:, + \ 'EasyMotion_hl_group_target', 'EasyMotionTarget') + let g:EasyMotion_hl2_first_group_target = get(g:, + \ 'EasyMotion_hl2_first_group_target', 'EasyMotionTarget2First') + let g:EasyMotion_hl2_second_group_target = get(g:, + \ 'EasyMotion_hl2_second_group_target', 'EasyMotionTarget2Second') + let g:EasyMotion_hl_group_shade = get(g:, + \ 'EasyMotion_hl_group_shade', 'EasyMotionShade') + + let g:EasyMotion_hl_inc_search = get(g:, + \ 'EasyMotion_hl_inc_search', 'EasyMotionIncSearch') + let g:EasyMotion_hl_inc_cursor = get(g:, + \ 'EasyMotion_hl_inc_cursor', 'EasyMotionIncCursor') + let g:EasyMotion_hl_move = get(g:, + \ 'EasyMotion_hl_move', 'EasyMotionMoveHL') + + let s:target_hl_defaults = { + \ 'gui' : ['NONE', '#ff0000' , 'bold'] + \ , 'cterm256': ['NONE', '196' , 'bold'] + \ , 'cterm' : ['NONE', 'red' , 'bold'] + \ } + + let s:target_hl2_first_defaults = { + \ 'gui' : ['NONE', '#ffb400' , 'bold'] + \ , 'cterm256': ['NONE', '11' , 'bold'] + \ , 'cterm' : ['NONE', 'yellow' , 'bold'] + \ } + + let s:target_hl2_second_defaults = { + \ 'gui' : ['NONE', '#b98300' , 'bold'] + \ , 'cterm256': ['NONE', '3' , 'bold'] + \ , 'cterm' : ['NONE', 'yellow' , 'bold'] + \ } + + let s:shade_hl_defaults = { + \ 'gui' : ['NONE', '#777777' , 'NONE'] + \ , 'cterm256': ['NONE', '242' , 'NONE'] + \ , 'cterm' : ['NONE', 'grey' , 'NONE'] + \ } + + let s:shade_hl_line_defaults = { + \ 'gui' : ['red' , '#FFFFFF' , 'NONE'] + \ , 'cterm256': ['red' , '242' , 'NONE'] + \ , 'cterm' : ['red' , 'grey' , 'NONE'] + \ } + + let s:target_hl_inc = { + \ 'gui' : ['NONE', '#7fbf00' , 'bold'] + \ , 'cterm256': ['NONE', 'green' , 'bold'] + \ , 'cterm' : ['NONE', 'green' , 'bold'] + \ } + let s:target_hl_inc_cursor = { + \ 'gui' : ['#ACDBDA', '#121813' , 'bold'] + \ , 'cterm256': ['cyan' , 'black' , 'bold'] + \ , 'cterm' : ['cyan' , 'black' , 'bold'] + \ } + let s:target_hl_move = { + \ 'gui' : ['#7fbf00', '#121813' , 'bold'] + \ , 'cterm256': ['green' , 'white' , 'bold'] + \ , 'cterm' : ['green' , 'white' , 'bold'] + \ } + + call EasyMotion#init#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults) + call EasyMotion#init#InitHL(g:EasyMotion_hl2_first_group_target, s:target_hl2_first_defaults) + call EasyMotion#init#InitHL(g:EasyMotion_hl2_second_group_target, s:target_hl2_second_defaults) + call EasyMotion#init#InitHL(g:EasyMotion_hl_group_shade, s:shade_hl_defaults) + + call EasyMotion#init#InitHL(g:EasyMotion_hl_inc_search, s:target_hl_inc) + call EasyMotion#init#InitHL(g:EasyMotion_hl_inc_cursor, s:target_hl_inc_cursor) + call EasyMotion#init#InitHL(g:EasyMotion_hl_move, s:target_hl_move) + + " Reset highlighting after loading a new color scheme {{{ + augroup EasyMotionInitHL + autocmd! + + autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults) + autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl2_first_group_target, s:target_hl2_first_defaults) + autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl2_second_group_target, s:target_hl2_second_defaults) + autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_group_shade, s:shade_hl_defaults) + + autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_inc_search, s:target_hl_inc) + autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_inc_cursor, s:target_hl_inc_cursor) + autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_move, s:target_hl_move) + augroup end + " }}} + " }}} +endfunction "}}} + + + +call EasyMotion#highlight#init() " Init: {{{ let s:h = {} let s:h.ids = {} @@ -79,6 +172,8 @@ function! EasyMotion#highlight#add_color_group(new_groups) "{{{ endfor endfunction "}}} + + " Restore 'cpoptions' {{{ let &cpo = s:save_cpo unlet s:save_cpo