commit 940cdc4f9b750c4e15787bf8ad71068498c914d3 parent 04d439fca502f8b2bcafbf1a5cb0806963915cc7 Author: Ed van Bruggen <edvb54@gmail.com> Date: Thu, 17 Aug 2017 22:05:45 -0700 vim: Update plugins Diffstat:
28 files changed, 32 insertions(+), 171 deletions(-)
diff --git a/vim/bundle/Vundle.vim b/vim/bundle/Vundle.vim @@ -1 +1 @@ -Subproject commit 88688fe453038ac1ac26e31646cfbec50fca2fb7 +Subproject commit 6437ad6df4a3e6a87c5fb8bd2b8aadb277ec9c87 diff --git a/vim/bundle/bufstop b/vim/bundle/bufstop @@ -1 +1 @@ -Subproject commit 9274df466161c121463c55206babc0c416453c26 +Subproject commit edf8567b518dfcfdff3d3b9d9d03ad0847cb079a diff --git a/vim/bundle/catium.vim b/vim/bundle/catium.vim @@ -1 +1 @@ -Subproject commit 072644246772a100beba2f0b7a89cb96e1033917 +Subproject commit a7f2750a9ad9416b38fbf50933ae1dc20d11c9d6 diff --git a/vim/bundle/neocomplete.vim b/vim/bundle/neocomplete.vim @@ -1 +1 @@ -Subproject commit 9617d825c0d4acdb18aec903e9c1c0443058d18b +Subproject commit ab92d74050412614eaabc396e88463bb431715be diff --git a/vim/bundle/rainbow/README.md b/vim/bundle/rainbow/README.md @@ -21,7 +21,7 @@ You can also find this plugin in **[www.vim.org](http://www.vim.org/scripts/scri - separately edit guifgs and ctermfgs (the colors used for highlighting). - now you can design your own parentheses such as 'begin' and 'end'. - you can also configure anything separately for different types of files. -- now you can even decide to let some operators (like + - * / , ==) hilighted with the parentheses together. +- now you can even decide to let some operators (like + - * / , ==) highlighted with the parentheses together. - json style configuration used, more understandable and readable, easier for advanced configuration. - the code is shorter and easier to read now. - smoother and faster. diff --git a/vim/bundle/rainbow/plugin/rainbow.vim b/vim/bundle/rainbow/plugin/rainbow.vim @@ -1,8 +1,8 @@ "============================================================================== "Script Title: rainbow parentheses improved -"Script Version: 3.4.0 +"Script Version: 3.4.1 "Author: luochen1990 -"Last Edited: 2015 Nov 19 +"Last Edited: 2017/04/21 "Simple Configuration: " first, put "rainbow.vim"(this file) to dir vimfiles/plugin or vim73/plugin " second, add the follow sentences to your .vimrc or _vimrc : @@ -51,6 +51,9 @@ let s:rainbow_conf = { \ 'parentheses': ['start=/\v\<((area|base|br|col|embed|hr|img|input|keygen|link|menuitem|meta|param|source|track|wbr)[ >])@!\z([-_:a-zA-Z0-9]+)(\s+[-_:a-zA-Z0-9]+(\=("[^"]*"|'."'".'[^'."'".']*'."'".'|[^ '."'".'"><=`]*))?)*\>/ end=#</\z1># fold', 'start=/(/ end=/)/ containedin=@htmlPreproc contains=@phpClTop', 'start=/\[/ end=/\]/ containedin=@htmlPreproc contains=@phpClTop', 'start=/{/ end=/}/ containedin=@htmlPreproc contains=@phpClTop'], \ }, \ 'css': 0, +\ 'sh': { +\ 'parentheses': [['\(^\|\s\)\S*()\s*{\?\($\|\s\)','_^{_','}'], ['\(^\|\s\)if\($\|\s\)','_\(^\|\s\)\(then\|else\|elif\)\($\|\s\)_','\(^\|\s\)fi\($\|\s\)'], ['\(^\|\s\)for\($\|\s\)','_\(^\|\s\)\(do\|in\)\($\|\s\)_','\(^\|\s\)done\($\|\s\)'], ['\(^\|\s\)while\($\|\s\)','_\(^\|\s\)\(do\)\($\|\s\)_','\(^\|\s\)done\($\|\s\)'], ['\(^\|\s\)case\($\|\s\)','_\(^\|\s\)\(\S*)\|in\|;;\)\($\|\s\)_','\(^\|\s\)esac\($\|\s\)']], +\ }, \ } \} @@ -171,7 +174,7 @@ func rainbow#hook() endfunc command! RainbowToggle call rainbow#toggle() -command! RainbowToggleOn call rainbow#load() +command! RainbowToggleOn call rainbow#hook() command! RainbowToggleOff call rainbow#clear() if (exists('g:rainbow_active') && g:rainbow_active) diff --git a/vim/bundle/vim-commentary b/vim/bundle/vim-commentary @@ -1 +1 @@ -Subproject commit 73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 +Subproject commit be79030b3e8c0ee3c5f45b4333919e4830531e80 diff --git a/vim/bundle/vim-cursorword b/vim/bundle/vim-cursorword @@ -1 +1 @@ -Subproject commit db84a181cfe616f5e15bef6e1a87635f17149765 +Subproject commit 1d95d8056eebb2d32cf4de888f52a76f1555374c diff --git a/vim/bundle/vim-easy-align b/vim/bundle/vim-easy-align @@ -1 +0,0 @@ -Subproject commit 3b395bd5bafbdfb1f93190fa3f259b7ad2e40eb9 diff --git a/vim/bundle/vim-endwise b/vim/bundle/vim-endwise @@ -1 +1 @@ -Subproject commit 0067ceda37725d01b7bd5bf249d63b1b5d4e2ab4 +Subproject commit d5655263af8b3611a2bcb907a9963831a88d154b diff --git a/vim/bundle/vim-eunuch b/vim/bundle/vim-eunuch @@ -0,0 +1 @@ +Subproject commit b536b887072ff3cc382842ce9f675ec222302f4f diff --git a/vim/bundle/vim-fugitive b/vim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit f44845e4408aae03e018e98afb7fbf0c2ee87dd5 +Subproject commit 913fff1cea3aa1a08a360a494fa05555e59147f5 diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit 5d1a0bfa1bd2b8d8a77fff09d13394e5abbc6143 +Subproject commit dc73a81bfe59a9de090b89a1312ded3c6f6a6f89 diff --git a/vim/bundle/vim-grepper b/vim/bundle/vim-grepper @@ -1 +1 @@ -Subproject commit df7e3101cbdd6ff0c5fd2d6b017b488345bf8da7 +Subproject commit c12ea4d2234d561e0588061e710ef60faf9b5795 diff --git a/vim/bundle/vim-lion b/vim/bundle/vim-lion @@ -0,0 +1 @@ +Subproject commit 08d5e714e87305c4b42f17db373af8244293e423 diff --git a/vim/bundle/vim-polyglot b/vim/bundle/vim-polyglot @@ -1 +1 @@ -Subproject commit fbeb019a8516939bd904983ddc341e65c2ea19cb +Subproject commit 8eab5f5403afc1c33a7593459a27f7ff625fa60b diff --git a/vim/bundle/vim-renamer b/vim/bundle/vim-renamer @@ -0,0 +1 @@ +Subproject commit ac50547f96bbd734a2331cee9f4695488d2e11f5 diff --git a/vim/bundle/vim-repeat b/vim/bundle/vim-repeat @@ -1 +1 @@ -Subproject commit 7a6675f092842c8f81e71d5345bd7cdbf3759415 +Subproject commit 070ee903245999b2b79f7386631ffd29ce9b8e9f diff --git a/vim/bundle/vim-signature b/vim/bundle/vim-signature @@ -1 +1 @@ -Subproject commit 7e13913188809c45e14988270213744d1c3bb485 +Subproject commit d467b037034033f7b041cc4706c3dd20a784f6fd diff --git a/vim/bundle/vim-sleuth b/vim/bundle/vim-sleuth @@ -1 +1 @@ -Subproject commit 62c4f261874dd44e6cdc6788b4a6bc59f9dfe746 +Subproject commit dfe0a33253c61dd8fac455baea4ec492e6cf0fe3 diff --git a/vim/bundle/vim-tmux-navigator b/vim/bundle/vim-tmux-navigator @@ -1 +1 @@ -Subproject commit 1b24c5a4626e5a0032920cd44d118086aa0305cd +Subproject commit d724094e7128acd7375cc758008f1e1688130877 diff --git a/vim/bundle/vim-unimpaired b/vim/bundle/vim-unimpaired @@ -1 +1 @@ -Subproject commit 11dc568dbfd7a56866a4354c737515769f08e9fe +Subproject commit 3a7759075cca5b0dc29ce81f2747489b6c8e36a7 diff --git a/vim/bundle/vim-vinegar/CONTRIBUTING.markdown b/vim/bundle/vim-vinegar/CONTRIBUTING.markdown @@ -1 +0,0 @@ -See the [contribution guidelines for pathogen.vim](https://github.com/tpope/vim-pathogen/blob/master/CONTRIBUTING.markdown). diff --git a/vim/bundle/vim-vinegar/README.markdown b/vim/bundle/vim-vinegar/README.markdown @@ -1,50 +0,0 @@ -# vinegar.vim - -> Split windows and the project drawer go together like oil and vinegar. I -> don't mean to say that you can combine them to create a delicious salad -> dressing. I mean that they don't mix well! -> - Drew Neil - -You know what netrw is, right? The built in directory browser? Well, -vinegar.vim enhances netrw, partially in an attempt to mitigate the need for -more disruptive ["project drawer"][Oil and vinegar] style plugins. - -[Oil and vinegar]: http://vimcasts.org/blog/2013/01/oil-and-vinegar-split-windows-and-project-drawer/ - -Some of the behaviors added by vinegar.vim would make excellent upstream -additions. Many, the author would probably reject. Others are a bit too wild -to even consider. - -* Press `-` in any buffer to hop up to the directory listing and seek to the - file you just came from. Keep bouncing to go up, up, up. Having rapid - directory access available changes everything. -* All that annoying crap at the top is turned off, leaving you with nothing - but a list of files. This is surprisingly disorienting, but ultimately - very liberating. Press `I` to toggle until you adapt. -* The oddly C-biased default sort order is replaced with a sensible application - of `'suffixes'`. -* File hiding: files are not listed that match with one of the patterns in - `'wildignore'`. - If you put `let g:netrw_list_hide = '\(^\|\s\s\)\zs\.\S\+'` - in your vimrc, vinegar will initialize with dot files hidden. - Press `gh` to toggle dot file hiding. -* Press `.` on a file to pre-populate it at the end of a `:` command line. - This is great, for example, to quickly initiate a `:grep` of the file or - directory under the cursor. There's also `!`, which starts the line off - with a bang. Type `!chmod +x` and get `:!chmod +x path/to/file`. -* Press `cg` or `cl` to `:cd` or `:lcd` to the currently edited directory. -* Press `~` to go home. - -## Installation - -If you don't have a preferred installation method, I recommend -installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and -then simply copy and paste: - - cd ~/.vim/bundle - git clone git://github.com/tpope/vim-vinegar.git - -## License - -Copyright © Tim Pope. Distributed under the same terms as Vim itself. -See `:help license`. diff --git a/vim/bundle/vim-vinegar/plugin/vinegar.vim b/vim/bundle/vim-vinegar/plugin/vinegar.vim @@ -1,96 +0,0 @@ -" vinegar.vim - combine with netrw to create a delicious salad dressing -" Maintainer: Tim Pope <http://tpo.pe/> - -if exists("g:loaded_vinegar") || v:version < 700 || &cp - finish -endif -let g:loaded_vinegar = 1 - -function! s:fnameescape(file) abort - if exists('*fnameescape') - return fnameescape(a:file) - else - return escape(a:file," \t\n*?[{`$\\%#'\"|!<") - endif -endfunction - -let s:dotfiles = '\(^\|\s\s\)\zs\.\S\+' - -let g:netrw_sort_sequence = '[\/]$,*,\%(' . join(map(split(&suffixes, ','), 'escape(v:val, ".*$~")'), '\|') . '\)[*@]\=$' -let s:escape = 'substitute(escape(v:val, ".$~"), "*", ".*", "g")' -let g:netrw_list_hide = - \ join(map(split(&wildignore, ','), '"^".' . s:escape . '. "$"'), ',') . ',^\.\.\=/\=$' . - \ (get(g:, 'netrw_list_hide', '')[-strlen(s:dotfiles)-1:-1] ==# s:dotfiles ? ','.s:dotfiles : '') -if !exists("g:netrw_banner") - let g:netrw_banner = 0 -endif -let s:netrw_up = '' - -nnoremap <silent> <Plug>VinegarUp :call <SID>opendir('edit')<CR> -if empty(maparg('-', 'n')) - nmap - <Plug>VinegarUp -endif - -nnoremap <silent> <Plug>VinegarTabUp :call <SID>opendir('tabedit')<CR> -nnoremap <silent> <Plug>VinegarSplitUp :call <SID>opendir('split')<CR> -nnoremap <silent> <Plug>VinegarVerticalSplitUp :call <SID>opendir('vsplit')<CR> - -function! s:opendir(cmd) abort - let df = ','.s:dotfiles - if expand('%:t')[0] ==# '.' && g:netrw_list_hide[-strlen(df):-1] ==# df - let g:netrw_list_hide = g:netrw_list_hide[0 : -strlen(df)-1] - endif - if &filetype ==# 'netrw' - let currdir = fnamemodify(b:netrw_curdir, ':t') - execute s:netrw_up - call s:seek(currdir) - elseif expand('%') =~# '^$\|^term:[\/][\/]' - execute a:cmd '.' - else - execute a:cmd '%:h/' - call s:seek(expand('#:t')) - endif -endfunction - -function! s:seek(file) abort - if get(b:, 'netrw_liststyle') == 2 - let pattern = '\%(^\|\s\+\)\zs'.escape(a:file, '.*[]~\').'[/*|@=]\=\%($\|\s\+\)' - else - let pattern = '^\%(| \)*'.escape(a:file, '.*[]~\').'[/*|@=]\=\%($\|\t\)' - endif - call search(pattern, 'wc') - return pattern -endfunction - -augroup vinegar - autocmd! - autocmd FileType netrw call s:setup_vinegar() -augroup END - -function! s:escaped(first, last) abort - let files = getline(a:first, a:last) - call filter(files, 'v:val !~# "^\" "') - call map(files, 'substitute(v:val, "[/*|@=]\\=\\%(\\t.*\\)\\=$", "", "")') - return join(map(files, 'fnamemodify(b:netrw_curdir."/".v:val,":~:.")'), ' ') -endfunction - -function! s:setup_vinegar() abort - if empty(s:netrw_up) - " save netrw mapping - let s:netrw_up = substitute(maparg('-', 'n'), '\c^:\%(<c-u>\)\=', '', '') - " saved string is like this: - " :exe "norm! 0"|call netrw#LocalBrowseCheck(<SNR>172_NetrwBrowseChgDir(1,'../'))<CR> - " remove <CR> at the end (otherwise raises "E488: Trailing characters") - let s:netrw_up = strpart(s:netrw_up, 0, strlen(s:netrw_up)-4) - endif - nmap <buffer> - <Plug>VinegarUp - nnoremap <buffer> ~ :edit ~/<CR> - nnoremap <buffer> . :<C-U> <C-R>=<SID>escaped(line('.'), line('.') - 1 + v:count1)<CR><Home> - xnoremap <buffer> . <Esc>: <C-R>=<SID>escaped(line("'<"), line("'>"))<CR><Home> - nmap <buffer> ! .! - xmap <buffer> ! .! - nnoremap <buffer> <silent> cg :exe 'keepjumps cd ' .<SID>fnameescape(b:netrw_curdir)<CR> - nnoremap <buffer> <silent> cl :exe 'keepjumps lcd '.<SID>fnameescape(b:netrw_curdir)<CR> - exe 'syn match netrwSuffixes =\%(\S\+ \)*\S\+\%('.join(map(split(&suffixes, ','), s:escape), '\|') . '\)[*@]\=\S\@!=' - hi def link netrwSuffixes SpecialKey -endfunction diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add @@ -35,3 +35,6 @@ now num Bruggen zlib +Lua +lua +eg diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl Binary files differ. diff --git a/vimrc.bundles b/vimrc.bundles @@ -28,10 +28,10 @@ Bundle 'tpope/vim-sleuth' Bundle 'tpope/vim-surround' " change options with co or [o and ]o Bundle 'tpope/vim-unimpaired' -" improve netrw file explorer -Bundle 'tpope/vim-vinegar' " readline in insert mode Bundle 'tpope/vim-rsi' +" unix commands in vim +Bundle 'tpope/vim-eunuch' """ language specific plug-ins " syntax checker @@ -77,7 +77,7 @@ Bundle 'itchyny/vim-cursorword' """ others " easily align text by characters -Bundle 'junegunn/vim-easy-align' +Bundle 'tommcdo/vim-lion' " use s and S to move through line Bundle 'jayflo/vim-skip' " increase or decrease select region automatically