From cfb8aac7505e4349918fc27ae1f04ea3ddb08b16 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Tue, 8 May 2018 18:28:55 +0100 Subject: [PATCH] etc/vim/source/map.vim --- etc/vim/source/functions.vim | 48 +++++++++++++++++------------------- etc/vim/source/map.vim | 5 ++++ 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/etc/vim/source/functions.vim b/etc/vim/source/functions.vim index 5fe4e287..8ba7f98e 100644 --- a/etc/vim/source/functions.vim +++ b/etc/vim/source/functions.vim @@ -19,25 +19,25 @@ let $USER_INITIALS = system('printf "%s" ${USER_INITIALS:-`whoami`}') let $FileInit = '' func! FileInit(...) - " One load per file - let CurrentFile = expand('%:p') - if $FileInit == CurrentFile - return - endif - let $FileInit = CurrentFile - call Debug('FileInit()') + " One load per file + let CurrentFile = expand('%:p') + if $FileInit == CurrentFile + return + endif + let $FileInit = CurrentFile + call Debug('FileInit()') - let bashenv = $BASH_ENV - let $BASH_ENV = "" + let bashenv = $BASH_ENV + let $BASH_ENV = "" let g:File['path'] = expand('%:p') let g:File['ext'] = expand('%:e') - let g:File['type'] = &filetype + let g:File['type'] = &filetype " Comment char - NB 20.08.12 let g:File['c'] = '#' let g:File['cEnd'] = '' - let g:File['me_now'] = $USER_INITIALS . ' ' . strftime('%d.%m.%y') + let g:File['me_now'] = $USER_INITIALS . ' ' . strftime('%d.%m.%y') if (g:File['type'] == 'vim') || (g:File['type'] == 'vimrc') let g:File['c'] = '"' @@ -45,6 +45,9 @@ func! FileInit(...) elseif (g:File['type'] == 'javascript' || g:File['type'] == 'c' || g:File['ext'] == 'json') let g:File['c'] = '//' + elseif (g:File['ext'] == 'lua') + let g:File['c'] = '--' + elseif (g:File['type'] == 'php') let g:File['c'] = '#' @@ -84,9 +87,9 @@ func! FileInit(...) elseif (g:File['type'] == 'javascript' || g:File['ext'] == 'json') let g:File['check'] = "ruby -rjson -e 'puts JSON.parse(File.read(ARGV[0]))'" - if (filereadable('/usr/local/bin/node')) - let g:File['check'] = "/usr/local/bin/node --check" - end + if (filereadable('/usr/local/bin/node')) + let g:File['check'] = "/usr/local/bin/node --check" + end elseif (g:File['ext'] == 'erb') let g:File['check'] = g:mimeCheck['erb'] @@ -105,7 +108,7 @@ func! FileInit(...) endif - let $BASH_ENV = bashenv + let $BASH_ENV = bashenv return "g:File: <".string(g:File).">" endfunc @@ -115,7 +118,7 @@ func! FileGet(...) let ret = [] - for o in a:000 | call add(ret,g:File[o]) | endfor + for o in a:000 | call add(ret,g:File[o]) | endfor return join(ret,' ') endfunc @@ -124,16 +127,16 @@ func! FileCheck() call FileInit() - if g:File['check'] == '' + if g:File['check'] == '' echo "FileCheck: Unknow file type".g:File['type'] return endif let cmd = g:File['check'].' '.g:File['path'] - let bashenv = $BASH_ENV - let $BASH_ENV = "" + let bashenv = $BASH_ENV + let $BASH_ENV = "" exec '!'.cmd - let $BASH_ENV = bashenv + let $BASH_ENV = bashenv return cmd endfunc @@ -144,7 +147,6 @@ func! FileCommentToggle() let c = FileGet('c','me_now').' ' let exp = '^'.substitute(c,'\d\d\.\d\d\.\d\d','........','') -" NB 13.02.14 let exp = '^'.substitute(c,'\d\d','..','') let new_line = substitute(curr_line,exp,'','') if new_line == curr_line @@ -153,10 +155,6 @@ func! FileCommentToggle() call setline('.',new_line) endif - " call setline('.',c) - " let new_line = '" ZAZA ' . curr_line - " call setline('.', new_line) - " call setline('.','" ZAZA') endfunc """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" diff --git a/etc/vim/source/map.vim b/etc/vim/source/map.vim index 0cfaf495..a4765704 100644 --- a/etc/vim/source/map.vim +++ b/etc/vim/source/map.vim @@ -18,3 +18,8 @@ map :bn map :bp +""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" F5 - Comment +" map o=FileGet('c').' '.$USER_INITIALS.': '.strftime('%d.%m.%y').': foo '.FileGet('cEnd')?foocw +map o=FileGet('c').' '.FileGet('me_now').': foo '.FileGet('cEnd')?foocw +vmap :call FileCommentToggle() -- 2.47.3