From 91caaec00bf1bee95e1ba36a3c9377eb8aadd1d2 Mon Sep 17 00:00:00 2001 From: Stefan Imhoff Date: Sun, 12 Dec 2021 16:58:42 +0100 Subject: [PATCH] chore(vim): move tabular function into plugin configuration file --- nvim/after/plugin/tabular.vim | 15 +++++++++++++++ nvim/functions.vim | 14 -------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/nvim/after/plugin/tabular.vim b/nvim/after/plugin/tabular.vim index 8947d72..97b091e 100644 --- a/nvim/after/plugin/tabular.vim +++ b/nvim/after/plugin/tabular.vim @@ -4,3 +4,18 @@ AddTabularPattern! equals /^[^=]*\zs=/ AddTabularPattern! ruby_hash /^[^=>]*\zs=>/ AddTabularPattern! commas /,\s*\zs\s/l0 AddTabularPattern! colons /^[^:]*:\s*\zs\s/l0 + +" Mappings +inoremap :call align()a + +" Automatic Tabular.vim with the (|) +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 diff --git a/nvim/functions.vim b/nvim/functions.vim index bdff81b..d6d9794 100644 --- a/nvim/functions.vim +++ b/nvim/functions.vim @@ -33,17 +33,3 @@ function! ToggleColorColumn() set textwidth=80 endif endfunction - -" Automatic Tabular.vim with the (|) -inoremap :call align()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