From d02d551bf580b4c6f89aea1ca162f19cbc127de5 Mon Sep 17 00:00:00 2001 From: Buddy Sandidge Date: Thu, 8 Oct 2020 21:20:14 -0700 Subject: [PATCH] plug update and tweaks --- bash/aliases | 8 ++ vim/UltiSnips/go.snippets | 3 + vim/autoload/plug.vim | 227 +++++++++++++------------------------- vimrc | 58 ++++++---- 4 files changed, 127 insertions(+), 169 deletions(-) create mode 100644 vim/UltiSnips/go.snippets diff --git a/bash/aliases b/bash/aliases index 828c331..8a648f0 100644 --- a/bash/aliases +++ b/bash/aliases @@ -23,6 +23,14 @@ alias code='cd ~/code/ ' alias music="cd ${XDG_MUSIC_DIR}" alias documents="cd ${XDG_DOCUMENTS_DIR}" +if command -v bat &> /dev/null ; then + alias cat='bat --style=plain --pager=never' +fi + +# Some common aliases +alias ll='ls -alF' +alias df='df -h' +alias du='du -h' alias curl='curl --proto-default https --silent ' alias 644='chmod 644 ' diff --git a/vim/UltiSnips/go.snippets b/vim/UltiSnips/go.snippets new file mode 100644 index 0000000..f624321 --- /dev/null +++ b/vim/UltiSnips/go.snippets @@ -0,0 +1,3 @@ +snippet ignore "ignore function" ! +ignore := func(...interface{}) {} +endsnippet diff --git a/vim/autoload/plug.vim b/vim/autoload/plug.vim index ac14332..123035e 100644 --- a/vim/autoload/plug.vim +++ b/vim/autoload/plug.vim @@ -99,13 +99,7 @@ let s:mac_gui = has('gui_macvim') && has('gui_running') let s:is_win = has('win32') let s:nvim = has('nvim-0.2') || (has('nvim') && exists('*jobwait') && !s:is_win) let s:vim8 = has('patch-8.0.0039') && exists('*job_start') -if s:is_win && &shellslash - set noshellslash - let s:me = resolve(expand(':p')) - set shellslash -else - let s:me = resolve(expand(':p')) -endif +let s:me = resolve(expand(':p')) let s:base_spec = { 'branch': 'master', 'frozen': 0 } let s:TYPE = { \ 'string': type(''), @@ -116,42 +110,10 @@ let s:TYPE = { let s:loaded = get(s:, 'loaded', {}) let s:triggers = get(s:, 'triggers', {}) -if s:is_win - function! s:plug_call(fn, ...) - let shellslash = &shellslash - try - set noshellslash - return call(a:fn, a:000) - finally - let &shellslash = shellslash - endtry - endfunction -else - function! s:plug_call(fn, ...) - return call(a:fn, a:000) - endfunction -endif - -function! s:plug_getcwd() - return s:plug_call('getcwd') -endfunction - -function! s:plug_fnamemodify(fname, mods) - return s:plug_call('fnamemodify', a:fname, a:mods) -endfunction - -function! s:plug_expand(fmt) - return s:plug_call('expand', a:fmt, 1) -endfunction - -function! s:plug_tempname() - return s:plug_call('tempname') -endfunction - function! plug#begin(...) if a:0 > 0 let s:plug_home_org = a:1 - let home = s:path(s:plug_fnamemodify(s:plug_expand(a:1), ':p')) + let home = s:path(fnamemodify(expand(a:1), ':p')) elseif exists('g:plug_home') let home = s:path(g:plug_home) elseif !empty(&rtp) @@ -159,7 +121,7 @@ function! plug#begin(...) else return s:err('Unable to determine plug home. Try calling plug#begin() with a path argument.') endif - if s:plug_fnamemodify(home, ':t') ==# 'plugin' && s:plug_fnamemodify(home, ':h') ==# s:first_rtp + if fnamemodify(home, ':t') ==# 'plugin' && fnamemodify(home, ':h') ==# s:first_rtp return s:err('Invalid plug home. '.home.' is a standard Vim runtime path and is not allowed.') endif @@ -177,16 +139,6 @@ function! s:define_commands() if !executable('git') return s:err('`git` executable not found. Most commands will not be available. To suppress this message, prepend `silent!` to `call plug#begin(...)`.') endif - if has('win32') - \ && &shellslash - \ && (&shell =~# 'cmd\.exe' || &shell =~# 'powershell\.exe') - return s:err('vim-plug does not support shell, ' . &shell . ', when shellslash is set.') - endif - if !has('nvim') - \ && (has('win32') || has('win32unix')) - \ && !has('multi_byte') - return s:err('Vim needs +multi_byte feature on Windows to run shell commands. Enable +iconv for best results.') - endif command! -nargs=* -bar -bang -complete=customlist,s:names PlugInstall call s:install(0, []) command! -nargs=* -bar -bang -complete=customlist,s:names PlugUpdate call s:update(0, []) command! -nargs=0 -bar -bang PlugClean call s:clean(0) @@ -251,7 +203,7 @@ endfunction function! plug#end() if !exists('g:plugs') - return s:err('plug#end() called without calling plug#begin() first') + return s:err('Call plug#begin() first') endif if exists('#PlugLOD') @@ -382,11 +334,11 @@ function! s:progress_opt(base) \ s:git_version_requirement(1, 7, 1) ? '--progress' : '' endfunction -function! s:rtp(spec) - return s:path(a:spec.dir . get(a:spec, 'rtp', '')) -endfunction - if s:is_win + function! s:rtp(spec) + return s:path(a:spec.dir . get(a:spec, 'rtp', '')) + endfunction + function! s:path(path) return s:trim(substitute(a:path, '/', '\', 'g')) endfunction @@ -398,33 +350,11 @@ if s:is_win function! s:is_local_plug(repo) return a:repo =~? '^[a-z]:\|^[%~]' endfunction - - " Copied from fzf - function! s:wrap_cmds(cmds) - let cmds = [ - \ '@echo off', - \ 'setlocal enabledelayedexpansion'] - \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds]) - \ + ['endlocal'] - if has('iconv') - if !exists('s:codepage') - let s:codepage = libcallnr('kernel32.dll', 'GetACP', 0) - endif - return map(cmds, printf('iconv(v:val."\r", "%s", "cp%d")', &encoding, s:codepage)) - endif - return map(cmds, 'v:val."\r"') +else + function! s:rtp(spec) + return s:dirpath(a:spec.dir . get(a:spec, 'rtp', '')) endfunction - function! s:batchfile(cmd) - let batchfile = s:plug_tempname().'.bat' - call writefile(s:wrap_cmds(a:cmd), batchfile) - let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 0}) - if &shell =~# 'powershell\.exe' - let cmd = '& ' . cmd - endif - return [batchfile, cmd] - endfunction -else function! s:path(path) return s:trim(a:path) endfunction @@ -504,8 +434,8 @@ endfunction function! s:dobufread(names) for name in a:names - let path = s:rtp(g:plugs[name]) - for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin'] + let path = s:rtp(g:plugs[name]).'/**' + for dir in ['ftdetect', 'ftplugin'] if len(finddir(dir, path)) if exists('#BufRead') doautocmd BufRead @@ -624,7 +554,7 @@ function! plug#(repo, ...) try let repo = s:trim(a:repo) let opts = a:0 == 1 ? s:parse_options(a:1) : s:base_spec - let name = get(opts, 'as', s:plug_fnamemodify(repo, ':t:s?\.git$??')) + let name = get(opts, 'as', fnamemodify(repo, ':t:s?\.git$??')) let spec = extend(s:infer_properties(name, repo), opts) if !has_key(g:plugs, name) call add(g:plugs_order, name) @@ -644,7 +574,7 @@ function! s:parse_options(arg) elseif type == s:TYPE.dict call extend(opts, a:arg) if has_key(opts, 'dir') - let opts.dir = s:dirpath(s:plug_expand(opts.dir)) + let opts.dir = s:dirpath(expand(opts.dir)) endif else throw 'Invalid argument type (expected: string or dictionary)' @@ -655,7 +585,7 @@ endfunction function! s:infer_properties(name, repo) let repo = a:repo if s:is_local_plug(repo) - return { 'dir': s:dirpath(s:plug_expand(repo)) } + return { 'dir': s:dirpath(expand(repo)) } else if repo =~ ':' let uri = repo @@ -808,7 +738,7 @@ function! s:finish_bindings() endfunction function! s:prepare(...) - if empty(s:plug_getcwd()) + if empty(getcwd()) throw 'Invalid current working directory. Cannot proceed.' endif @@ -864,28 +794,31 @@ endfunction function! s:chsh(swap) let prev = [&shell, &shellcmdflag, &shellredir] - if !s:is_win && a:swap + if s:is_win + set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1 + elseif a:swap set shell=sh shellredir=>%s\ 2>&1 endif return prev endfunction function! s:bang(cmd, ...) - let batchfile = '' try let [sh, shellcmdflag, shrd] = s:chsh(a:0) " FIXME: Escaping is incomplete. We could use shellescape with eval, " but it won't work on Windows. let cmd = a:0 ? s:with_cd(a:cmd, a:1) : a:cmd if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) + let batchfile = tempname().'.bat' + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = batchfile endif let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%') execute "normal! :execute g:_plug_bang\\" finally unlet g:_plug_bang let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) + if s:is_win call delete(batchfile) endif endtry @@ -964,7 +897,7 @@ function! s:checkout(spec) let output = s:system('git rev-parse HEAD', a:spec.dir) if !v:shell_error && !s:hash_match(sha, s:lines(output)[0]) let output = s:system( - \ 'git fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) + \ 'git fetch --depth 999999 && git checkout '.s:esc(sha).' --', a:spec.dir) endif return output endfunction @@ -1082,7 +1015,7 @@ function! s:update_impl(pull, force, args) abort let s:clone_opt = get(g:, 'plug_shallow', 1) ? \ '--depth 1' . (s:git_version_requirement(1, 7, 10) ? ' --no-single-branch' : '') : '' - if has('win32unix') || has('wsl') + if has('win32unix') let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input' endif @@ -1161,7 +1094,7 @@ function! s:update_finish() elseif has_key(spec, 'tag') let tag = spec.tag if tag =~ '\*' - let tags = s:lines(s:system('git tag --list '.plug#shellescape(tag).' --sort -version:refname 2>&1', spec.dir)) + let tags = s:lines(s:system('git tag --list '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir)) if !v:shell_error && !empty(tags) let tag = tags[0] call s:log4(name, printf('Latest tag for %s -> %s', spec.tag, tag)) @@ -1169,12 +1102,12 @@ function! s:update_finish() endif endif call s:log4(name, 'Checking out '.tag) - let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) + let out = s:system('git checkout -q '.s:esc(tag).' -- 2>&1', spec.dir) else - let branch = get(spec, 'branch', 'master') - call s:log4(name, 'Merging origin/'.s:esc(branch)) - let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' - \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) + let branch = s:esc(get(spec, 'branch', 'master')) + call s:log4(name, 'Merging origin/'.branch) + let out = s:system('git checkout -q '.branch.' -- 2>&1' + \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only origin/'.branch.' 2>&1')), spec.dir) endif if !v:shell_error && filereadable(spec.dir.'/.gitmodules') && \ (s:update.force || has_key(s:update.new, name) || s:is_updated(spec.dir)) @@ -1218,7 +1151,7 @@ function! s:job_abort() silent! call job_stop(j.jobid) endif if j.new - call s:rm_rf(g:plugs[name].dir) + call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir)) endif endfor let s:jobs = {} @@ -1271,17 +1204,22 @@ endfunction function! s:spawn(name, cmd, opts) let job = { 'name': a:name, 'running': 1, 'error': 0, 'lines': [''], + \ 'batchfile': (s:is_win && (s:nvim || s:vim8)) ? tempname().'.bat' : '', \ 'new': get(a:opts, 'new', 0) } let s:jobs[a:name] = job - let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir, 0) : a:cmd - let argv = s:is_win ? ['cmd', '/s', '/c', '"'.cmd.'"'] : ['sh', '-c', cmd] + let cmd = has_key(a:opts, 'dir') ? s:with_cd(a:cmd, a:opts.dir) : a:cmd + if !empty(job.batchfile) + call writefile(["@echo off\r", cmd . "\r"], job.batchfile) + let cmd = job.batchfile + endif + let argv = add(s:is_win ? ['cmd', '/c'] : ['sh', '-c'], cmd) if s:nvim call extend(job, { \ 'on_stdout': function('s:nvim_cb'), \ 'on_exit': function('s:nvim_cb'), \ }) - let jid = s:plug_call('jobstart', argv, job) + let jid = jobstart(argv, job) if jid > 0 let job.jobid = jid else @@ -1324,6 +1262,9 @@ function! s:reap(name) call s:log(bullet, a:name, empty(result) ? 'OK' : result) call s:bar() + if has_key(job, 'batchfile') && !empty(job.batchfile) + call delete(job.batchfile) + endif call remove(s:jobs, a:name) endfunction @@ -1338,10 +1279,9 @@ function! s:bar() endfunction function! s:logpos(name) - let max = line('$') - for i in range(4, max > 4 ? max : 4) + for i in range(4, line('$')) if getline(i) =~# '^[-+x*] '.a:name.':' - for j in range(i + 1, max > 5 ? max : 5) + for j in range(i + 1, line('$')) if getline(j) !~ '^ ' return [i, j - 1] endif @@ -1414,8 +1354,8 @@ while 1 " Without TCO, Vim stack is bound to explode \ printf('git clone %s %s %s %s 2>&1', \ has_tag ? '' : s:clone_opt, \ prog, - \ plug#shellescape(spec.uri, {'script': 0}), - \ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 }) + \ s:shellesc(spec.uri), + \ s:shellesc(s:trim(spec.dir))), { 'new': 1 }) endif if !s:jobs[name].running @@ -2042,29 +1982,19 @@ function! s:update_ruby() EOF endfunction -function! s:shellesc_cmd(arg, script) - let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g') - return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g') -endfunction - -function! s:shellesc_ps1(arg) - return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'" -endfunction - -function! s:shellesc_sh(arg) - return "'".substitute(a:arg, "'", "'\\\\''", 'g')."'" +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! plug#shellescape(arg, ...) - let opts = a:0 > 0 && type(a:1) == s:TYPE.dict ? a:1 : {} - let shell = get(opts, 'shell', s:is_win ? 'cmd.exe' : 'sh') - let script = get(opts, 'script', 1) - if shell =~# 'cmd\.exe' - return s:shellesc_cmd(a:arg, script) - elseif shell =~# 'powershell\.exe' || shell =~# 'pwsh$' - return s:shellesc_ps1(a:arg) +function! s:shellesc(arg) + if &shell =~# 'cmd.exe$' + return s:shellesc_cmd(a:arg) endif - return s:shellesc_sh(a:arg) + return shellescape(a:arg) endfunction function! s:glob_dir(path) @@ -2096,23 +2026,23 @@ function! s:format_message(bullet, name, message) endif endfunction -function! s:with_cd(cmd, dir, ...) - let script = a:0 > 0 ? a:1 : 1 - return printf('cd%s %s && %s', s:is_win ? ' /d' : '', plug#shellescape(a:dir, {'script': script}), a:cmd) +function! s:with_cd(cmd, dir) + return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd) endfunction function! s:system(cmd, ...) - let batchfile = '' try let [sh, shellcmdflag, shrd] = s:chsh(1) let cmd = a:0 > 0 ? s:with_cd(a:cmd, a:1) : a:cmd if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) + let batchfile = tempname().'.bat' + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = batchfile endif - return system(cmd) + return system(s:is_win ? '('.cmd.')' : cmd) finally let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) + if s:is_win call delete(batchfile) endif endtry @@ -2185,7 +2115,7 @@ endfunction function! s:rm_rf(dir) if isdirectory(a:dir) - call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . plug#shellescape(a:dir)) + call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir)) endif endfunction @@ -2217,7 +2147,7 @@ function! s:clean(force) let allowed = {} for dir in dirs - let allowed[s:dirpath(s:plug_fnamemodify(dir, ':h:h'))] = 1 + let allowed[s:dirpath(fnamemodify(dir, ':h:h'))] = 1 let allowed[dir] = 1 for child in s:glob_dir(dir) let allowed[child] = 1 @@ -2290,11 +2220,11 @@ endfunction function! s:upgrade() echo 'Downloading the latest version of vim-plug' redraw - let tmp = s:plug_tempname() + let tmp = tempname() let new = tmp . '/plug.vim' try - let out = s:system(printf('git clone --depth 1 %s %s', plug#shellescape(s:plug_src), plug#shellescape(tmp))) + let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp))) if v:shell_error return s:err('Error upgrading vim-plug: '. out) endif @@ -2435,17 +2365,18 @@ function! s:preview_commit() wincmd P endif setlocal previewwindow filetype=git buftype=nofile nobuflisted modifiable - let batchfile = '' try let [sh, shellcmdflag, shrd] = s:chsh(1) - let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha + let cmd = 'cd '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha if s:is_win - let [batchfile, cmd] = s:batchfile(cmd) + let batchfile = tempname().'.bat' + call writefile(["@echo off\r", cmd . "\r"], batchfile) + let cmd = batchfile endif execute 'silent %!' cmd finally let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd] - if s:is_win && filereadable(batchfile) + if s:is_win call delete(batchfile) endif endtry @@ -2489,11 +2420,9 @@ function! s:diff() call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') for [k, v] in plugs let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' - let cmd = 'git log --graph --color=never ' - \ . (s:git_version_requirement(2, 10, 0) ? '--no-show-signature ' : '') - \ . join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 'plug#shellescape(v:val)')) + let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)')) if has_key(v, 'rtp') - let cmd .= ' -- '.plug#shellescape(v.rtp) + let cmd .= ' -- '.s:shellesc(v.rtp) endif let diff = s:system_chomp(cmd, v.dir) if !empty(diff) @@ -2541,7 +2470,7 @@ function! s:revert() return endif - call s:system('git reset --hard HEAD@{1} && git checkout '.plug#shellescape(g:plugs[name].branch).' --', g:plugs[name].dir) + call s:system('git reset --hard HEAD@{1} && git checkout '.s:esc(g:plugs[name].branch).' --', g:plugs[name].dir) setlocal modifiable normal! "_dap setlocal nomodifiable @@ -2569,7 +2498,7 @@ function! s:snapshot(force, ...) abort endfor if a:0 > 0 - let fn = s:plug_expand(a:1) + let fn = expand(a:1) if filereadable(fn) && !(a:force || s:ask(a:1.' already exists. Overwrite?')) return endif diff --git a/vimrc b/vimrc index 969d7be..152eecd 100644 --- a/vimrc +++ b/vimrc @@ -12,29 +12,47 @@ command! MakeTags !ctags -R . call plug#begin('~/.vim/plugged') -Plug 'SirVer/ultisnips' -Plug 'editorconfig/editorconfig-vim' -Plug 'fatih/vim-go', { 'tag': 'v1.22' } -"Plug 'hashivim/vim-hashicorp-tools' -"Plug 'prettier/vim-prettier', { 'branch': 'master', 'do': 'npm install' } -Plug 'prettier/vim-prettier', { - \ 'branch': 'release/1.x', - \ 'do': 'npm install', - \ 'for': ['javascript', 'typescript', 'css', 'less', 'scss', 'json', 'graphql', 'markdown', 'vue', 'yaml', 'html', 'ruby'] - \ } -Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } -"Plug 'vim-scripts/CSApprox' +Plug 'NLKNguyen/papercolor-theme' +Plug 'SirVer/ultisnips', { 'tag': '3.2' } +Plug 'cespare/vim-toml', { 'for': 'toml' } Plug 'dense-analysis/ale', { 'tag': 'v2.7.0' } -"Plug 'rust-lang/rust.vim' -"Plug 'pangloss/vim-javascript' -Plug 'tpope/vim-surround' -Plug 'Quramy/tsuquyomi' -Plug 'sheerun/vim-wombat-scheme' +Plug 'editorconfig/editorconfig-vim', { 'tag': 'v1.1.1' } +Plug 'fatih/vim-go', { 'tag': 'v1.22' } +Plug 'hashivim/vim-hashicorp-tools' Plug 'lifepillar/pgsql.vim' -"Plug 'leafgarland/typescript-vim' -Plug 'cespare/vim-toml' -Plug 'NLKNguyen/papercolor-theme' Plug 'neoclide/coc.nvim', {'branch': 'release'} +Plug 'preservim/nerdtree', { 'on': 'NERDTreeToggle', 'tag': '6.9.8' } +Plug 'prettier/vim-prettier', { + \ 'branch': 'release/1.x', + \ 'do': 'npm install', + \ 'for': [ + \ 'css', + \ 'graphql', + \ 'html', + \ 'javascript', + \ 'json', + \ 'less', + \ 'markdown', + \ 'package', + \ 'pg', + \ 'php', + \ 'pug', + \ 'python', + \ 'ruby', + \ 'scss', + \ 'sh', + \ 'swift', + \ 'toml', + \ 'typescript', + \ 'vue', + \ 'xml', + \ 'yaml' + \ ] +\ } +Plug 'rust-lang/rust.vim', { 'for': 'rust' } +Plug 'sheerun/vim-wombat-scheme' +Plug 'tpope/vim-surround' +Plug 'vim-scripts/CSApprox' call plug#end()