diff --git a/autoload/vital/_easymotion.vim b/autoload/vital/_easymotion.vim index 1754cb4..ae19f5b 100644 --- a/autoload/vital/_easymotion.vim +++ b/autoload/vital/_easymotion.vim @@ -1,289 +1,5 @@ -let s:self_version = expand(':t:r') -let s:self_file = expand('') -let s:base_dir = expand(':h') +let s:_plugin_name = expand(':t:r') -let s:loaded = {} -let s:cache_module_path = {} -let s:cache_sid = {} - -let s:_unify_path_cache = {} - -function! s:plugin_name() abort - return s:self_version[1 :] -endfunction - -function! s:vital_files() abort - if !exists('s:vital_files') - let s:vital_files = - \ map( - \ s:plugin_name() ==# '_latest__' - \ ? s:_global_vital_files() - \ : s:_self_vital_files(), - \ 'fnamemodify(v:val, ":p:gs?[\\\\/]?/?")') - endif - return copy(s:vital_files) -endfunction - -function! s:import(name, ...) abort - let target = {} - let functions = [] - for a in a:000 - if type(a) == type({}) - let target = a - elseif type(a) == type([]) - let functions = a - endif - unlet a - endfor - let module = s:_import(a:name) - if empty(functions) - call extend(target, module, 'keep') - else - for f in functions - if has_key(module, f) && !has_key(target, f) - let target[f] = module[f] - endif - endfor - endif - return target -endfunction - -function! s:load(...) dict abort - for arg in a:000 - let [name; as] = type(arg) == type([]) ? arg[: 1] : [arg, arg] - let target = split(join(as, ''), '\W\+') - let dict = self - let dict_type = type({}) - while !empty(target) - let ns = remove(target, 0) - if !has_key(dict, ns) - let dict[ns] = {} - endif - if type(dict[ns]) == dict_type - let dict = dict[ns] - else - unlet dict - break - endif - endwhile - - if exists('dict') - call extend(dict, s:_import(name)) - endif - unlet arg - endfor - return self -endfunction - -function! s:unload() abort - let s:loaded = {} - let s:cache_sid = {} - let s:cache_module_path = {} - unlet! s:vital_files -endfunction - -function! s:exists(name) abort - return s:_get_module_path(a:name) !=# '' -endfunction - -function! s:search(pattern) abort - let paths = s:_extract_files(a:pattern, s:vital_files()) - let modules = sort(map(paths, 's:_file2module(v:val)')) - return s:_uniq(modules) -endfunction - -function! s:_import(name) abort - if type(a:name) == type(0) - return s:_build_module(a:name) - endif - let path = s:_get_module_path(a:name) - if path ==# '' - throw 'vital: module not found: ' . a:name - endif - let sid = s:_get_sid_by_script(path) - if !sid - try - execute 'source' fnameescape(path) - catch /^Vim\%((\a\+)\)\?:E484/ - throw 'vital: module not found: ' . a:name - catch /^Vim\%((\a\+)\)\?:E127/ - " Ignore. - endtry - - let sid = s:_get_sid_by_script(path) - endif - return s:_build_module(sid) -endfunction - -function! s:_get_module_path(name) abort - let key = a:name . '_' - if has_key(s:cache_module_path, key) - return s:cache_module_path[key] - endif - if s:_is_absolute_path(a:name) && filereadable(a:name) - return a:name - endif - if a:name =~# '\v^\u\w*%(\.\u\w*)*$' - let paths = s:_extract_files(a:name, s:vital_files()) - else - throw 'vital: Invalid module name: ' . a:name - endif - - call filter(paths, 'filereadable(expand(v:val, 1))') - let path = get(paths, 0, '') - let s:cache_module_path[key] = path - return path -endfunction - -function! s:_get_sid_by_script(path) abort - if has_key(s:cache_sid, a:path) - return s:cache_sid[a:path] - endif - - let path = s:_unify_path(a:path) - let p = 'stridx(v:val, s:self_version) > 0 || stridx(v:val, "__latest__") > 0' - for line in filter(split(s:_redir('scriptnames'), "\n"), p) - let list = matchlist(line, '^\s*\(\d\+\):\s\+\(.\+\)\s*$') - if !empty(list) && s:_unify_path(list[2]) ==# path - let s:cache_sid[a:path] = list[1] - 0 - return s:cache_sid[a:path] - endif - endfor - return 0 -endfunction - -function! s:_file2module(file) abort - let filename = fnamemodify(a:file, ':p:gs?[\\/]?/?') - let tail = matchstr(filename, 'autoload/vital/_\w\+/\zs.*\ze\.vim$') - return join(split(tail, '[\\/]\+'), '.') -endfunction - -if filereadable(expand(':r') . '.VIM') - " resolve() is slow, so we cache results. - " Note: On windows, vim can't expand path names from 8.3 formats. - " So if getting full path via and $HOME was set as 8.3 format, - " vital load duplicated scripts. Below's :~ avoid this issue. - function! s:_unify_path(path) abort - if has_key(s:_unify_path_cache, a:path) - return s:_unify_path_cache[a:path] - endif - let value = tolower(fnamemodify(resolve(fnamemodify( - \ a:path, ':p')), ':~:gs?[\\/]?/?')) - let s:_unify_path_cache[a:path] = value - return value - endfunction -else - function! s:_unify_path(path) abort - return resolve(fnamemodify(a:path, ':p:gs?[\\/]?/?')) - endfunction -endif - -function! s:_self_vital_files() abort - let base = s:base_dir . '/*/**/*.vim' - return split(glob(base, 1), "\n") -endfunction - -function! s:_global_vital_files() abort - let pattern = 'autoload/vital/__latest__/**/*.vim' - return split(globpath(&runtimepath, pattern, 1), "\n") -endfunction - -function! s:_extract_files(pattern, files) abort - let tr = {'.': '/', '*': '[^/]*', '**': '.*'} - let target = substitute(a:pattern, '\.\|\*\*\?', '\=tr[submatch(0)]', 'g') - let regexp = printf('autoload/vital/[^/]\+/%s.vim$', target) - return filter(a:files, 'v:val =~# regexp') -endfunction - -" Copy from System.Filepath -if has('win16') || has('win32') || has('win64') - function! s:_is_absolute_path(path) abort - return a:path =~? '^[a-z]:[/\\]' - endfunction -else - function! s:_is_absolute_path(path) abort - return a:path[0] ==# '/' - endfunction -endif - -function! s:_build_module(sid) abort - if has_key(s:loaded, a:sid) - return copy(s:loaded[a:sid]) - endif - let functions = s:_get_functions(a:sid) - - let prefix = '' . a:sid . '_' - let module = {} - for func in functions - let module[func] = function(prefix . func) - endfor - if has_key(module, '_vital_created') - call module._vital_created(module) - endif - let export_module = filter(copy(module), 'v:key =~# "^\\a"') - " Cache module before calling module.vital_debug() to avoid cyclic - " dependences but remove the cache if module._vital_loaded() fails. - let s:loaded[a:sid] = get(g:, 'vital_debug', 0) ? module : export_module - if has_key(module, '_vital_loaded') - try - let V = vital#{s:self_version}#new() - call module._vital_loaded(V) - catch - unlet s:loaded[a:sid] - throw 'vital: fail to call ._vital_loaded(): ' . v:exception - endtry - endif - return copy(s:loaded[a:sid]) -endfunction - -if exists('+regexpengine') - function! s:_get_functions(sid) abort - let funcs = s:_redir(printf("function /\\%%#=2^\%d_", a:sid)) - let map_pat = '' . a:sid . '_\zs\w\+' - return map(split(funcs, "\n"), 'matchstr(v:val, map_pat)') - endfunction -else - function! s:_get_functions(sid) abort - let prefix = '' . a:sid . '_' - let funcs = s:_redir('function') - let filter_pat = '^\s*function ' . prefix - let map_pat = prefix . '\zs\w\+' - return map(filter(split(funcs, "\n"), - \ 'stridx(v:val, prefix) > 0 && v:val =~# filter_pat'), - \ 'matchstr(v:val, map_pat)') - endfunction -endif - -if exists('*uniq') - function! s:_uniq(list) abort - return uniq(a:list) - endfunction -else - function! s:_uniq(list) abort - let i = len(a:list) - 1 - while 0 < i - if a:list[i] ==# a:list[i - 1] - call remove(a:list, i) - let i -= 2 - else - let i -= 1 - endif - endwhile - return a:list - endfunction -endif - -function! s:_redir(cmd) abort - let [save_verbose, save_verbosefile] = [&verbose, &verbosefile] - set verbose=0 verbosefile= - redir => res - silent! execute a:cmd - redir END - let [&verbose, &verbosefile] = [save_verbose, save_verbosefile] - return res -endfunction - -function! vital#{s:self_version}#new() abort - let sid = s:_get_sid_by_script(s:self_file) - return s:_build_module(sid) +function! vital#{s:_plugin_name}#new() abort + return vital#{s:_plugin_name[1:]}#of() endfunction diff --git a/autoload/vital/_easymotion/Data/Dict.vim b/autoload/vital/_easymotion/Data/Dict.vim index 393aa8d..482886d 100644 --- a/autoload/vital/_easymotion/Data/Dict.vim +++ b/autoload/vital/_easymotion/Data/Dict.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Data#Dict#import() abort + return map({'pick': '', 'clear': '', 'max_by': '', 'foldl': '', 'swap': '', 'omit': '', 'min_by': '', 'foldr': '', 'make_index': '', 'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Data#Dict#import() abort', printf("return map({'pick': '', 'clear': '', 'max_by': '', 'foldl': '', 'swap': '', 'omit': '', 'min_by': '', 'foldr': '', 'make_index': '', 'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ " Utilities for dictionary. let s:save_cpo = &cpo @@ -99,29 +114,3 @@ let &cpo = s:save_cpo unlet s:save_cpo " vim:set et ts=2 sts=2 sw=2 tw=0: -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'clear': s:___revitalizer_function___('s:clear'),'foldl': s:___revitalizer_function___('s:foldl'),'foldr': s:___revitalizer_function___('s:foldr'),'make': s:___revitalizer_function___('s:make'),'make_index': s:___revitalizer_function___('s:make_index'),'max_by': s:___revitalizer_function___('s:max_by'),'min_by': s:___revitalizer_function___('s:min_by'),'omit': s:___revitalizer_function___('s:omit'),'pick': s:___revitalizer_function___('s:pick'),'swap': s:___revitalizer_function___('s:swap')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Data#Dict#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Data/List.vim b/autoload/vital/_easymotion/Data/List.vim index 15a7117..2302cd8 100644 --- a/autoload/vital/_easymotion/Data/List.vim +++ b/autoload/vital/_easymotion/Data/List.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Data#List#import() abort + return map({'combinations': '', 'and': '', 'sort_by': '', 'foldr1': '', 'sort': '', 'flatten': '', 'has_index': '', 'find_indices': '', 'any': '', 'unshift': '', 'span': '', 'pop': '', 'binary_search': '', 'uniq_by': '', 'or': '', 'all': '', 'zip': '', 'find_last_index': '', 'find': '', 'partition': '', 'map_accum': '', 'permutations': '', 'break': '', 'max_by': '', 'foldl': '', 'foldr': '', 'find_index': '', 'group_by': '', 'take_while': '', 'conj': '', 'push': '', 'char_range': '', 'cons': '', 'foldl1': '', 'intersect': '', 'concat': '', 'shift': '', 'clear': '', 'has_common_items': '', 'product': '', 'zip_fill': '', 'uniq': '', 'has': '', 'min_by': '', 'with_index': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Data#List#import() abort', printf("return map({'combinations': '', 'and': '', 'sort_by': '', 'foldr1': '', 'sort': '', 'flatten': '', 'has_index': '', 'find_indices': '', 'any': '', 'unshift': '', 'span': '', 'pop': '', 'binary_search': '', 'uniq_by': '', 'or': '', 'all': '', 'zip': '', 'find_last_index': '', 'find': '', 'partition': '', 'map_accum': '', 'permutations': '', 'break': '', 'max_by': '', 'foldl': '', 'foldr': '', 'find_index': '', 'group_by': '', 'take_while': '', 'conj': '', 'push': '', 'char_range': '', 'cons': '', 'foldl1': '', 'intersect': '', 'concat': '', 'shift': '', 'clear': '', 'has_common_items': '', 'product': '', 'zip_fill': '', 'uniq': '', 'has': '', 'min_by': '', 'with_index': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ " Utilities for list. let s:save_cpo = &cpo @@ -440,29 +455,3 @@ let &cpo = s:save_cpo unlet s:save_cpo " vim:set et ts=2 sts=2 sw=2 tw=0: -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'all': s:___revitalizer_function___('s:all'),'and': s:___revitalizer_function___('s:and'),'any': s:___revitalizer_function___('s:any'),'binary_search': s:___revitalizer_function___('s:binary_search'),'break': s:___revitalizer_function___('s:break'),'char_range': s:___revitalizer_function___('s:char_range'),'clear': s:___revitalizer_function___('s:clear'),'combinations': s:___revitalizer_function___('s:combinations'),'concat': s:___revitalizer_function___('s:concat'),'conj': s:___revitalizer_function___('s:conj'),'cons': s:___revitalizer_function___('s:cons'),'find': s:___revitalizer_function___('s:find'),'find_index': s:___revitalizer_function___('s:find_index'),'find_indices': s:___revitalizer_function___('s:find_indices'),'find_last_index': s:___revitalizer_function___('s:find_last_index'),'flatten': s:___revitalizer_function___('s:flatten'),'foldl': s:___revitalizer_function___('s:foldl'),'foldl1': s:___revitalizer_function___('s:foldl1'),'foldr': s:___revitalizer_function___('s:foldr'),'foldr1': s:___revitalizer_function___('s:foldr1'),'group_by': s:___revitalizer_function___('s:group_by'),'has': s:___revitalizer_function___('s:has'),'has_common_items': s:___revitalizer_function___('s:has_common_items'),'has_index': s:___revitalizer_function___('s:has_index'),'intersect': s:___revitalizer_function___('s:intersect'),'map_accum': s:___revitalizer_function___('s:map_accum'),'max_by': s:___revitalizer_function___('s:max_by'),'min_by': s:___revitalizer_function___('s:min_by'),'or': s:___revitalizer_function___('s:or'),'partition': s:___revitalizer_function___('s:partition'),'permutations': s:___revitalizer_function___('s:permutations'),'pop': s:___revitalizer_function___('s:pop'),'product': s:___revitalizer_function___('s:product'),'push': s:___revitalizer_function___('s:push'),'shift': s:___revitalizer_function___('s:shift'),'sort': s:___revitalizer_function___('s:sort'),'sort_by': s:___revitalizer_function___('s:sort_by'),'span': s:___revitalizer_function___('s:span'),'take_while': s:___revitalizer_function___('s:take_while'),'uniq': s:___revitalizer_function___('s:uniq'),'uniq_by': s:___revitalizer_function___('s:uniq_by'),'unshift': s:___revitalizer_function___('s:unshift'),'with_index': s:___revitalizer_function___('s:with_index'),'zip': s:___revitalizer_function___('s:zip'),'zip_fill': s:___revitalizer_function___('s:zip_fill')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Data#List#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Data/Set.vim b/autoload/vital/_easymotion/Data/Set.vim index 7610bd5..e9191bc 100644 --- a/autoload/vital/_easymotion/Data/Set.vim +++ b/autoload/vital/_easymotion/Data/Set.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Data#Set#import() abort + return map({'set': '', 'frozenset': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Data#Set#import() abort', printf("return map({'set': '', 'frozenset': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ let s:save_cpo = &cpo set cpo&vim @@ -267,29 +282,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'frozenset': s:___revitalizer_function___('s:frozenset'),'set': s:___revitalizer_function___('s:set')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Data#Set#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/HitAHint/Hint.vim b/autoload/vital/_easymotion/HitAHint/Hint.vim index 773996a..5735e4c 100644 --- a/autoload/vital/_easymotion/HitAHint/Hint.vim +++ b/autoload/vital/_easymotion/HitAHint/Hint.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#HitAHint#Hint#import() abort + return map({'create': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#HitAHint#Hint#import() abort', printf("return map({'create': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ " function() wrapper if v:version > 703 || v:version == 703 && has('patch1170') let s:_function = function('function') @@ -109,29 +124,3 @@ function! s:_keys_count(targets_len, keys_len) abort exe s:assert('len(_keys_count) is# a:keys_len') return _keys_count endfunction -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'create': s:___revitalizer_function___('s:create')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#HitAHint#Hint#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/HitAHint/Motion.vim b/autoload/vital/_easymotion/HitAHint/Motion.vim index 3d1e559..785ff99 100644 --- a/autoload/vital/_easymotion/HitAHint/Motion.vim +++ b/autoload/vital/_easymotion/HitAHint/Motion.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#HitAHint#Motion#import() abort + return map({'deepextend': '', 'gather_poses': '', 'tab2spacelen': '', 'move_f': '', 'setline': '', '_vital_depends': '', 'wincall': '', 'move': '', 'move_to_winpos': '', 'pos2hint_to_line2col2hint': '', 'gather_visible_matched_poses': '', 'move_to_win': '', 'throw': '', 'has_patch': '', 'win2pos2hint_to_w2l2c2h': '', 'move_f2': '', 'new_overwin': '', 'create_win2pos2hint': '', 'pos2poskey': '', 'winnr2poses_to_list': '', 'poskey2pos': '', 'is_in_fold': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#HitAHint#Motion#import() abort', printf("return map({'deepextend': '', 'gather_poses': '', 'tab2spacelen': '', 'move_f': '', 'setline': '', '_vital_depends': '', 'wincall': '', 'move': '', 'move_to_winpos': '', 'pos2hint_to_line2col2hint': '', 'gather_visible_matched_poses': '', 'move_to_win': '', 'throw': '', 'has_patch': '', 'win2pos2hint_to_w2l2c2h': '', 'move_f2': '', 'new_overwin': '', 'create_win2pos2hint': '', 'pos2poskey': '', 'winnr2poses_to_list': '', 'poskey2pos': '', 'is_in_fold': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ function! s:_vital_loaded(V) abort let s:Hint = a:V.import('HitAHint.Hint') let s:PHighlight = a:V.import('Palette.Highlight') @@ -789,29 +804,3 @@ function! s:throw(message) abort throw 'vital: HitAHint.Motion: ' . a:message endfunction -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'create_win2pos2hint': s:___revitalizer_function___('s:create_win2pos2hint'),'deepextend': s:___revitalizer_function___('s:deepextend'),'gather_poses': s:___revitalizer_function___('s:gather_poses'),'gather_visible_matched_poses': s:___revitalizer_function___('s:gather_visible_matched_poses'),'has_patch': s:___revitalizer_function___('s:has_patch'),'is_in_fold': s:___revitalizer_function___('s:is_in_fold'),'move': s:___revitalizer_function___('s:move'),'move_f': s:___revitalizer_function___('s:move_f'),'move_f2': s:___revitalizer_function___('s:move_f2'),'move_to_win': s:___revitalizer_function___('s:move_to_win'),'move_to_winpos': s:___revitalizer_function___('s:move_to_winpos'),'new_overwin': s:___revitalizer_function___('s:new_overwin'),'pos2hint_to_line2col2hint': s:___revitalizer_function___('s:pos2hint_to_line2col2hint'),'pos2poskey': s:___revitalizer_function___('s:pos2poskey'),'poskey2pos': s:___revitalizer_function___('s:poskey2pos'),'setline': s:___revitalizer_function___('s:setline'),'tab2spacelen': s:___revitalizer_function___('s:tab2spacelen'),'throw': s:___revitalizer_function___('s:throw'),'win2pos2hint_to_w2l2c2h': s:___revitalizer_function___('s:win2pos2hint_to_w2l2c2h'),'wincall': s:___revitalizer_function___('s:wincall'),'winnr2poses_to_list': s:___revitalizer_function___('s:winnr2poses_to_list')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#HitAHint#Motion#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Base.vim b/autoload/vital/_easymotion/Over/Commandline/Base.vim index c0c7b52..36ddbbb 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Base.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Base.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Base#import() abort + return map({'_vital_depends': '', 'make_plain': '', 'is_input_waiting': '', 'make': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Base#import() abort', printf("return map({'_vital_depends': '', 'make_plain': '', 'is_input_waiting': '', 'make': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -589,29 +604,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'is_input_waiting': s:___revitalizer_function___('s:is_input_waiting'),'make': s:___revitalizer_function___('s:make'),'make_plain': s:___revitalizer_function___('s:make_plain')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Base#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules.vim b/autoload/vital/_easymotion/Over/Commandline/Modules.vim index 5acd8fd..d37d2b4 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#import() abort + return map({'get': '', 'make': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#import() abort', printf("return map({'get': '', 'make': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -25,29 +40,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'get': s:___revitalizer_function___('s:get'),'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim index e9918cf..32e1dd8 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/BufferComplete.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#BufferComplete#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#BufferComplete#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -162,29 +177,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#BufferComplete#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim index c795d1d..0946e86 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/Cancel.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#Cancel#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#Cancel#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -23,29 +38,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#Cancel#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim index 82fd7dd..dab1774 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/CursorMove.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#CursorMove#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#CursorMove#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -41,29 +56,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#CursorMove#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim index 7fc81b2..a47b1c4 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/Delete.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#Delete#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#Delete#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -39,29 +54,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#Delete#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim index b0e7efa..af4baac 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/Doautocmd.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#Doautocmd#import() abort + return map({'_vital_depends': '', 'doautocmd_user': '', 'get_cmdline': '', 'make': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#Doautocmd#import() abort', printf("return map({'_vital_depends': '', 'doautocmd_user': '', 'get_cmdline': '', 'make': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -104,29 +119,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'doautocmd_user': s:___revitalizer_function___('s:doautocmd_user'),'get_cmdline': s:___revitalizer_function___('s:get_cmdline'),'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#Doautocmd#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim index cc43d1b..92e1681 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/DrawCommandline.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#DrawCommandline#import() abort + return map({'suffix': '', 'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#DrawCommandline#import() abort', printf("return map({'suffix': '', 'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -138,29 +153,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make'),'suffix': s:___revitalizer_function___('s:suffix')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#DrawCommandline#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim index 310ed08..2ab8655 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionExit.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#ExceptionExit#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#ExceptionExit#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -20,29 +35,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#ExceptionExit#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim index a5d7db6..87802f4 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/ExceptionMessage.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#ExceptionMessage#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#ExceptionMessage#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -49,29 +64,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#ExceptionMessage#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim index ea89359..f8645eb 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/Exit.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#Exit#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#Exit#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -23,29 +38,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#Exit#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim index 1028113..f6a7c57 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/History.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#History#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#History#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -58,29 +73,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#History#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim index a80c622..ba5c2b5 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/InsertRegister.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#InsertRegister#import() abort + return map({'_vital_depends': '', 'to_string': '', 'input': '', 'get_cmdline_cword': '', 'make': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#InsertRegister#import() abort', printf("return map({'_vital_depends': '', 'to_string': '', 'input': '', 'get_cmdline_cword': '', 'make': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -147,29 +162,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'get_cmdline_cword': s:___revitalizer_function___('s:get_cmdline_cword'),'input': s:___revitalizer_function___('s:input'),'make': s:___revitalizer_function___('s:make'),'to_string': s:___revitalizer_function___('s:to_string')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#InsertRegister#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim index 59ba750..dc2da35 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/KeyMapping.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#KeyMapping#import() abort + return map({'_vital_depends': '', 'make_emacs': '', 'make_vim_cmdline_mapping': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#KeyMapping#import() abort', printf("return map({'_vital_depends': '', 'make_emacs': '', 'make_vim_cmdline_mapping': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -122,29 +137,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'make_emacs': s:___revitalizer_function___('s:make_emacs'),'make_vim_cmdline_mapping': s:___revitalizer_function___('s:make_vim_cmdline_mapping')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#KeyMapping#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim index b68824a..62f5e16 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/NoInsert.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#NoInsert#import() abort + return map({'make_special_chars': '', 'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#NoInsert#import() abort', printf("return map({'make_special_chars': '', 'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -38,29 +53,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make'),'make_special_chars': s:___revitalizer_function___('s:make_special_chars')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#NoInsert#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim index 0ca19fa..67ef760 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/Paste.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#Paste#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#Paste#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -23,29 +38,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#Paste#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim b/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim index cc40ebb..5c22d91 100644 --- a/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim +++ b/autoload/vital/_easymotion/Over/Commandline/Modules/Redraw.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Commandline#Modules#Redraw#import() abort + return map({'make': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Commandline#Modules#Redraw#import() abort', printf("return map({'make': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -55,29 +70,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Commandline#Modules#Redraw#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Exception.vim b/autoload/vital/_easymotion/Over/Exception.vim index f686e4e..fddf3cc 100644 --- a/autoload/vital/_easymotion/Over/Exception.vim +++ b/autoload/vital/_easymotion/Over/Exception.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Exception#import() abort + return map({'throw': '', 'throw_cmd': '', 'set_prefix': '', 'error': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Exception#import() abort', printf("return map({'throw': '', 'throw_cmd': '', 'set_prefix': '', 'error': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -29,29 +44,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'error': s:___revitalizer_function___('s:error'),'set_prefix': s:___revitalizer_function___('s:set_prefix'),'throw': s:___revitalizer_function___('s:throw'),'throw_cmd': s:___revitalizer_function___('s:throw_cmd')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Exception#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Input.vim b/autoload/vital/_easymotion/Over/Input.vim index a8a3a4b..f4ebd1f 100644 --- a/autoload/vital/_easymotion/Over/Input.vim +++ b/autoload/vital/_easymotion/Over/Input.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Input#import() abort + return map({'getchar': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Input#import() abort', printf("return map({'getchar': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -23,29 +38,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'getchar': s:___revitalizer_function___('s:getchar')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Input#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Keymapping.vim b/autoload/vital/_easymotion/Over/Keymapping.vim index d932e0f..c96c66c 100644 --- a/autoload/vital/_easymotion/Over/Keymapping.vim +++ b/autoload/vital/_easymotion/Over/Keymapping.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Keymapping#import() abort + return map({'_vital_depends': '', 'unmapping': '', 'as_key_config': '', 'match_key': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Keymapping#import() abort', printf("return map({'_vital_depends': '', 'unmapping': '', 'as_key_config': '', 'match_key': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -78,29 +93,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'as_key_config': s:___revitalizer_function___('s:as_key_config'),'match_key': s:___revitalizer_function___('s:match_key'),'unmapping': s:___revitalizer_function___('s:unmapping')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Keymapping#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/Signals.vim b/autoload/vital/_easymotion/Over/Signals.vim index 0d48d3b..b787ee7 100644 --- a/autoload/vital/_easymotion/Over/Signals.vim +++ b/autoload/vital/_easymotion/Over/Signals.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#Signals#import() abort + return map({'_vital_depends': '', 'call': '', 'make': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#Signals#import() abort', printf("return map({'_vital_depends': '', 'call': '', 'make': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -102,29 +117,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'call': s:___revitalizer_function___('s:call'),'make': s:___revitalizer_function___('s:make')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#Signals#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Over/String.vim b/autoload/vital/_easymotion/Over/String.vim index a1e6413..f812ecb 100644 --- a/autoload/vital/_easymotion/Over/String.vim +++ b/autoload/vital/_easymotion/Over/String.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Over#String#import() abort + return map({'_vital_depends': '', 'length': '', 'index': '', 'split_by_keys': '', 'make': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Over#String#import() abort', printf("return map({'_vital_depends': '', 'length': '', 'index': '', 'split_by_keys': '', 'make': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -147,29 +162,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'index': s:___revitalizer_function___('s:index'),'length': s:___revitalizer_function___('s:length'),'make': s:___revitalizer_function___('s:make'),'split_by_keys': s:___revitalizer_function___('s:split_by_keys')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Over#String#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Palette/Capture.vim b/autoload/vital/_easymotion/Palette/Capture.vim index 04c5fd6..0863461 100644 --- a/autoload/vital/_easymotion/Palette/Capture.vim +++ b/autoload/vital/_easymotion/Palette/Capture.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Palette#Capture#import() abort + return map({'extend': '', 'command': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Palette#Capture#import() abort', printf("return map({'extend': '', 'command': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -57,29 +72,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'command': s:___revitalizer_function___('s:command'),'extend': s:___revitalizer_function___('s:extend')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Palette#Capture#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Palette/Highlight.vim b/autoload/vital/_easymotion/Palette/Highlight.vim index 02b1e8f..7e62e90 100644 --- a/autoload/vital/_easymotion/Palette/Highlight.vim +++ b/autoload/vital/_easymotion/Palette/Highlight.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Palette#Highlight#import() abort + return map({'capture': '', '_vital_depends': '', 'parse': '', 'group_list': '', 'set': '', 'parse_to_name': '', 'links_to': '', 'get': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Palette#Highlight#import() abort', printf("return map({'capture': '', '_vital_depends': '', 'parse': '', 'group_list': '', 'set': '', 'parse_to_name': '', 'links_to': '', 'get': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -116,29 +131,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'capture': s:___revitalizer_function___('s:capture'),'get': s:___revitalizer_function___('s:get'),'group_list': s:___revitalizer_function___('s:group_list'),'links_to': s:___revitalizer_function___('s:links_to'),'parse': s:___revitalizer_function___('s:parse'),'parse_to_name': s:___revitalizer_function___('s:parse_to_name'),'set': s:___revitalizer_function___('s:set')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Palette#Highlight#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Palette/Keymapping.vim b/autoload/vital/_easymotion/Palette/Keymapping.vim index e89414b..924a22e 100644 --- a/autoload/vital/_easymotion/Palette/Keymapping.vim +++ b/autoload/vital/_easymotion/Palette/Keymapping.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Palette#Keymapping#import() abort + return map({'capture': '', '_vital_depends': '', 'escape_special_key': '', 'rhs_key_list': '', 'parse_lhs_list': '', 'lhs_key_list': '', 'capture_list': '', 'parse_lhs': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Palette#Keymapping#import() abort', printf("return map({'capture': '', '_vital_depends': '', 'escape_special_key': '', 'rhs_key_list': '', 'parse_lhs_list': '', 'lhs_key_list': '', 'capture_list': '', 'parse_lhs': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ scriptencoding utf-8 let s:save_cpo = &cpo set cpo&vim @@ -104,29 +119,3 @@ endfunction let &cpo = s:save_cpo unlet s:save_cpo -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'capture': s:___revitalizer_function___('s:capture'),'capture_list': s:___revitalizer_function___('s:capture_list'),'escape_special_key': s:___revitalizer_function___('s:escape_special_key'),'lhs_key_list': s:___revitalizer_function___('s:lhs_key_list'),'parse_lhs': s:___revitalizer_function___('s:parse_lhs'),'parse_lhs_list': s:___revitalizer_function___('s:parse_lhs_list'),'rhs_key_list': s:___revitalizer_function___('s:rhs_key_list')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Palette#Keymapping#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Prelude.vim b/autoload/vital/_easymotion/Prelude.vim index 7fc1151..7d44028 100644 --- a/autoload/vital/_easymotion/Prelude.vim +++ b/autoload/vital/_easymotion/Prelude.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Prelude#import() abort + return map({'escape_pattern': '', 'is_funcref': '', 'path2directory': '', 'wcswidth': '', 'is_string': '', 'input_helper': '', 'is_number': '', 'is_cygwin': '', 'path2project_directory': '', 'strwidthpart_reverse': '', 'input_safe': '', 'is_list': '', 'truncate_skipping': '', 'glob': '', 'truncate': '', 'is_dict': '', 'set_default': '', 'is_numeric': '', 'getchar_safe': '', 'substitute_path_separator': '', 'is_mac': '', 'strwidthpart': '', 'getchar': '', 'is_unix': '', 'is_windows': '', 'globpath': '', 'escape_file_searching': '', 'is_float': '', 'smart_execute_command': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Prelude#import() abort', printf("return map({'escape_pattern': '', 'is_funcref': '', 'path2directory': '', 'wcswidth': '', 'is_string': '', 'input_helper': '', 'is_number': '', 'is_cygwin': '', 'path2project_directory': '', 'strwidthpart_reverse': '', 'input_safe': '', 'is_list': '', 'truncate_skipping': '', 'glob': '', 'truncate': '', 'is_dict': '', 'set_default': '', 'is_numeric': '', 'getchar_safe': '', 'substitute_path_separator': '', 'is_mac': '', 'strwidthpart': '', 'getchar': '', 'is_unix': '', 'is_windows': '', 'globpath': '', 'escape_file_searching': '', 'is_float': '', 'smart_execute_command': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ let s:save_cpo = &cpo set cpo&vim @@ -233,6 +248,10 @@ function! s:escape_file_searching(buffer_name) abort endfunction function! s:escape_pattern(str) abort + call s:_warn_deprecated( + \ 'escape_pattern', + \ 'Data.String.escape_pattern', + \) return escape(a:str, '~"\.^$[]*') endfunction @@ -383,29 +402,3 @@ let &cpo = s:save_cpo unlet s:save_cpo " vim:set et ts=2 sts=2 sw=2 tw=0: -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'escape_file_searching': s:___revitalizer_function___('s:escape_file_searching'),'escape_pattern': s:___revitalizer_function___('s:escape_pattern'),'getchar': s:___revitalizer_function___('s:getchar'),'getchar_safe': s:___revitalizer_function___('s:getchar_safe'),'glob': s:___revitalizer_function___('s:glob'),'globpath': s:___revitalizer_function___('s:globpath'),'input_helper': s:___revitalizer_function___('s:input_helper'),'input_safe': s:___revitalizer_function___('s:input_safe'),'is_cygwin': s:___revitalizer_function___('s:is_cygwin'),'is_dict': s:___revitalizer_function___('s:is_dict'),'is_float': s:___revitalizer_function___('s:is_float'),'is_funcref': s:___revitalizer_function___('s:is_funcref'),'is_list': s:___revitalizer_function___('s:is_list'),'is_mac': s:___revitalizer_function___('s:is_mac'),'is_number': s:___revitalizer_function___('s:is_number'),'is_numeric': s:___revitalizer_function___('s:is_numeric'),'is_string': s:___revitalizer_function___('s:is_string'),'is_unix': s:___revitalizer_function___('s:is_unix'),'is_windows': s:___revitalizer_function___('s:is_windows'),'path2directory': s:___revitalizer_function___('s:path2directory'),'path2project_directory': s:___revitalizer_function___('s:path2project_directory'),'set_default': s:___revitalizer_function___('s:set_default'),'smart_execute_command': s:___revitalizer_function___('s:smart_execute_command'),'strwidthpart': s:___revitalizer_function___('s:strwidthpart'),'strwidthpart_reverse': s:___revitalizer_function___('s:strwidthpart_reverse'),'substitute_path_separator': s:___revitalizer_function___('s:substitute_path_separator'),'truncate': s:___revitalizer_function___('s:truncate'),'truncate_skipping': s:___revitalizer_function___('s:truncate_skipping'),'wcswidth': s:___revitalizer_function___('s:wcswidth')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Prelude#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Vim/Buffer.vim b/autoload/vital/_easymotion/Vim/Buffer.vim index b94c5d3..bc1ca8a 100644 --- a/autoload/vital/_easymotion/Vim/Buffer.vim +++ b/autoload/vital/_easymotion/Vim/Buffer.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Vim#Buffer#import() abort + return map({'_vital_depends': '', 'read_content': '', 'get_selected_text': '', 'is_cmdwin': '', 'edit_content': '', 'open': '', 'get_last_selected': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Vim#Buffer#import() abort', printf("return map({'_vital_depends': '', 'read_content': '', 'get_selected_text': '', 'is_cmdwin': '', 'edit_content': '', 'open': '', 'get_last_selected': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ let s:save_cpo = &cpo set cpo&vim @@ -143,29 +158,3 @@ let &cpo = s:save_cpo unlet s:save_cpo " vim:set et ts=2 sts=2 sw=2 tw=0: -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'edit_content': s:___revitalizer_function___('s:edit_content'),'get_last_selected': s:___revitalizer_function___('s:get_last_selected'),'get_selected_text': s:___revitalizer_function___('s:get_selected_text'),'is_cmdwin': s:___revitalizer_function___('s:is_cmdwin'),'open': s:___revitalizer_function___('s:open'),'read_content': s:___revitalizer_function___('s:read_content')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Vim#Buffer#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Vim/Guard.vim b/autoload/vital/_easymotion/Vim/Guard.vim index 67c6f8c..addbb4a 100644 --- a/autoload/vital/_easymotion/Vim/Guard.vim +++ b/autoload/vital/_easymotion/Vim/Guard.vim @@ -1,11 +1,26 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Vim#Guard#import() abort + return map({'_vital_depends': '', '_vital_created': '', 'store': '', '_vital_loaded': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Vim#Guard#import() abort', printf("return map({'_vital_depends': '', '_vital_created': '', 'store': '', '_vital_loaded': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ let s:save_cpo = &cpo set cpo&vim " Use a Funcref as a special term _UNDEFINED -function! s:undefined() abort +function! s:_undefined() abort return 'undefined' endfunction -let s:_UNDEFINED = function('s:undefined') +let s:_UNDEFINED = function('s:_undefined') function! s:_vital_loaded(V) abort let s:V = a:V @@ -218,29 +233,3 @@ endfunction let &cpo = s:save_cpo unlet! s:save_cpo " vim:set et ts=2 sts=2 sw=2 tw=0 fdm=marker: -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'_vital_created': s:___revitalizer_function___('s:_vital_created'),'_vital_depends': s:___revitalizer_function___('s:_vital_depends'),'_vital_loaded': s:___revitalizer_function___('s:_vital_loaded'),'store': s:___revitalizer_function___('s:store'),'undefined': s:___revitalizer_function___('s:undefined')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Vim#Guard#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/_easymotion/Vim/Message.vim b/autoload/vital/_easymotion/Vim/Message.vim index ee325e1..ced76b7 100644 --- a/autoload/vital/_easymotion/Vim/Message.vim +++ b/autoload/vital/_easymotion/Vim/Message.vim @@ -1,3 +1,18 @@ +" ___vital___ +" NOTE: lines between '" ___vital___' is generated by :Vitalize. +" Do not mofidify the code nor insert new lines before '" ___vital___' +if v:version > 703 || v:version == 703 && has('patch1170') + function! vital#_easymotion#Vim#Message#import() abort + return map({'capture': '', 'echomsg': '', 'echo': '', 'warn': '', 'get_hit_enter_max_length': '', 'error': ''}, 'function("s:" . v:key)') + endfunction +else + function! s:_SID() abort + return matchstr(expand(''), '\zs\d\+\ze__SID$') + endfunction + execute join(['function! vital#_easymotion#Vim#Message#import() abort', printf("return map({'capture': '', 'echomsg': '', 'echo': '', 'warn': '', 'get_hit_enter_max_length': '', 'error': ''}, \"function('%s_' . v:key)\")", s:_SID()), 'endfunction'], "\n") + delfunction s:_SID +endif +" ___vital___ let s:save_cpo = &cpo set cpo&vim @@ -63,29 +78,3 @@ let &cpo = s:save_cpo unlet s:save_cpo " vim:set et ts=2 sts=2 sw=2 tw=0: -" ___Revitalizer___ -" NOTE: below code is generated by :Revitalize. -" Do not mofidify the code nor append new lines -if v:version > 703 || v:version == 703 && has('patch1170') - function! s:___revitalizer_function___(fstr) abort - return function(a:fstr) - endfunction -else - function! s:___revitalizer_SID() abort - return matchstr(expand(''), '\zs\d\+\ze____revitalizer_SID$') - endfunction - let s:___revitalizer_sid = '' . s:___revitalizer_SID() . '_' - function! s:___revitalizer_function___(fstr) abort - return function(substitute(a:fstr, 's:', s:___revitalizer_sid, 'g')) - endfunction -endif - -let s:___revitalizer_functions___ = {'capture': s:___revitalizer_function___('s:capture'),'echo': s:___revitalizer_function___('s:echo'),'echomsg': s:___revitalizer_function___('s:echomsg'),'error': s:___revitalizer_function___('s:error'),'get_hit_enter_max_length': s:___revitalizer_function___('s:get_hit_enter_max_length'),'warn': s:___revitalizer_function___('s:warn')} - -unlet! s:___revitalizer_sid -delfunction s:___revitalizer_function___ - -function! vital#_easymotion#Vim#Message#import() abort - return s:___revitalizer_functions___ -endfunction -" ___Revitalizer___ diff --git a/autoload/vital/easymotion.vim b/autoload/vital/easymotion.vim index 4edefb6..cbf2a7a 100644 --- a/autoload/vital/easymotion.vim +++ b/autoload/vital/easymotion.vim @@ -1,6 +1,10 @@ -let s:vital_name = expand(':t:r') -let s:base_dir = expand(':h') +let s:plugin_name = expand(':t:r') +let s:vital_base_dir = expand(':h') +let s:project_root = expand(':h:h:h') +let s:is_vital_vim = s:plugin_name is# '_latest__' + let s:loaded = {} +let s:cache_sid = {} " function() wrapper if v:version > 703 || v:version == 703 && has('patch1170') @@ -17,22 +21,23 @@ else endfunction endif -function! vital#{s:vital_name}#of() abort - return s:new(s:vital_name) +function! vital#{s:plugin_name}#of() abort + return s:new(s:plugin_name) endfunction let s:Vital = {} -function! s:new(vital_name) abort +function! s:new(plugin_name) abort let base = deepcopy(s:Vital) - let base.vital_name = a:vital_name + let base.plugin_name = a:plugin_name return base endfunction -function! s:vital_files() abort dict +function! s:vital_files() abort if !exists('s:vital_files') - let s:vital_files = - \ map(s:_self_vital_files(), 'fnamemodify(v:val, ":p:gs?[\\\\/]?/?")') + let s:vital_files = map( + \ s:is_vital_vim ? s:_global_vital_files() : s:_self_vital_files(), + \ 'fnamemodify(v:val, ":p:gs?[\\\\/]?/?")') endif return copy(s:vital_files) endfunction @@ -92,25 +97,44 @@ let s:Vital.load = s:_function('s:load') function! s:unload() abort dict let s:loaded = {} + let s:cache_sid = {} unlet! s:vital_files endfunction let s:Vital.unload = s:_function('s:unload') function! s:exists(name) abort dict - return exists(printf('*vital#_%s#%s#import', self.vital_name, substitute(a:name, '\.', '#', 'g'))) + let b = exists(printf('*vital#_%s#%s#import', self.plugin_name, substitute(a:name, '\.', '#', 'g'))) + if b + return b + endif + let name_path = substitute(a:name, '\.', '/', 'g') + let path = printf('%s/_%s/%s.vim', s:vital_base_dir, self.plugin_name, name_path) + let b = filereadable(path) + if b + return b + endif + let path = printf('%s/_%s/%s.vim', s:vital_base_dir, '_latest__', name_path) + let b = filereadable(path) endfunction let s:Vital.exists = s:_function('s:exists') function! s:search(pattern) abort dict - let paths = s:_extract_files(a:pattern, s:vital_files()) + let paths = s:_extract_files(a:pattern, self.vital_files()) let modules = sort(map(paths, 's:_file2module(v:val)')) return s:_uniq(modules) endfunction let s:Vital.search = s:_function('s:search') function! s:_self_vital_files() abort - let base = s:base_dir . '/*/**/*.vim' - return split(glob(base, 1), "\n") + let builtin = printf('%s/__%s__/', s:vital_base_dir, s:plugin_name) + let installed = printf('%s/_%s/', s:vital_base_dir, s:plugin_name) + let base = builtin . ',' . installed + return split(globpath(base, '**/*.vim', 1), "\n") +endfunction + +function! s:_global_vital_files() abort + let pattern = 'autoload/vital/__*__/**/*.vim' + return split(globpath(&runtimepath, pattern, 1), "\n") endfunction function! s:_extract_files(pattern, files) abort @@ -131,21 +155,18 @@ function! s:_import(name) abort dict if has_key(s:loaded, a:name) return copy(s:loaded[a:name]) endif - try - let module = vital#_{self.vital_name}#{substitute(a:name, '\.', '#', 'g')}#import() - catch /E117: Unknown function:/ - throw 'vital: revitalizer: module not found: ' . a:name - endtry + let module = self._get_module(a:name) if has_key(module, '_vital_created') call module._vital_created(module) endif let export_module = filter(copy(module), 'v:key =~# "^\\a"') " Cache module before calling module.vital_loaded() to avoid cyclic " dependences but remove the cache if module._vital_loaded() fails. + " let s:loaded[a:name] = export_module let s:loaded[a:name] = export_module if has_key(module, '_vital_loaded') try - call module._vital_loaded(self) + call module._vital_loaded(vital#{s:plugin_name}#of()) catch unlet s:loaded[a:name] throw 'vital: fail to call ._vital_loaded(): ' . v:exception @@ -153,7 +174,117 @@ function! s:_import(name) abort dict endif return copy(s:loaded[a:name]) endfunction -let s:Vital._import = function('s:_import') +let s:Vital._import = s:_function('s:_import') + +" s:_get_module() returns module object wihch has all script local functions. +function! s:_get_module(name) abort dict + try + let module = vital#_{self.plugin_name}#{substitute(a:name, '\.', '#', 'g')}#import() + catch /E117: Unknown function:/ + " Retry to support loading self modules. + let module = s:_get_builtin_module(a:name) + endtry + return module +endfunction +let s:Vital._get_module = s:_function('s:_get_module') + +function! s:_get_builtin_module(name) abort + return s:sid2sfuncs(s:_module_sid(a:name)) +endfunction + +let s:vital_builtin_dir = printf('autoload/vital/__%s__/', s:is_vital_vim ? '*' : s:plugin_name) + +function! s:_module_sid(name) abort + let module_path = substitute(a:name, '\.', '/', 'g') . '.vim' + let module_rel_path = s:vital_builtin_dir . module_path + let path = get(split(globpath(s:_module_sid_base_dir(), module_rel_path, 1), "\n"), 0, '') + if !filereadable(path) + throw 'vital: module not found: ' . a:name + endif + let p = substitute('autoload/vital/__\w\+__/' . module_path, '/', '[/\\\\]\\+', 'g') + let sid = s:_sid(path, p) + if !sid + call s:_source(path) + let sid = s:_sid(path, p) + if !sid + throw 'vital: cannot get from path' + endif + endif + return sid +endfunction + +function! s:_module_sid_base_dir() abort + return s:is_vital_vim ? &rtp : s:project_root +endfunction + +function! s:_source(path) abort + execute 'source' fnameescape(a:path) +endfunction + +" @vimlint(EVL102, 1, l:_) +" @vimlint(EVL102, 1, l:__) +function! s:_sid(path, filter_pattern) abort + let unified_path = s:_unify_path(a:path) + if has_key(s:cache_sid, unified_path) + return s:cache_sid[unified_path] + endif + for line in filter(split(s:_redir(':scriptnames'), "\n"), 'v:val =~# a:filter_pattern') + let [_, sid, path; __] = matchlist(line, '^\s*\(\d\+\):\s\+\(.\+\)\s*$') + if s:_unify_path(path) is# unified_path + let s:cache_sid[unified_path] = sid + return s:cache_sid[unified_path] + endif + endfor + return 0 +endfunction + +function! s:_redir(cmd) abort + let [save_verbose, save_verbosefile] = [&verbose, &verbosefile] + set verbose=0 verbosefile= + redir => res + silent! execute a:cmd + redir END + let [&verbose, &verbosefile] = [save_verbose, save_verbosefile] + return res +endfunction + +if filereadable(expand(':r') . '.VIM') " is case-insensitive or not + let s:_unify_path_cache = {} + " resolve() is slow, so we cache results. + " Note: On windows, vim can't expand path names from 8.3 formats. + " So if getting full path via and $HOME was set as 8.3 format, + " vital load duplicated scripts. Below's :~ avoid this issue. + function! s:_unify_path(path) abort + if has_key(s:_unify_path_cache, a:path) + return s:_unify_path_cache[a:path] + endif + let value = tolower(fnamemodify(resolve(fnamemodify( + \ a:path, ':p')), ':~:gs?[\\/]?/?')) + let s:_unify_path_cache[a:path] = value + return value + endfunction +else + function! s:_unify_path(path) abort + return resolve(fnamemodify(a:path, ':p:gs?[\\/]?/?')) + endfunction +endif + +" copied and modified from Vim.ScriptLocal +let s:SNR = join(map(range(len("\")), '"[\\x" . printf("%0x", char2nr("\"[v:val])) . "]"'), '') +function! s:sid2sfuncs(sid) abort + let fs = split(s:_redir(printf(':function /^%s%s_', s:SNR, a:sid)), "\n") + let r = {} + let pattern = printf('\m^function\s%d_\zs\w\{-}\ze(', a:sid) + for fname in map(fs, 'matchstr(v:val, pattern)') + let r[fname] = function(s:_sfuncname(a:sid, fname)) + endfor + return r +endfunction + +"" Return funcname of script local functions with SID +function! s:_sfuncname(sid, funcname) abort + return printf('%s_%s', a:sid, a:funcname) +endfunction if exists('*uniq') function! s:_uniq(list) abort @@ -165,10 +296,8 @@ else while 0 < i if a:list[i] ==# a:list[i - 1] call remove(a:list, i) - let i -= 2 - else - let i -= 1 endif + let i -= 1 endwhile return a:list endfunction diff --git a/autoload/vital/easymotion.vital b/autoload/vital/easymotion.vital index 988d64b..bcf403f 100644 --- a/autoload/vital/easymotion.vital +++ b/autoload/vital/easymotion.vital @@ -1,5 +1,5 @@ easymotion -d461a07c1453747ed867b75ed6cbeccb3eb17312 +fdf7e768bdfac4f1b60d784a6d1016d09e37efcc Over.Commandline.Base Over.Commandline.Modules.Cancel