diff --git a/.gitmodules b/.gitmodules index ffc614e..725dc88 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,45 +1,12 @@ -[submodule "vim/pack/default/vim-polyglot"] - path = vim/pack/default/start/vim-polyglot - url = https://github.com/sheerun/vim-polyglot.git -[submodule "vim/pack/default/start/ale"] - path = vim/pack/default/start/ale - url = https://github.com/dense-analysis/ale.git [submodule "vim/pack/default/start/lightline.vim"] path = vim/pack/default/start/lightline.vim url = https://github.com/itchyny/lightline.vim [submodule "vim/pack/default/start/fugitive"] path = vim/pack/default/start/fugitive url = https://tpope.io/vim/fugitive.git -[submodule "vim/pack/default/start/commentary"] - path = vim/pack/default/start/commentary - url = https://tpope.io/vim/commentary.git -[submodule "vim/pack/colors/start/mustang-vim"] - path = vim/pack/colors/start/mustang-vim - url = https://github.com/croaker/mustang-vim.git -[submodule "vim/pack/colors/start/nord-vim"] - path = vim/pack/colors/start/nord-vim - url = https://github.com/arcticicestudio/nord-vim.git -[submodule "vim/pack/colors/start/vim-monokai"] - path = vim/pack/colors/start/vim-monokai - url = https://github.com/sickill/vim-monokai.git -[submodule "vim/pack/default/start/vim-vinegar"] - path = vim/pack/default/start/vim-vinegar - url = https://github.com/tpope/vim-vinegar.git [submodule "vim/pack/default/start/editorconfig-vim"] path = vim/pack/default/start/editorconfig-vim url = https://github.com/editorconfig/editorconfig-vim.git -[submodule "vim/pack/snippets/start/ultisnips"] - path = vim/pack/snippets/start/ultisnips - url = https://github.com/SirVer/ultisnips.git -[submodule "vim/pack/snippets/start/vim-snippets"] - path = vim/pack/snippets/start/vim-snippets - url = https://github.com/honza/vim-snippets.git -[submodule "vim/pack/rust/start/rust.vim"] - path = vim/pack/rust/start/rust.vim - url = https://github.com/rust-lang/rust.vim.git -[submodule "vim/pack/colors/start/molokai"] - path = vim/pack/colors/start/molokai - url = https://github.com/tomasr/molokai.git [submodule "nvim/pack/colors/start/molokai"] path = nvim/pack/colors/start/molokai url = https://github.com/tomasr/molokai.git diff --git a/vim/pack/colors/start/molokai b/vim/pack/colors/start/molokai deleted file mode 160000 index c67bdfc..0000000 --- a/vim/pack/colors/start/molokai +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c67bdfcdb31415aa0ade7f8c003261700a885476 diff --git a/vim/pack/colors/start/mustang-vim b/vim/pack/colors/start/mustang-vim deleted file mode 160000 index 6533d7d..0000000 --- a/vim/pack/colors/start/mustang-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 6533d7d21bf27cae94d9c2caa575f627f003dfd5 diff --git a/vim/pack/colors/start/nord-vim b/vim/pack/colors/start/nord-vim deleted file mode 160000 index 0ccf70b..0000000 --- a/vim/pack/colors/start/nord-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0ccf70b6b06fbe022109d98812657aaf54dbf65a diff --git a/vim/pack/colors/start/vim-monokai b/vim/pack/colors/start/vim-monokai deleted file mode 160000 index ae77538..0000000 --- a/vim/pack/colors/start/vim-monokai +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ae7753878f8740fbdb2cef5617911ef83255349b diff --git a/vim/pack/default/start/ale b/vim/pack/default/start/ale deleted file mode 160000 index 82f734a..0000000 --- a/vim/pack/default/start/ale +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 82f734a7c286d8705c9a6e2879b4173fe18a6356 diff --git a/vim/pack/default/start/commentary b/vim/pack/default/start/commentary deleted file mode 160000 index f8238d7..0000000 --- a/vim/pack/default/start/commentary +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f8238d70f873969fb41bf6a6b07ca63a4c0b82b1 diff --git a/vim/pack/default/start/vim-polyglot b/vim/pack/default/start/vim-polyglot deleted file mode 160000 index 14dc82f..0000000 --- a/vim/pack/default/start/vim-polyglot +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 14dc82fc4e6c0c08078f97a24a6c1639c1cc5113 diff --git a/vim/pack/default/start/vim-vinegar b/vim/pack/default/start/vim-vinegar deleted file mode 160000 index fcce70f..0000000 --- a/vim/pack/default/start/vim-vinegar +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fcce70f1403ba4101668a4c960c577bddbd00f06 diff --git a/vim/pack/rust/start/rust.vim b/vim/pack/rust/start/rust.vim deleted file mode 160000 index ce5f2b1..0000000 --- a/vim/pack/rust/start/rust.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ce5f2b1c881de1b2101924dc5a19046399d74db2 diff --git a/vim/pack/rust/start/skim.vim/plugin/skim.vim b/vim/pack/rust/start/skim.vim/plugin/skim.vim deleted file mode 100644 index 7406f4f..0000000 --- a/vim/pack/rust/start/skim.vim/plugin/skim.vim +++ /dev/null @@ -1,814 +0,0 @@ -" Copyright (c) 2017 Junegunn Choi -" -" MIT License -" -" Permission is hereby granted, free of charge, to any person obtaining -" a copy of this software and associated documentation files (the -" "Software"), to deal in the Software without restriction, including -" without limitation the rights to use, copy, modify, merge, publish, -" distribute, sublicense, and/or sell copies of the Software, and to -" permit persons to whom the Software is furnished to do so, subject to -" the following conditions: -" -" The above copyright notice and this permission notice shall be -" included in all copies or substantial portions of the Software. -" -" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -" NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE -" LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION -" OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -" WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -if exists('g:loaded_skim') - finish -endif -let g:loaded_skim = 1 - -if empty($SKIM_DEFAULT_COMMAND) - let $SKIM_DEFAULT_COMMAND = "fd --type f || git ls-tree -r --name-only HEAD || rg --files || ag -l -g \"\" || find ." -endif - -let s:is_win = has('win32') || has('win64') -if s:is_win && &shellslash - set noshellslash - let s:base_dir = expand(':h:h') - set shellslash -else - let s:base_dir = expand(':h:h') -endif -if s:is_win - let s:term_marker = '&::SKIM' - - function! s:skim_call(fn, ...) - let shellslash = &shellslash - try - set noshellslash - return call(a:fn, a:000) - finally - let &shellslash = shellslash - endtry - endfunction - - " Use utf-8 for skim.vim commands - " Return array of shell commands for cmd.exe - function! s:wrap_cmds(cmds) - return map(['@echo off', 'for /f "tokens=4" %%a in (''chcp'') do set origchcp=%%a', 'chcp 65001 > nul'] + - \ (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) + - \ ['chcp %origchcp% > nul'], 'v:val."\r"') - endfunction -else - let s:term_marker = ";#SKIM" - - function! s:skim_call(fn, ...) - return call(a:fn, a:000) - endfunction - - function! s:wrap_cmds(cmds) - return a:cmds - endfunction -endif - -function! s:shellesc_cmd(arg) - let escaped = substitute(a:arg, '[&|<>()@^]', '^&', 'g') - let escaped = substitute(escaped, '%', '%%', 'g') - let escaped = substitute(escaped, '"', '\\^&', 'g') - let escaped = substitute(escaped, '\(\\\+\)\(\\^\)', '\1\1\2', 'g') - return '^"'.substitute(escaped, '\(\\\+\)$', '\1\1', '').'^"' -endfunction - -function! skim#shellescape(arg, ...) - let shell = get(a:000, 0, &shell) - if shell =~# 'cmd.exe$' - return s:shellesc_cmd(a:arg) - endif - return s:skim_call('shellescape', a:arg) -endfunction - -function! s:skim_getcwd() - return s:skim_call('getcwd') -endfunction - -function! s:skim_fnamemodify(fname, mods) - return s:skim_call('fnamemodify', a:fname, a:mods) -endfunction - -function! s:skim_expand(fmt) - return s:skim_call('expand', a:fmt, 1) -endfunction - -function! s:skim_tempname() - return s:skim_call('tempname') -endfunction - -let s:default_layout = { 'down': '~40%' } -let s:layout_keys = ['window', 'up', 'down', 'left', 'right'] -let s:skim_rs = s:base_dir.'/bin/sk' -let s:skim_tmux = s:base_dir.'/bin/sk-tmux' -let s:install = s:base_dir.'/install' -let s:installed = 0 - -let s:cpo_save = &cpo -set cpo&vim - -function! s:skim_exec() - if !exists('s:exec') - if executable(s:skim_rs) - let s:exec = s:skim_rs - elseif executable('sk') - let s:exec = 'sk' - elseif s:is_win && !has('win32unix') - call s:warn('skim not supported on Windows.') - throw 'skim executable not found' - elseif !s:installed && executable(s:install) && - \ input('skim executable not found. Download binary? (y/n) ') =~? '^y' - redraw - echo - call s:warn('Downloading skim binary. Please wait ...') - let s:installed = 1 - call system(s:install.' --bin') - return s:skim_exec() - else - redraw - throw 'skim executable not found' - endif - endif - return skim#shellescape(s:exec) -endfunction - -function! s:tmux_enabled() - if has('gui_running') - return 0 - endif - - if exists('s:tmux') - return s:tmux - endif - - let s:tmux = 0 - if exists('$TMUX') && executable(s:skim_tmux) - let output = system('tmux -V') - let s:tmux = !v:shell_error && output >= 'tmux 1.7' - endif - return s:tmux -endfunction - -function! s:escape(path) - let path = fnameescape(a:path) - return s:is_win ? escape(path, '$') : path -endfunction - -" Upgrade legacy options -function! s:upgrade(dict) - let copy = copy(a:dict) - if has_key(copy, 'tmux') - let copy.down = remove(copy, 'tmux') - endif - if has_key(copy, 'tmux_height') - let copy.down = remove(copy, 'tmux_height') - endif - if has_key(copy, 'tmux_width') - let copy.right = remove(copy, 'tmux_width') - endif - return copy -endfunction - -function! s:error(msg) - echohl ErrorMsg - echom a:msg - echohl None -endfunction - -function! s:warn(msg) - echohl WarningMsg - echom a:msg - echohl None -endfunction - -function! s:has_any(dict, keys) - for key in a:keys - if has_key(a:dict, key) - return 1 - endif - endfor - return 0 -endfunction - -function! s:open(cmd, target) - if stridx('edit', a:cmd) == 0 && s:skim_fnamemodify(a:target, ':p') ==# s:skim_expand('%:p') - return - endif - execute a:cmd s:escape(a:target) -endfunction - -function! s:common_sink(action, lines) abort - if len(a:lines) < 2 - return - endif - let key = remove(a:lines, 0) - let Cmd = get(a:action, key, 'e') - if type(Cmd) == type(function('call')) - return Cmd(a:lines) - endif - if len(a:lines) > 1 - augroup skim_swap - autocmd SwapExists * let v:swapchoice='o' - \| call s:warn('skim: E325: swap file exists: '.s:skim_expand('')) - augroup END - endif - try - let empty = empty(s:skim_expand('%')) && line('$') == 1 && empty(getline(1)) && !&modified - let autochdir = &autochdir - set noautochdir - for item in a:lines - if empty - execute 'e' s:escape(item) - let empty = 0 - else - call s:open(Cmd, item) - endif - if !has('patch-8.0.0177') && !has('nvim-0.2') && exists('#BufEnter') - \ && isdirectory(item) - doautocmd BufEnter - endif - endfor - catch /^Vim:Interrupt$/ - finally - let &autochdir = autochdir - silent! autocmd! skim_swap - endtry -endfunction - -function! s:get_color(attr, ...) - let gui = has('termguicolors') && &termguicolors - let fam = gui ? 'gui' : 'cterm' - let pat = gui ? '^#[a-f0-9]\+' : '^[0-9]\+$' - for group in a:000 - let code = synIDattr(synIDtrans(hlID(group)), a:attr, fam) - if code =~? pat - return code - endif - endfor - return '' -endfunction - -function! s:defaults() - let rules = copy(get(g:, 'skim_colors', {})) - let colors = join(map(items(filter(map(rules, 'call("s:get_color", v:val)'), '!empty(v:val)')), 'join(v:val, ":")'), ',') - return empty(colors) ? '' : ('--color='.colors) -endfunction - -function! s:validate_layout(layout) - for key in keys(a:layout) - if index(s:layout_keys, key) < 0 - throw printf('Invalid entry in g:skim_layout: %s (allowed: %s)%s', - \ key, join(s:layout_keys, ', '), key == 'options' ? '. Use $SKIM_DEFAULT_OPTIONS.' : '') - endif - endfor - return a:layout -endfunction - -function! s:evaluate_opts(options) - return type(a:options) == type([]) ? - \ join(map(copy(a:options), 'skim#shellescape(v:val)')) : a:options -endfunction - -" [name string,] [opts dict,] [fullscreen boolean] -function! skim#wrap(...) - let args = ['', {}, 0] - let expects = map(copy(args), 'type(v:val)') - let tidx = 0 - for arg in copy(a:000) - let tidx = index(expects, type(arg), tidx) - if tidx < 0 - throw 'Invalid arguments (expected: [name string] [opts dict] [fullscreen boolean])' - endif - let args[tidx] = arg - let tidx += 1 - unlet arg - endfor - let [name, opts, bang] = args - - if len(name) - let opts.name = name - end - - " Layout: g:skim_layout (and deprecated g:skim_height) - if bang - for key in s:layout_keys - if has_key(opts, key) - call remove(opts, key) - endif - endfor - elseif !s:has_any(opts, s:layout_keys) - if !exists('g:skim_layout') && exists('g:skim_height') - let opts.down = g:skim_height - else - let opts = extend(opts, s:validate_layout(get(g:, 'skim_layout', s:default_layout))) - endif - endif - - " Colors: g:skim_colors - let opts.options = s:defaults() .' '. s:evaluate_opts(get(opts, 'options', '')) - - " History: g:skim_history_dir - if len(name) && len(get(g:, 'skim_history_dir', '')) - let dir = s:skim_expand(g:skim_history_dir) - if !isdirectory(dir) - call mkdir(dir, 'p') - endif - let history = skim#shellescape(dir.'/'.name) - let cmd_history = skim#shellescape(dir.'/cmd-'.name) - let opts.options = join(['--history', history, '--cmd-history', cmd_history, opts.options]) - endif - - " Action: g:skim_action - if !s:has_any(opts, ['sink', 'sink*']) - let opts._action = get(g:, 'skim_action', s:default_action) - let opts.options .= ' --expect='.join(keys(opts._action), ',') - function! opts.sink(lines) abort - return s:common_sink(self._action, a:lines) - endfunction - let opts['sink*'] = remove(opts, 'sink') - endif - - return opts -endfunction - -function! s:use_sh() - let [shell, shellslash] = [&shell, &shellslash] - if s:is_win - set shell=cmd.exe - set noshellslash - else - set shell=sh - endif - return [shell, shellslash] -endfunction - -function! skim#run(...) abort -try - let [shell, shellslash] = s:use_sh() - - let dict = exists('a:1') ? s:upgrade(a:1) : {} - let temps = { 'result': s:skim_tempname() } - let optstr = s:evaluate_opts(get(dict, 'options', '')) - try - let skim_exec = s:skim_exec() - catch - throw v:exception - endtry - - if !has_key(dict, 'dir') - let dict.dir = s:skim_getcwd() - endif - if has('win32unix') && has_key(dict, 'dir') - let dict.dir = fnamemodify(dict.dir, ':p') - endif - - if !has_key(dict, 'source') && !empty($SKIM_DEFAULT_COMMAND) && !s:is_win - let temps.source = s:skim_tempname() - call writefile(s:wrap_cmds(split($SKIM_DEFAULT_COMMAND, "\n")), temps.source) - let dict.source = (empty($SHELL) ? &shell : $SHELL).' '.skim#shellescape(temps.source) - endif - - if has_key(dict, 'source') - let source = dict.source - let type = type(source) - if type == 1 - let prefix = '( '.source.' )|' - elseif type == 3 - let temps.input = s:skim_tempname() - call writefile(source, temps.input) - let prefix = (s:is_win ? 'type ' : 'cat ').skim#shellescape(temps.input).'|' - else - throw 'Invalid source type' - endif - else - let prefix = '' - endif - - let prefer_tmux = get(g:, 'skim_prefer_tmux', 0) - let use_height = has_key(dict, 'down') && !has('gui_running') && - \ !(has('nvim') || s:is_win || has('win32unix') || s:present(dict, 'up', 'left', 'right', 'window')) && - \ executable('tput') && filereadable('/dev/tty') - let has_vim8_term = has('terminal') && has('patch-8.0.995') - let has_nvim_term = has('nvim-0.2.1') || has('nvim') && !s:is_win - let use_term = has_nvim_term || - \ has_vim8_term && !has('win32unix') && (has('gui_running') || s:is_win || !use_height && s:present(dict, 'down', 'up', 'left', 'right', 'window')) - let use_tmux = (!use_height && !use_term || prefer_tmux) && !has('win32unix') && s:tmux_enabled() && s:splittable(dict) - if prefer_tmux && use_tmux - let use_height = 0 - let use_term = 0 - endif - if use_height - let height = s:calc_size(&lines, dict.down, dict) - let optstr .= ' --height='.height - elseif use_term - let optstr .= ' --no-height' - endif - let command = prefix.(use_tmux ? s:skim_tmux(dict) : skim_exec).' '.optstr.' > '.temps.result - - if use_term - return s:execute_term(dict, command, temps) - endif - - let lines = use_tmux ? s:execute_tmux(dict, command, temps) - \ : s:execute(dict, command, use_height, temps) - call s:callback(dict, lines) - return lines -finally - let [&shell, &shellslash] = [shell, shellslash] -endtry -endfunction - -function! s:present(dict, ...) - for key in a:000 - if !empty(get(a:dict, key, '')) - return 1 - endif - endfor - return 0 -endfunction - -function! s:skim_tmux(dict) - let size = '' - for o in ['up', 'down', 'left', 'right'] - if s:present(a:dict, o) - let spec = a:dict[o] - if (o == 'up' || o == 'down') && spec[0] == '~' - let size = '-'.o[0].s:calc_size(&lines, spec, a:dict) - else - " Legacy boolean option - let size = '-'.o[0].(spec == 1 ? '' : substitute(spec, '^\~', '', '')) - endif - break - endif - endfor - return printf('LINES=%d COLUMNS=%d %s %s %s --', - \ &lines, &columns, skim#shellescape(s:skim_tmux), size, (has_key(a:dict, 'source') ? '' : '-')) -endfunction - -function! s:splittable(dict) - return s:present(a:dict, 'up', 'down') && &lines > 15 || - \ s:present(a:dict, 'left', 'right') && &columns > 40 -endfunction - -function! s:pushd(dict) - if s:present(a:dict, 'dir') - let cwd = s:skim_getcwd() - let w:skim_pushd = { - \ 'command': haslocaldir() ? 'lcd' : (exists(':tcd') && haslocaldir(-1) ? 'tcd' : 'cd'), - \ 'origin': cwd - \ } - execute 'lcd' s:escape(a:dict.dir) - let cwd = s:skim_getcwd() - let w:skim_pushd.dir = cwd - let a:dict.pushd = w:skim_pushd - return cwd - endif - return '' -endfunction - -augroup skim_popd - autocmd! - autocmd WinEnter * call s:dopopd() -augroup END - -function! s:dopopd() - if !exists('w:skim_pushd') - return - endif - - " FIXME: We temporarily change the working directory to 'dir' entry - " of options dictionary (set to the current working directory if not given) - " before running skim. - " - " e.g. call skim#run({'dir': '/tmp', 'source': 'ls', 'sink': 'e'}) - " - " After processing the sink function, we have to restore the current working - " directory. But doing so may not be desirable if the function changed the - " working directory on purpose. - " - " So how can we tell if we should do it or not? A simple heuristic we use - " here is that we change directory only if the current working directory - " matches 'dir' entry. However, it is possible that the sink function did - " change the directory to 'dir'. In that case, the user will have an - " unexpected result. - if s:skim_getcwd() ==# w:skim_pushd.dir - execute w:skim_pushd.command s:escape(w:skim_pushd.origin) - endif - unlet w:skim_pushd -endfunction - -function! s:xterm_launcher() - let fmt = 'xterm -T "[skim]" -bg "\%s" -fg "\%s" -geometry %dx%d+%d+%d -e bash -ic %%s' - if has('gui_macvim') - let fmt .= '&& osascript -e "tell application \"MacVim\" to activate"' - endif - return printf(fmt, - \ synIDattr(hlID("Normal"), "bg"), synIDattr(hlID("Normal"), "fg"), - \ &columns, &lines/2, getwinposx(), getwinposy()) -endfunction -unlet! s:launcher -if s:is_win || has('win32unix') - let s:launcher = '%s' -else - let s:launcher = function('s:xterm_launcher') -endif - -function! s:exit_handler(code, command, ...) - if a:code == 130 - return 0 - elseif a:code > 1 - call s:error('Error running ' . a:command) - if !empty(a:000) - sleep - endif - return 0 - endif - return 1 -endfunction - -function! s:execute(dict, command, use_height, temps) abort - call s:pushd(a:dict) - if has('unix') && !a:use_height - silent! !clear 2> /dev/null - endif - let escaped = (a:use_height || s:is_win) ? a:command : escape(substitute(a:command, '\n', '\\n', 'g'), '%#!') - if has('gui_running') - let Launcher = get(a:dict, 'launcher', get(g:, 'Skim_launcher', get(g:, 'skim_launcher', s:launcher))) - let fmt = type(Launcher) == 2 ? call(Launcher, []) : Launcher - if has('unix') - let escaped = "'".substitute(escaped, "'", "'\"'\"'", 'g')."'" - endif - let command = printf(fmt, escaped) - else - let command = escaped - endif - if s:is_win - let batchfile = s:skim_tempname().'.bat' - call writefile(s:wrap_cmds(command), batchfile) - let command = batchfile - let a:temps.batchfile = batchfile - if has('nvim') - let skim = {} - let skim.dict = a:dict - let skim.temps = a:temps - function! skim.on_exit(job_id, exit_status, event) dict - call s:pushd(self.dict) - let lines = s:collect(self.temps) - call s:callback(self.dict, lines) - endfunction - let cmd = 'start /wait cmd /c '.command - call jobstart(cmd, skim) - return [] - endif - elseif has('win32unix') && $TERM !=# 'cygwin' - let shellscript = s:skim_tempname() - call writefile([command], shellscript) - let command = 'cmd.exe /C '.skim#shellescape('set "TERM=" & start /WAIT sh -c '.shellscript) - let a:temps.shellscript = shellscript - endif - if a:use_height - let stdin = has_key(a:dict, 'source') ? '' : '< /dev/tty' - call system(printf('tput cup %d > /dev/tty; tput cnorm > /dev/tty; %s %s 2> /dev/tty', &lines, command, stdin)) - else - execute 'silent !'.command - endif - let exit_status = v:shell_error - redraw! - return s:exit_handler(exit_status, command) ? s:collect(a:temps) : [] -endfunction - -function! s:execute_tmux(dict, command, temps) abort - let command = a:command - let cwd = s:pushd(a:dict) - if len(cwd) - " -c '#{pane_current_path}' is only available on tmux 1.9 or above - let command = join(['cd', skim#shellescape(cwd), '&&', command]) - endif - - call system(command) - let exit_status = v:shell_error - redraw! - return s:exit_handler(exit_status, command) ? s:collect(a:temps) : [] -endfunction - -function! s:calc_size(max, val, dict) - let val = substitute(a:val, '^\~', '', '') - if val =~ '%$' - let size = a:max * str2nr(val[:-2]) / 100 - else - let size = min([a:max, str2nr(val)]) - endif - - let srcsz = -1 - if type(get(a:dict, 'source', 0)) == type([]) - let srcsz = len(a:dict.source) - endif - - let opts = s:evaluate_opts(get(a:dict, 'options', '')).$SKIM_DEFAULT_OPTIONS - let margin = stridx(opts, '--inline-info') > stridx(opts, '--no-inline-info') ? 1 : 2 - let margin += stridx(opts, '--header') > stridx(opts, '--no-header') - return srcsz >= 0 ? min([srcsz + margin, size]) : size -endfunction - -function! s:getpos() - return {'tab': tabpagenr(), 'win': winnr(), 'cnt': winnr('$'), 'tcnt': tabpagenr('$')} -endfunction - -function! s:split(dict) - let directions = { - \ 'up': ['topleft', 'resize', &lines], - \ 'down': ['botright', 'resize', &lines], - \ 'left': ['vertical topleft', 'vertical resize', &columns], - \ 'right': ['vertical botright', 'vertical resize', &columns] } - let ppos = s:getpos() - try - if s:present(a:dict, 'window') - execute 'keepalt' a:dict.window - elseif !s:splittable(a:dict) - execute (tabpagenr()-1).'tabnew' - else - for [dir, triple] in items(directions) - let val = get(a:dict, dir, '') - if !empty(val) - let [cmd, resz, max] = triple - if (dir == 'up' || dir == 'down') && val[0] == '~' - let sz = s:calc_size(max, val, a:dict) - else - let sz = s:calc_size(max, val, {}) - endif - execute cmd sz.'new' - execute resz sz - return [ppos, {}] - endif - endfor - endif - return [ppos, { '&l:wfw': &l:wfw, '&l:wfh': &l:wfh }] - finally - setlocal winfixwidth winfixheight - endtry -endfunction - -function! s:execute_term(dict, command, temps) abort - let winrest = winrestcmd() - let pbuf = bufnr('') - let [ppos, winopts] = s:split(a:dict) - call s:use_sh() - let b:skim = a:dict - let skim = { 'buf': bufnr(''), 'pbuf': pbuf, 'ppos': ppos, 'dict': a:dict, 'temps': a:temps, - \ 'winopts': winopts, 'winrest': winrest, 'lines': &lines, - \ 'columns': &columns, 'command': a:command } - function! skim.switch_back(inplace) - if a:inplace && bufnr('') == self.buf - if bufexists(self.pbuf) - execute 'keepalt b' self.pbuf - endif - " No other listed buffer - if bufnr('') == self.buf - enew - endif - endif - endfunction - function! skim.on_exit(id, code, ...) - if s:getpos() == self.ppos " {'window': 'enew'} - for [opt, val] in items(self.winopts) - execute 'let' opt '=' val - endfor - call self.switch_back(1) - else - if bufnr('') == self.buf - " We use close instead of bd! since Vim does not close the split when - " there's no other listed buffer (nvim +'set nobuflisted') - close - endif - execute 'tabnext' self.ppos.tab - execute self.ppos.win.'wincmd w' - endif - - if bufexists(self.buf) - execute 'bd!' self.buf - endif - - if &lines == self.lines && &columns == self.columns && s:getpos() == self.ppos - execute self.winrest - endif - - if !s:exit_handler(a:code, self.command, 1) - return - endif - - call s:pushd(self.dict) - let lines = s:collect(self.temps) - call s:callback(self.dict, lines) - call self.switch_back(s:getpos() == self.ppos) - endfunction - - try - call s:pushd(a:dict) - if s:is_win - let skim.temps.batchfile = s:skim_tempname().'.bat' - call writefile(s:wrap_cmds(a:command), skim.temps.batchfile) - let command = skim.temps.batchfile - else - let command = a:command - endif - let command .= s:term_marker - if has('nvim') - call termopen(command, skim) - else - let skim.buf = term_start([&shell, &shellcmdflag, command], {'curwin': 1, 'exit_cb': function(skim.on_exit)}) - if !has('patch-8.0.1261') && !has('nvim') && !s:is_win - call term_wait(skim.buf, 20) - endif - endif - finally - call s:dopopd() - endtry - setlocal nospell bufhidden=wipe nobuflisted nonumber - setf skim - startinsert - return [] -endfunction - -function! s:collect(temps) abort - try - return filereadable(a:temps.result) ? readfile(a:temps.result) : [] - finally - for tf in values(a:temps) - silent! call delete(tf) - endfor - endtry -endfunction - -function! s:callback(dict, lines) abort - let popd = has_key(a:dict, 'pushd') - if popd - let w:skim_pushd = a:dict.pushd - endif - - try - if has_key(a:dict, 'sink') - for line in a:lines - if type(a:dict.sink) == 2 - call a:dict.sink(line) - else - execute a:dict.sink s:escape(line) - endif - endfor - endif - if has_key(a:dict, 'sink*') - call a:dict['sink*'](a:lines) - endif - catch - if stridx(v:exception, ':E325:') < 0 - echoerr v:exception - endif - endtry - - " We may have opened a new window or tab - if popd - let w:skim_pushd = a:dict.pushd - call s:dopopd() - endif -endfunction - -let s:default_action = { - \ 'ctrl-t': 'tab split', - \ 'ctrl-x': 'split', - \ 'ctrl-v': 'vsplit' } - -function! s:shortpath() - let short = fnamemodify(getcwd(), ':~:.') - if !has('win32unix') - let short = pathshorten(short) - endif - let slash = (s:is_win && !&shellslash) ? '\' : '/' - return empty(short) ? '~'.slash : short . (short =~ escape(slash, '\').'$' ? '' : slash) -endfunction - -function! s:cmd(bang, ...) abort - let args = copy(a:000) - let opts = { 'options': ['--multi'] } - if len(args) && isdirectory(expand(args[-1])) - let opts.dir = substitute(substitute(remove(args, -1), '\\\(["'']\)', '\1', 'g'), '[/\\]*$', '/', '') - if s:is_win && !&shellslash - let opts.dir = substitute(opts.dir, '/', '\\', 'g') - endif - let prompt = opts.dir - else - let prompt = s:shortpath() - endif - let prompt = strwidth(prompt) < &columns - 20 ? prompt : '> ' - call extend(opts.options, ['--prompt', prompt]) - call extend(opts.options, args) - call skim#run(skim#wrap('SKIM', opts, a:bang)) -endfunction - -command! -nargs=* -complete=dir -bang SK call s:cmd(0, ) - -let &cpo = s:cpo_save -unlet s:cpo_save diff --git a/vim/pack/snippets/start/ultisnips b/vim/pack/snippets/start/ultisnips deleted file mode 160000 index ee31ea1..0000000 --- a/vim/pack/snippets/start/ultisnips +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ee31ea1c7d08ced8577120b4c1d55c5a05351a75 diff --git a/vim/pack/snippets/start/vim-snippets b/vim/pack/snippets/start/vim-snippets deleted file mode 160000 index b62dfce..0000000 --- a/vim/pack/snippets/start/vim-snippets +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b62dfce8449d8a8196720ddd3cfecbca8bb7fe45