Przeglądaj źródła

Swap `tabular` for `vim-easy-align`

Easier plugin to use for text alignment. Has sane defaults.
Weiyi Lou 10 lat temu
rodzic
commit
d6e055f726
3 zmienionych plików z 8 dodań i 19 usunięć
  1. 3 2
      vim/plugins.vim
  2. 5 0
      vim/settings/alignment.vim
  3. 0 17
      vim/settings/tabular.vim

+ 3 - 2
vim/plugins.vim

@@ -13,18 +13,19 @@ call plug#begin('~/.vim/plugged')
 " General {{{
 Plug 'Raimondi/delimitMate'
 Plug 'dkprice/vim-easygrep'
-Plug 'godlygeek/tabular'
 Plug 'haya14busa/vim-asterisk'
 Plug 'joonty/vdebug'
+Plug 'junegunn/vim-easy-align'
 Plug 'matchit.zip'
-Plug 'scrooloose/nerdcommenter'
 Plug 'mbbill/undotree'
+Plug 'scrooloose/nerdcommenter'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'tpope/vim-endwise'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-repeat'
 Plug 'vim-pandoc/vim-pandoc'
 Plug 'vim-pandoc/vim-pandoc-syntax'
+Plug 'vim-scripts/visualrepeat'
 " }}}
 
 " Visual {{{

+ 5 - 0
vim/settings/alignment.vim

@@ -0,0 +1,5 @@
+" Start interactive EasyAlign in visual mode (e.g. vip<Enter>)
+vmap <Enter> <Plug>(EasyAlign)
+
+" Start interactive EasyAlign for a motion/text object (e.g. gaip)
+nmap ga <Plug>(EasyAlign)

+ 0 - 17
vim/settings/tabular.vim

@@ -1,17 +0,0 @@
-nmap <Leader>a= :Tabularize /=<CR>
-vmap <Leader>a= :Tabularize /=<CR>
-nmap <Leader>a: :Tabularize /:\zs<CR>
-vmap <Leader>a: :Tabularize /:\zs<CR>
-
-inoremap <silent> <Bar>   <Bar><Esc>:call <SID>align()<CR>a
-
-function! s:align()
-  let p = '^\s*|\s.*\s|\s*$'
-  if exists(':Tabularize') && getline('.') =~# '^\s*|' && (getline(line('.')-1) =~# p || getline(line('.')+1) =~# p)
-    let column = strlen(substitute(getline('.')[0:col('.')],'[^|]','','g'))
-    let position = strlen(matchstr(getline('.')[0:col('.')],'.*|\s*\zs.*'))
-    Tabularize/|/l1
-    normal! 0
-    call search(repeat('[^|]*|',column).'\s\{-\}'.repeat('.',position),'ce',line('.'))
-  endif
-endfunction