updates to various files

UltiSnips/go.snippets

@@ -0,0 +1,9 @@
+priority 0
+
+snippet eli "else if .. (eli)"
+else if ${1:/* condition */} {
+	${VISUAL}$0
+}
+endsnippet
+
+

autoload/plug.vim

@@ -334,11 +334,11 @@ function! s:progress_opt(base)
         \ s:git_version_requirement(1, 7, 1) ? '--progress' : ''
 endfunction
 
-if s:is_win
-  function! s:rtp(spec)
-    return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
-  endfunction
+function! s:rtp(spec)
+  return s:path(a:spec.dir . get(a:spec, 'rtp', ''))
+endfunction
 
+if s:is_win
   function! s:path(path)
     return s:trim(substitute(a:path, '/', '\', 'g'))
   endfunction
@@ -350,11 +350,32 @@ if s:is_win
   function! s:is_local_plug(repo)
     return a:repo =~? '^[a-z]:\|^[%~]'
   endfunction
-else
-  function! s:rtp(spec)
-    return s:dirpath(a:spec.dir . get(a:spec, 'rtp', ''))
+
+  " Copied from fzf
+  function! s:wrap_cmds(cmds)
+    let use_chcp = executable('sed')
+    return map([
+      \ '@echo off',
+      \ 'setlocal enabledelayedexpansion']
+    \ + (use_chcp ? [
+      \ 'for /f "usebackq" %%a in (`chcp ^| sed "s/[^0-9]//gp"`) do set origchcp=%%a',
+      \ 'chcp 65001 > nul'] : [])
+    \ + (type(a:cmds) == type([]) ? a:cmds : [a:cmds])
+    \ + (use_chcp ? ['chcp !origchcp! > nul'] : [])
+    \ + ['endlocal'],
+    \ 'v:val."\r"')
   endfunction
 
+  function! s:batchfile(cmd)
+    let batchfile = tempname().'.bat'
+    call writefile(s:wrap_cmds(a:cmd), batchfile)
+    let cmd = plug#shellescape(batchfile, {'shell': &shell, 'script': 1})
+    if &shell =~# 'powershell\.exe$'
+      let cmd = '& ' . cmd
+    endif
+    return [batchfile, cmd]
+  endfunction
+else
   function! s:path(path)
     return s:trim(a:path)
   endfunction
@@ -434,8 +455,8 @@ endfunction
 
 function! s:dobufread(names)
   for name in a:names
-    let path = s:rtp(g:plugs[name]).'/**'
-    for dir in ['ftdetect', 'ftplugin']
+    let path = s:rtp(g:plugs[name])
+    for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin']
       if len(finddir(dir, path))
         if exists('#BufRead')
           doautocmd BufRead
@@ -794,31 +815,28 @@ endfunction
 
 function! s:chsh(swap)
   let prev = [&shell, &shellcmdflag, &shellredir]
-  if s:is_win
-    set shell=cmd.exe shellcmdflag=/c shellredir=>%s\ 2>&1
-  elseif a:swap
+  if !s:is_win && 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 = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
+      let [batchfile, cmd] = s:batchfile(cmd)
     endif
     let g:_plug_bang = (s:is_win && has('gui_running') ? 'silent ' : '').'!'.escape(cmd, '#!%')
     execute "normal! :execute g:_plug_bang\<cr>\<cr>"
   finally
     unlet g:_plug_bang
     let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
+    if s:is_win && filereadable(batchfile)
       call delete(batchfile)
     endif
   endtry
@@ -1015,7 +1033,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')
+  if has('win32unix') || has('wsl')
     let s:clone_opt .= ' -c core.eol=lf -c core.autocrlf=input'
   endif
 
@@ -1094,7 +1112,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 '.s:shellesc(tag).' --sort -version:refname 2>&1', spec.dir))
+          let tags = s:lines(s:system('git tag --list '.plug#shellescape(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))
@@ -1151,7 +1169,7 @@ function! s:job_abort()
       silent! call job_stop(j.jobid)
     endif
     if j.new
-      call s:system('rm -rf ' . s:shellesc(g:plugs[name].dir))
+      call s:system('rm -rf ' . plug#shellescape(g:plugs[name].dir))
     endif
   endfor
   let s:jobs = {}
@@ -1204,15 +1222,10 @@ 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) : 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)
+  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]
 
   if s:nvim
     call extend(job, {
@@ -1262,9 +1275,6 @@ 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
 
@@ -1354,8 +1364,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,
-          \ s:shellesc(spec.uri),
-          \ s:shellesc(s:trim(spec.dir))), { 'new': 1 })
+          \ plug#shellescape(spec.uri, {'script': 0}),
+          \ plug#shellescape(s:trim(spec.dir), {'script': 0})), { 'new': 1 })
   endif
 
   if !s:jobs[name].running
@@ -1982,17 +1992,23 @@ function! s:update_ruby()
 EOF
 endfunction
 
-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', '').'^"'
+function! s:shellesc_cmd(arg, script)
+  let escaped = substitute('"'.a:arg.'"', '[&|<>()@^!"]', '^&', 'g')
+  return substitute(escaped, '%', (a:script ? '%' : '^') . '&', 'g')
 endfunction
 
-function! s:shellesc(arg)
-  if &shell =~# 'cmd.exe$'
-    return s:shellesc_cmd(a:arg)
+function! s:shellesc_ps1(arg)
+  return "'".substitute(escape(a:arg, '\"'), "'", "''", 'g')."'"
+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)
   endif
   return shellescape(a:arg)
 endfunction
@@ -2026,23 +2042,23 @@ function! s:format_message(bullet, name, message)
   endif
 endfunction
 
-function! s:with_cd(cmd, dir)
-  return printf('cd%s %s && %s', s:is_win ? ' /d' : '', s:shellesc(a:dir), a:cmd)
+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)
 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 = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
+      let [batchfile, cmd] = s:batchfile(cmd)
     endif
-    return system(s:is_win ? '('.cmd.')' : cmd)
+    return system(cmd)
   finally
     let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
+    if s:is_win && filereadable(batchfile)
       call delete(batchfile)
     endif
   endtry
@@ -2115,7 +2131,7 @@ endfunction
 
 function! s:rm_rf(dir)
   if isdirectory(a:dir)
-    call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . s:shellesc(a:dir))
+    call s:system((s:is_win ? 'rmdir /S /Q ' : 'rm -rf ') . plug#shellescape(a:dir))
   endif
 endfunction
 
@@ -2224,7 +2240,7 @@ function! s:upgrade()
   let new = tmp . '/plug.vim'
 
   try
-    let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
+    let out = s:system(printf('git clone --depth 1 %s %s', plug#shellescape(s:plug_src), plug#shellescape(tmp)))
     if v:shell_error
       return s:err('Error upgrading vim-plug: '. out)
     endif
@@ -2365,18 +2381,17 @@ 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 '.s:shellesc(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
+    let cmd = 'cd '.plug#shellescape(g:plugs[name].dir).' && git show --no-color --pretty=medium '.sha
     if s:is_win
-      let batchfile = tempname().'.bat'
-      call writefile(["@echo off\r", cmd . "\r"], batchfile)
-      let cmd = batchfile
+      let [batchfile, cmd] = s:batchfile(cmd)
     endif
     execute 'silent %!' cmd
   finally
     let [&shell, &shellcmdflag, &shellredir] = [sh, shellcmdflag, shrd]
-    if s:is_win
+    if s:is_win && filereadable(batchfile)
       call delete(batchfile)
     endif
   endtry
@@ -2420,9 +2435,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 '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 's:shellesc(v:val)'))
+      let cmd = 'git log --graph --color=never '.join(map(['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range], 'plug#shellescape(v:val)'))
       if has_key(v, 'rtp')
-        let cmd .= ' -- '.s:shellesc(v.rtp)
+        let cmd .= ' -- '.plug#shellescape(v.rtp)
       endif
       let diff = s:system_chomp(cmd, v.dir)
       if !empty(diff)

coc-settings.json

@@ -0,0 +1,21 @@
+{
+  "python.jediEnabled": false,
+ "languageserver": {
+    "golang": {
+      "command": "gopls",
+      "rootPatterns": ["go.mod", ".vim/", ".git/", ".hg/"],
+      "filetypes": ["go"]
+    },
+	"dockerfile": {
+      "command": "docker-langserver",
+      "filetypes": ["dockerfile"],
+      "args": ["--stdio"]
+    },
+	 "bash": {
+      "command": "bash-language-server",
+      "args": ["start"],
+      "filetypes": ["sh"],
+      "ignoredRootPaths": ["~"]
+    }
+  }
+}

vimrc

@@ -10,19 +10,24 @@ let g:python3_host_prog= expand('$HOME') . '/.pyenv/versions/neovim3/bin/python'
 set nocompatible
 call plug#begin('~/.vim/bundle')
 
-" ***** plugins we only want in true vim. 
+" ***** plugins we only want in true vim.
 if !exists("g:gui_oni")
   " As-you-type semantic completion.
   " Plug 'Valloric/YouCompleteMe', { 'on': ['YcmCompleter', 'YcmDiags', 'YcmForceCompileAndDiagnostics'], 'do': './install.py'}
   " Plug 'Valloric/YouCompleteMe', { 'do': 'python3 ./install.py'}
   " autocmd! User YouCompleteMe if !has('vim_starting') | call youcompleteme#Enable() | endif
-  Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
-  let g:deoplete#enable_at_startup = 1
-  Plug 'davidhalter/jedi-vim'
-  Plug 'zchee/deoplete-jedi'
-  Plug 'zchee/deoplete-go', { 'do': 'make'}
-  let g:deoplete#sources#go#gocode_binary = '/home/william/go/bin/gocode'
-  Plug 'Shougo/neco-vim'
+
+  " Deoplete
+  " Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+  " let g:deoplete#enable_at_startup = 1
+  " Plug 'davidhalter/jedi-vim'
+  " Plug 'zchee/deoplete-jedi'
+  " Plug 'zchee/deoplete-go', { 'do': 'make'}
+  " let g:deoplete#sources#go#gocode_binary = '/home/william/go/bin/gocode'
+  " Plug 'Shougo/neco-vim'
+
+  " coc.nvim
+  Plug 'neoclide/coc.nvim', {'branch': 'release'}
 
   " Matching things in insert mode
   Plug 'Raimondi/delimitMate'
@@ -136,6 +141,10 @@ Plug 'ntpeters/vim-better-whitespace'
 Plug 'metakirby5/codi.vim'
 " Code refactoring
 Plug 'apalmer1377/factorus'
+" Markdown viewing
+Plug 'suan/vim-instant-markdown', {'for': 'markdown'}
+" Behave integration
+Plug 'avanzzzi/behave.vim', {'for': 'cucumber'}
 
 
 "SYNTAX Files
@@ -365,7 +374,7 @@ let g:multi_cursor_exit_from_insert_mode = 0
 "nnoremap <leader>r :<C-u>Unite  -buffer-name=mru  -start-insert  file_mru<CR>
 "nnoremap <leader>y :<C-u>Unite -buffer-name=yank    history/yank<CR>
 "nnoremap <leader>j :<C-u>Unite  -buffer-name=jump    jump<CR>
-"nnoremap <leader>be :<C-u>Unite -buffer-name=buffer buffer<CR>
+" nnoremap <leader>be :<C-u>Unite -buffer-name=buffer buffer<CR>
 "nnoremap <leader>/ :<C-u>Unite -keep-focus -no-quit -buffer-name=search -start-insert line:all<CR>
 "nnoremap <leader>vg :<C-u>Unite -buffer-name=vimgrep vimgrep<CR>
 ""
@@ -386,26 +395,27 @@ command! -nargs=* -complete=dir Cd call fzf#run(fzf#wrap(
   \ {'source': 'find '.(empty([<f-args>]) ? '.' : expand(<f-args>)).' -type d',
   \  'sink': 'cd'}))
 
-function! s:delete_items(lines)
-  echo type(a:lines)
-  sleep 3
+function! Bufs()
+  redir => list
+  silent ls
+  redir END
+  return split(list, "\n")
 endfunction
 
-command! -nargs=* -bang BufferDelete 
-  \ call fzf#vim#buffers(<q-args>, {'sink': function('s:delete_items')}, <bang>0)
+command! BufferDelete call fzf#run(fzf#wrap({
+  \ 'source': Bufs(),
+  \ 'sink*': { lines -> execute('bwipeout '.join(map(lines, {_, line -> split(line)[0]}))) },
+  \ 'options': '--multi --bind ctrl-a:select-all+accept --prompt BufDelete'
+\ }))
 
-
-let g:fzf_action = {
-  \ 'ctrl-q': function('s:delete_items'),
-  \ 'ctrl-t': 'tab split',
-  \ 'ctrl-x': 'split',
-  \ 'ctrl-v': 'vsplit' }
+  " \ 'options': '+m -x --tiebreak=index --header-lines=1 --ansi -d \t -n "2,1..2" --prompt BufDelete>'
 
 nnoremap <leader>cd :Cd ~<CR>
-nnoremap <leader><leader>cd :Cd 
+nnoremap <leader><leader>cd :Cd
 nnoremap <leader>e :Files<CR>
 nnoremap <leader><leader>e :Files ~<CR>
 nnoremap <leader>be :Buffers<CR>
+nnoremap <leader>bd :BufferDelete<CR>
 nnoremap <leader>/ :BLines<CR>
 nnoremap <leader>gst :GFiles!?<CR>
 " }}}
@@ -521,7 +531,7 @@ let g:codi#interpreters = {
   \   'prompt': '^(ins)\(>>>\|\.\.\.\) '
   \ },
   \}
-let codi#log='/home/william/log/codi.log'
+" let codi#log='/home/william/log/codi.log'
 " let codi#autocmd = 'None'
 
 " }}}
@@ -560,11 +570,11 @@ endif
 augroup rebase_tools
   autocmd!
   autocmd FileType gitrebase nnoremap <buffer> <leader>] :Gedit <c-r><c-w><CR>
-  autocmd FileType gitrebase nnoremap <buffer> <leader>p :Pick <CR>
-  autocmd FileType gitrebase nnoremap <buffer> <leader>r :Reword <CR>
-  autocmd FileType gitrebase nnoremap <buffer> <leader>e :Edit <CR>
-  autocmd FileType gitrebase nnoremap <buffer> <leader>sq :Squash <CR>
-  autocmd FileType gitrebase nnoremap <buffer> <leader>f :Fixup <CR>
+  autocmd FileType gitrebase nnoremap <buffer> <leader>p :Pick <CR>j
+  autocmd FileType gitrebase nnoremap <buffer> <leader>r :Reword <CR>j
+  autocmd FileType gitrebase nnoremap <buffer> <leader>e :Edit <CR>j
+  autocmd FileType gitrebase nnoremap <buffer> <leader>sq :Squash <CR>j
+  autocmd FileType gitrebase nnoremap <buffer> <leader>f :Fixup <CR>j
 augroup END
 
 command! Jenkins execute 'Gcommit -a --fixup=HEAD' | Gpush
@@ -575,7 +585,42 @@ let g:jedi#goto_command = "<leader>]"
 " }}}
 " {{{ ##### vim-go #####
 let g:go_def_mapping_enabled = 0
-autocmd FileType go nmap <leader>] :GoDef<CR>
+augroup vimgosettings
+  " autocmd FileType go nmap <leader>] :GoDef<CR>
+  au FileType go nmap <F4> <Plug>(go-test)
+  au FileType go nmap <leader><F4> <Plug>(go-lint)
+  au FileType go nmap <F3> <Plug>(go-build)
+  au FileType go nmap <leader><F3> <Plug>(go-install)
+  au FileType go nmap <F2> <Plug>(go-imports)
+  au FileType go nmap <leader>ie <Plug>(go-iferr)
+augroup END
+" }}}
+" {{{ ##### coc.nvim #####
+nmap <silent> <leader>] <Plug>(coc-definition)
+" nmap <silent> gf <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+
+" Use K to show documentation in preview window
+nnoremap <silent> K :call <SID>show_documentation()<CR>
+
+function! s:show_documentation()
+  if (index(['vim','help'], &filetype) >= 0)
+    execute 'h '.expand('<cword>')
+  else
+    call CocAction('doHover')
+  endif
+endfunction
+
+" Highlight symbol under cursor on CursorHold
+autocmd CursorHold * silent call CocActionAsync('highlight')
+
+" Remap for rename current word
+nmap <leader>r <Plug>(coc-rename)
+" }}}
+" {{{ ##### instant-markdown-viewer #####
+let g:instant_markdown_python = 1
 " }}}
 
 " }}}
@@ -610,6 +655,9 @@ if exists("g:gui_oni")
 else
   set laststatus=2
 endif
+
+set shortmess+=c
+
 " turn vim's mode printing off.  Airline takes care of this
 set noshowmode
 " shorten the pause after leaving insert mode
@@ -649,9 +697,10 @@ set undofile
 set undodir=~/.vim/undodir
 
 " format options
-" set expandtab
+set expandtab
 " set shiftwidth=4
 " set softtabstop=4
+set tabstop=4
 set autoindent
 set nosmartindent
 set cindent
@@ -706,10 +755,10 @@ function! KeywordNvimVisual()
   let @" = l:saved_reg
 endfunction
 
-if has("nvim")
-  nnoremap K :call KeywordNvim(expand("<cword>"))<CR>
-  vnoremap K <Esc>:call KeywordNvimVisual()<CR>
-endif
+" if has("nvim")
+"   nnoremap K :call KeywordNvim(expand("<cword>"))<CR>
+"   vnoremap K <Esc>:call KeywordNvimVisual()<CR>
+" endif
 
 
 let g:clipboard = {
@@ -949,9 +998,6 @@ inoremap <C-r>! <C-\><C-O>:let @r=system("")<left><left>
 " terminal escape
 " tnoremap <Esc><Esc> <C-\><C-N>
 
-nnoremap <silent> bn :bn<CR>
-nnoremap <silent> bp :bp<CR>
-
 " }}}
 
 "{{{ ***** COMMANDS ***** "