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

Perform refactoring plug/easymotion.vim and init.vim

Browse Source 
Flatten indent and Delete InitOptions function
This commit is contained in:
haya14busa 2014-01-10 23:08:03 +09:00
parent 7568f2f561
commit fb81281dc8
2 changed files with 164 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
autoload/EasyMotion/init.vim
View File

@ -3,14 +3,6 @@ let s:save_cpo = &cpo
set cpo&vim set cpo&vim
" }}} " }}}
function! EasyMotion#init#InitOptions(options) " {{{
for [key, value] in items(a:options)
if ! exists('g:EasyMotion_' . key)
exec 'let g:EasyMotion_' . key . ' = ' . string(value)
endif
endfor
endfunction " }}}
function! EasyMotion#init#InitHL(group, colors) " {{{ function! EasyMotion#init#InitHL(group, colors) " {{{
let group_default = a:group . 'Default' let group_default = a:group . 'Default'
@ -44,14 +36,14 @@ endfunction " }}}
function! EasyMotion#init#InitMappings(motions, do_mapping) "{{{ function! EasyMotion#init#InitMappings(motions, do_mapping) "{{{
for [motion, fn] in items(a:motions) for [motion, fn] in items(a:motions)
" Prepare <Plug> mapping {{{ " Prepare <Plug> mapping {{{
silent exec 'nnoremap <silent> silent exec 'nnoremap <silent>' .
\ <Plug>(easymotion-' . motion . ') \ '<Plug>(easymotion-' . motion . ')
\ :call EasyMotion#' . fn.name . '(0, ' . fn.dir . ')<CR>' \ :call EasyMotion#' . fn.name . '(0, ' . fn.dir . ')<CR>'
silent exec 'onoremap <silent> silent exec 'onoremap <silent>' .
\ <Plug>(easymotion-' . motion . ') \ '<Plug>(easymotion-' . motion . ')
\ :call EasyMotion#' . fn.name . '(0, ' . fn.dir . ')<CR>' \ :call EasyMotion#' . fn.name . '(0, ' . fn.dir . ')<CR>'
silent exec 'vnoremap <silent> silent exec 'vnoremap <silent>' .
\ <Plug>(easymotion-' . motion . ') \ '<Plug>(easymotion-' . motion . ')
\ :<C-u>call EasyMotion#' . fn.name . '(1, ' . fn.dir . ')<CR>' \ :<C-u>call EasyMotion#' . fn.name . '(1, ' . fn.dir . ')<CR>'
"}}} "}}}
@ -74,14 +66,14 @@ endfunction "}}}
function! EasyMotion#init#InitSpecialMappings(motions, do_mapping) "{{{ function! EasyMotion#init#InitSpecialMappings(motions, do_mapping) "{{{
for [motion, fn] in items(a:motions) for [motion, fn] in items(a:motions)
silent exec 'onoremap <silent> silent exec 'onoremap <silent>' .
\ <Plug>(easymotion-special-' . motion . ') :call EasyMotion#' . fn.name . '()<CR>' \ '<Plug>(easymotion-special-' . motion . ') :call EasyMotion#' . fn.name . '()<CR>'
silent exec 'vnoremap <silent> silent exec 'vnoremap <silent>' .
\ <Plug>(easymotion-special-' . motion . ') :<C-u>call EasyMotion#' . fn.name . '()<CR>' \ '<Plug>(easymotion-special-' . motion . ') :<C-u>call EasyMotion#' . fn.name . '()<CR>'
silent exec 'nnoremap <silent> silent exec 'nnoremap <silent>' .
\ y<Plug>(easymotion-special-' . motion . ') :call EasyMotion#' . fn.name . 'Yank()<CR>' \ 'y<Plug>(easymotion-special-' . motion . ') :call EasyMotion#' . fn.name . 'Yank()<CR>'
silent exec 'nnoremap <silent> silent exec 'nnoremap <silent>' .
\ d<Plug>(easymotion-special-' . motion . ') :call EasyMotion#' . fn.name . 'Delete()<CR>' \ 'd<Plug>(easymotion-special-' . motion . ') :call EasyMotion#' . fn.name . 'Delete()<CR>'
" Do mapping {{{ " Do mapping {{{
if a:do_mapping if a:do_mapping

185
plugin/EasyMotion.vim
View File

@ -3,87 +3,83 @@
" Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com> " Author: Kim Silkebækken <kim.silkebaekken+vim@gmail.com>
" Source repository: https://github.com/Lokaltog/vim-easymotion " Source repository: https://github.com/Lokaltog/vim-easymotion
" Script initialization {{{ " == Script initialization {{{
if exists('g:EasyMotion_loaded') || &compatible || version < 702 if exists('g:EasyMotion_loaded') || &compatible || version < 702
finish finish
endif endif
let g:EasyMotion_loaded = 1 let g:EasyMotion_loaded = 1
" }}} " }}}
" Saving 'cpoptions' {{{ " == Saving 'cpoptions' {{{
let s:save_cpo = &cpo let s:save_cpo = &cpo
set cpo&vim set cpo&vim
" }}} " }}}
" Default configuration {{{ " == Default configuration {{{
" Default options {{{ " -- Option ------------------------------ {{{
let g:EasyMotion_do_mapping = get(g:, 'EasyMotion_do_mapping', 1) let g:EasyMotion_keys = get(g:,
if g:EasyMotion_do_mapping == 1 \ 'EasyMotion_keys', 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ')
if exists('g:EasyMotion_leader_key') let g:EasyMotion_do_mapping = get(g: , 'EasyMotion_do_mapping' , 1)
exec 'map ' . g:EasyMotion_leader_key . ' <Plug>(easymotion-prefix)' let g:EasyMotion_do_special_mapping = get(g: , 'EasyMotion_do_special_mapping' , 0)
else let g:EasyMotion_do_shade = get(g: , 'EasyMotion_do_shade' , 1)
if !hasmapto('<Plug>(easymotion-prefix)') let g:EasyMotion_grouping = get(g: , 'EasyMotion_grouping' , 1)
map <Leader><Leader> <Plug>(easymotion-prefix) let g:EasyMotion_startofline = get(g: , 'EasyMotion_startofline' , 1)
endif let g:EasyMotion_smartcase = get(g: , 'EasyMotion_smartcase' , 0)
endif let g:EasyMotion_skipfoldedline = get(g: , 'EasyMotion_skipfoldedline' , 1)
endif let g:EasyMotion_use_migemo = get(g: , 'EasyMotion_use_migemo' , 0)
call EasyMotion#init#InitOptions({ let g:EasyMotion_use_upper = get(g: , 'EasyMotion_use_upper' , 0)
\ 'keys' : 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ' let g:EasyMotion_enter_jump_first = get(g: , 'EasyMotion_enter_jump_first' , 0)
\ , 'do_shade' : 1 "}}}
\ , 'do_special_mapping' : 0
\ , 'grouping' : 1 " -- Default highlighting ---------------- {{{
\ , 'startofline' : 1 let g:EasyMotion_hl_group_target = get(g:,
\ , 'smartcase' : 0 \ 'EasyMotion_hl_group_target', 'EasyMotionTarget')
\ , 'skipfoldedline' : 1 let g:EasyMotion_hl2_first_group_target = get(g:,
\ , 'use_migemo' : 0 \ 'EasyMotion_hl2_first_group_target', 'EasyMotionTarget2First')
\ , 'use_upper' : 0 let g:EasyMotion_hl2_second_group_target = get(g:,
\ , 'enter_jump_first' : 0 \ 'EasyMotion_hl2_second_group_target', 'EasyMotionTarget2Second')
\ let g:EasyMotion_hl_group_shade = get(g:,
\ , 'hl_group_target' : 'EasyMotionTarget' \ 'EasyMotion_hl_group_shade', 'EasyMotionShade')
\ , 'hl2_first_group_target' : 'EasyMotionTarget2First' let g:EasyMotion_hl_line_group_shade = get(g:,
\ , 'hl2_second_group_target' : 'EasyMotionTarget2Second' \ 'EasyMotion_hl_line_group_shade', 'EasyMotionShadeLine')
\ , 'hl_group_shade' : 'EasyMotionShade'
\ , 'hl_line_group_shade' : 'EasyMotionShadeLine' let s:target_hl_defaults = {
\ })
" }}}
" Default highlighting {{{
let s:target_hl_defaults = {
\ 'gui' : ['NONE', '#ff0000' , 'bold'] \ 'gui' : ['NONE', '#ff0000' , 'bold']
\ , 'cterm256': ['NONE', '196' , 'bold'] \ , 'cterm256': ['NONE', '196' , 'bold']
\ , 'cterm' : ['NONE', 'red' , 'bold'] \ , 'cterm' : ['NONE', 'red' , 'bold']
\ } \ }
let s:target_hl2_first_defaults = { let s:target_hl2_first_defaults = {
\ 'gui' : ['NONE', '#ffb400' , 'bold'] \ 'gui' : ['NONE', '#ffb400' , 'bold']
\ , 'cterm256': ['NONE', '11' , 'bold'] \ , 'cterm256': ['NONE', '11' , 'bold']
\ , 'cterm' : ['NONE', '11' , 'bold'] \ , 'cterm' : ['NONE', '11' , 'bold']
\ } \ }
let s:target_hl2_second_defaults = { let s:target_hl2_second_defaults = {
\ 'gui' : ['NONE', '#b98300' , 'bold'] \ 'gui' : ['NONE', '#b98300' , 'bold']
\ , 'cterm256': ['NONE', '3' , 'bold'] \ , 'cterm256': ['NONE', '3' , 'bold']
\ , 'cterm' : ['NONE', '3' , 'bold'] \ , 'cterm' : ['NONE', '3' , 'bold']
\ } \ }
let s:shade_hl_defaults = { let s:shade_hl_defaults = {
\ 'gui' : ['NONE', '#777777' , 'NONE'] \ 'gui' : ['NONE', '#777777' , 'NONE']
\ , 'cterm256': ['NONE', '242' , 'NONE'] \ , 'cterm256': ['NONE', '242' , 'NONE']
\ , 'cterm' : ['NONE', 'grey' , 'NONE'] \ , 'cterm' : ['NONE', 'grey' , 'NONE']
\ } \ }
let s:shade_hl_line_defaults = { let s:shade_hl_line_defaults = {
\ 'gui' : ['red' , '#FFFFFF' , 'NONE'] \ 'gui' : ['red' , '#FFFFFF' , 'NONE']
\ , 'cterm256': ['red' , '242' , 'NONE'] \ , 'cterm256': ['red' , '242' , 'NONE']
\ , 'cterm' : ['red' , 'grey' , 'NONE'] \ , 'cterm' : ['red' , 'grey' , 'NONE']
\ } \ }
call EasyMotion#init#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults) 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_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_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_group_shade, s:shade_hl_defaults)
call EasyMotion#init#InitHL(g:EasyMotion_hl_line_group_shade, s:shade_hl_line_defaults) call EasyMotion#init#InitHL(g:EasyMotion_hl_line_group_shade, s:shade_hl_line_defaults)
" Reset highlighting after loading a new color scheme {{{ " Reset highlighting after loading a new color scheme {{{
augroup EasyMotionInitHL augroup EasyMotionInitHL
autocmd! autocmd!
autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults) autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_group_target, s:target_hl_defaults)
@ -91,11 +87,23 @@ set cpo&vim
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_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_group_shade, s:shade_hl_defaults)
autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_line_group_shade, s:shade_hl_line_defaults) autocmd ColorScheme * call EasyMotion#init#InitHL(g:EasyMotion_hl_line_group_shade, s:shade_hl_line_defaults)
augroup end augroup end
" }}} " }}}
" }}} " }}}
" Default key mapping {{{
call EasyMotion#init#InitMappings({ " -- Default key mapping ----------------- {{{
" Prepare prefix {{{
if g:EasyMotion_do_mapping == 1
if exists('g:EasyMotion_leader_key')
exec 'map ' . g:EasyMotion_leader_key . ' <Plug>(easymotion-prefix)'
else
if !hasmapto('<Plug>(easymotion-prefix)')
map <Leader><Leader> <Plug>(easymotion-prefix)
endif
endif
endif "}}}
call EasyMotion#init#InitMappings({
\ 'f' : { 'name': 'F' , 'dir': 0 } \ 'f' : { 'name': 'F' , 'dir': 0 }
\ , 'F' : { 'name': 'F' , 'dir': 1 } \ , 'F' : { 'name': 'F' , 'dir': 1 }
\ , 's' : { 'name': 'S' , 'dir': 2 } \ , 's' : { 'name': 'S' , 'dir': 2 }
@ -103,9 +111,9 @@ set cpo&vim
\ , 't' : { 'name': 'T' , 'dir': 0 } \ , 't' : { 'name': 'T' , 'dir': 0 }
\ , 'T' : { 'name': 'T' , 'dir': 1 } \ , 'T' : { 'name': 'T' , 'dir': 1 }
\ , 'w' : { 'name': 'WB' , 'dir': 0 } \ , 'w' : { 'name': 'WB' , 'dir': 0 }
\ , 'W' : { 'name': 'WBW', 'dir': 0 } \ , 'W' : { 'name': 'WBW' , 'dir': 0 }
\ , 'b' : { 'name': 'WB' , 'dir': 1 } \ , 'b' : { 'name': 'WB' , 'dir': 1 }
\ , 'B' : { 'name': 'WBW', 'dir': 1 } \ , 'B' : { 'name': 'WBW' , 'dir': 1 }
\ , 'e' : { 'name': 'E' , 'dir': 0 } \ , 'e' : { 'name': 'E' , 'dir': 0 }
\ , 'E' : { 'name': 'EW' , 'dir': 0 } \ , 'E' : { 'name': 'EW' , 'dir': 0 }
\ , 'ge': { 'name': 'E' , 'dir': 1 } \ , 'ge': { 'name': 'E' , 'dir': 1 }
@ -115,46 +123,49 @@ set cpo&vim
\ , 'n' : { 'name': 'Search' , 'dir': 0 } \ , 'n' : { 'name': 'Search' , 'dir': 0 }
\ , 'N' : { 'name': 'Search' , 'dir': 1 } \ , 'N' : { 'name': 'Search' , 'dir': 1 }
\ }, g:EasyMotion_do_mapping) \ }, g:EasyMotion_do_mapping)
" }}} " }}}
" Special mapping for other functions {{{
call EasyMotion#init#InitSpecialMappings({ " -- Special mapping for other functions - {{{
call EasyMotion#init#InitSpecialMappings({
\ 'l' : { 'name': 'SelectLines'} \ 'l' : { 'name': 'SelectLines'}
\ , 'p' : { 'name': 'SelectPhrase'} \ , 'p' : { 'name': 'SelectPhrase'}
\ }, g:EasyMotion_do_special_mapping) \ }, g:EasyMotion_do_special_mapping)
" }}} " }}}
" Prepare more key mapping {{{
" Note: bd is short for bidirectional " -- Prepare more key mapping ------------ {{{
" l is short for (within) line " Note: bd is short for bidirectional
call EasyMotion#init#InitMappings({ " l is short for (within) line
\ 'bd-w' : { 'name': 'WB' , 'dir': 2 } call EasyMotion#init#InitMappings({
\ , 'bd-W' : { 'name': 'WBW' , 'dir': 2 } \ 'bd-w' : { 'name' : 'WB' , 'dir' : 2 }
\ , 'bd-e' : { 'name': 'E' , 'dir': 2 } \ , 'bd-W' : { 'name' : 'WBW' , 'dir' : 2 }
\ , 'bd-E' : { 'name': 'EW' , 'dir': 2 } \ , 'bd-e' : { 'name' : 'E' , 'dir' : 2 }
\ , 'bd-n' : { 'name': 'Search' , 'dir': 2 } \ , 'bd-E' : { 'name' : 'EW' , 'dir' : 2 }
\ , 'bd-jk' : { 'name': 'JK' , 'dir': 2 } \ , 'bd-n' : { 'name' : 'Search' , 'dir' : 2 }
\ , 'bd-jk' : { 'name' : 'JK' , 'dir' : 2 }
\ \
\ , 'jumptoanywhere' : { 'name': 'JumpToAnywhere' , 'dir': 2 } \ , 'jumptoanywhere' : { 'name' : 'JumpToAnywhere' , 'dir' : 2 }
\ , 'lineforward' : { 'name': 'LineAnywhere' , 'dir': 0 } \ , 'lineforward' : { 'name' : 'LineAnywhere' , 'dir' : 0 }
\ , 'linebackward' : { 'name': 'LineAnywhere' , 'dir': 1 } \ , 'linebackward' : { 'name' : 'LineAnywhere' , 'dir' : 1 }
\ , 'lineanywhere' : { 'name': 'LineAnywhere' , 'dir': 2 } \ , 'lineanywhere' : { 'name' : 'LineAnywhere' , 'dir' : 2 }
\ \
\ , 'sl' : { 'name': 'SL' , 'dir': 2 } \ , 'sl' : { 'name' : 'SL' , 'dir' : 2 }
\ , 'fl' : { 'name': 'SL' , 'dir': 0 } \ , 'fl' : { 'name' : 'SL' , 'dir' : 0 }
\ , 'Fl' : { 'name': 'SL' , 'dir': 1 } \ , 'Fl' : { 'name' : 'SL' , 'dir' : 1 }
\ , 'tl' : { 'name': 'TL' , 'dir': 0 } \ , 'tl' : { 'name' : 'TL' , 'dir' : 0 }
\ , 'Tl' : { 'name': 'TL' , 'dir': 1 } \ , 'Tl' : { 'name' : 'TL' , 'dir' : 1 }
\ , 'wl' : { 'name': 'WBL' , 'dir': 0 } \ , 'wl' : { 'name' : 'WBL' , 'dir' : 0 }
\ , 'bl' : { 'name': 'WBL' , 'dir': 1 } \ , 'bl' : { 'name' : 'WBL' , 'dir' : 1 }
\ , 'bd-wl' : { 'name': 'WBL' , 'dir': 2 } \ , 'bd-wl' : { 'name' : 'WBL' , 'dir' : 2 }
\ , 'el' : { 'name': 'EL' , 'dir': 0 } \ , 'el' : { 'name' : 'EL' , 'dir' : 0 }
\ , 'gel' : { 'name': 'EL' , 'dir': 1 } \ , 'gel' : { 'name' : 'EL' , 'dir' : 1 }
\ , 'bd-el' : { 'name': 'EL' , 'dir': 2 } \ , 'bd-el' : { 'name' : 'EL' , 'dir' : 2 }
\ \
\ , 'repeat' : { 'name': 'Repeat' , 'dir': 0 } \ , 'repeat' : { 'name': 'Repeat' , 'dir': 0 }
\ }, 0) " Prepare <Plug> but don't map by default. \ }, 0) " Prepare <Plug> but don't map by default.
" }}}
" }}} " }}}
" Restore 'cpoptions' {{{
" }}}
" == Restore 'cpoptions' {{{
let &cpo = s:save_cpo let &cpo = s:save_cpo
unlet s:save_cpo unlet s:save_cpo
" }}} " }}}