vim: update vim-suda and supporting framework

[dotfiles.git] / etc / vim / .vimrc

diff --git a/etc/vim/.vimrc b/etc/vim/.vimrc
index 341cf2a7ff97f7881996bcc4c18baf9902fe34f8..0b9bcd9dc0739d766fbe7558209fa847134d13ea 100644 (file)
--- a/etc/vim/.vimrc
+++ b/etc/vim/.vimrc
@@ -48,6 +48,7 @@ endif
 unlet x
 unlet y
 
+
 """ vim-only defaults
 if !has('nvim')
     " neovim defaults are already set
@@ -57,15 +58,16 @@ if !has('nvim')
     autocmd! vimStartup
 
     " packages
-    packadd! matchit
-    packadd! editorconfig   " this is now built to [n]vim in but optional
-    packadd! vim-commentary " nvim has built in commenting now
+    packadd! matchit        " included with [n]vim but disabled by default
+    packadd! editorconfig   " now included with [n]vim but disabled by default
+    packadd! vim-commentary " nvim has this built in now, vim still needs it
 
     " options
     set hlsearch
     autocmd BufRead * set autoindent
 endif
 
+
 """ styling
 " nice default theme
 colorscheme murphy
@@ -113,9 +115,15 @@ autocmd VimEnter,WinNew,
 autocmd VimEnter,WinNew * set list
 set listchars=tab:├─,extends:»,precedes:«,space:·,trail:∙,nbsp:■
 
+
 """ editor
 " always save undo file for all file buffers
-autocmd BufRead * set undofile
+autocmd BufReadPre * setlocal undofile
+
+" explicitly use modeline, even on systems where it's disabled by system vimrc
+autocmd BufRead * set modeline
+" should be default disabled but just in case
+set nomodelineexpr
 
 "" indent
 " always use shiftwidth instead of tabsize
@@ -129,7 +137,7 @@ autocmd FileType html       set softtabstop=2 shiftwidth=2 expandtab
 let g:EditorConfig_enable_for_new_buf = 1
 
 "" syntax
-autocmd FileType todo       set colorcolumn=0
+autocmd Syntax php          syn clear phpHereDoc phpNowDoc
 
 "" mappings
 " use more accessible escapes, as C-n and C-o are shadowed by some terminals
@@ -165,3 +173,98 @@ nnoremap <A-l> <C-w>l
 if !has('nvim') && maparg('<C-L>', 'n') ==# ''
   nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
 endif
+
+
+""" package config
+"" suda
+" https://github.com/lambdalisue/vim-suda/issues/32#issuecomment-829608925
+if ! &diff
+    let g:suda_smart_edit = 1
+endif
+" re-enable backup, swap, undo for suda buffers that we can read
+" https://github.com/lambdalisue/vim-suda/issues/25
+function s:SudaSettingsSave()
+    let b:sev_suda_swapfile = &swapfile
+    let b:sev_suda_undofile = &undofile
+    " fix https://github.com/lambdalisue/vim-suda/issues/87
+    setlocal noswapfile
+endfunction
+function s:SudaSettingsRestore()
+    if filereadable(expand('<afile>')[7:])
+        if exists('b:sev_suda_swapfile') && b:sev_suda_swapfile
+            try
+                setlocal swapfile
+            catch
+                " ignore swapfile errors, they should have been shown already
+                echohl ErrorMsg
+                for line in split(v:exception, '\n')
+                    echomsg printf('[suda] %s', line)
+                endfor
+                echohl None
+            endtry
+        endif
+        if exists('b:sev_suda_undofile') && b:sev_suda_undofile
+            setlocal undofile
+        endif
+    endif
+endfunction
+function s:SudaProcessUndo(cmd)
+    let p = expand('<afile>')[7:]
+    if has('win32') || !&undofile || !filereadable(p)
+        return
+    endif
+    let p = resolve(p)
+    " XXX: comments are from :help backupdir to mark implementation details
+    let x = &undodir
+    " For backwards compatibility with Vim version 3.0 a '>' at the start
+    " of the option is removed.
+    if stridx(x, '>') == 0
+        let x = x[1:]
+    endif
+    " To include a comma in a directory name precede it with a backslash.
+    for u in split(x, '\v\\@1<!,')
+        " Spaces after the comma are ignored, other spaces are considered part
+        " of the directory name.
+        let u = trim(u, ' ', 1)
+        " To have a space at the start of a directory name, precede it with a
+        " backslash.
+        if stridx(u, '\ ') == 0
+            let u = u[1:]
+        endif
+        " Empty means that no backup file will be created.
+        if empty(u)
+            continue
+        elseif u == '.'
+            " A directory "." means to put the backup file in the same
+            " directory as the edited file.
+            let d = fnamemodify(p, ':p:h')
+        elseif stridx(u, './') == 0
+            " A directory starting with "./" (or ".\" for MS-Windows) means to
+            " put the backup file relative to where the edited file is.
+            let d = printf('%s%s', fnamemodify(p, ':p:h'), expand(u))
+        else
+            let d = u
+        endif
+        " NOTE: env vars are not expanded, and backslashes are not handled...
+        if u[-2:-1] == '//'
+            let f = fnamemodify(p, ':p:gs?/?%?')
+        else
+            let f = printf('.%s.un~', fnamemodify(p, ':t'))
+        endif
+        " A directory name may end in an '/'.
+        let d = trim(d, '/', 2)
+        if !isdirectory(d)
+            continue
+        endif
+        try
+            execute printf('%s %s/%s', a:cmd, fnameescape(d), fnameescape(f))
+            break
+        catch
+            continue
+        endtry
+    endfor
+endfunction
+autocmd BufReadPre suda://* call s:SudaSettingsSave()
+autocmd BufReadPost suda://* call s:SudaSettingsRestore()
+autocmd BufReadPost suda://* call s:SudaProcessUndo('silent! rundo')
+autocmd BufWritePost suda://* call s:SudaProcessUndo('wundo!')