From: Nicolas Boisselier Date: Mon, 12 Dec 2022 19:21:48 +0000 (+0100) Subject: functions Comment handel default comment /tmp/nico.pm if not exists X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=4e4d16f8031107f5085961071b7fd085683b1f3f;p=nb.git functions Comment handel default comment /tmp/nico.pm if not exists --- diff --git a/etc/vim/source/functions.vim b/etc/vim/source/functions.vim index 80b11f8c..b8259ed0 100644 --- a/etc/vim/source/functions.vim +++ b/etc/vim/source/functions.vim @@ -164,17 +164,20 @@ endfunc func! CommentNewLine() " NB 12.12.22: Create a new line of comment if ( g:mimeComment->get(&filetype) == '0') - return Err('No comment defined for filetype '.&filetype) + let comment = '#' + " NB 12.12.22 return Err('No comment defined for filetype '.&filetype) + else + let comment = g:mimeComment->get(&filetype) endif - let c = split(g:mimeComment[&filetype],'\s\+') - call SubSpecialChar(c) + let comment = split(comment,'\s\+') + call SubSpecialChar(comment) " Beginning of line - let new_line = c[0].' '.MeNow().': foo ' + let new_line = comment[0].' '.MeNow().': foo ' " End of line - if ( len(c)>1 ) - let new_line = new_line . c[1] + if ( len(comment)>1 ) + let new_line = new_line . comment[1] endif exec "normal! o".new_line."\?foo\cw " @@ -185,21 +188,24 @@ endfunc func! CommentToggle() " NB 12.12.22: Toggle current line between commented / not commented if ( g:mimeComment->get(&filetype) == '0') - return Err('No comment defined for filetype '.&filetype) + let comment = '#' + " NB 12.12.22 return Err('No comment defined for filetype '.&filetype) + else + let comment = g:mimeComment->get(&filetype) endif - let curr_line = getline('.') - let c = split(g:mimeComment[&filetype],'\s\+') - " call SubSpecialChar(c) + let comment = split(comment,'\s\+') + " call SubSpecialChar(comment) + let curr_line = getline('.') " " Wipe out existing comment " " Beginning of line - let new_line = substitute(curr_line,'^\([\t ]*\)'.c[0].' [^ ]\+ \d\d\.\d\d\.\d\d ','\1','') + let new_line = substitute(curr_line,'^\([\t ]*\)'.comment[0].' [^ ]\+ \d\d\.\d\d\.\d\d:\? ','\1','') " End of line - if ( len(c)>1 ) - let new_line = substitute(new_line,'\s*'.c[1].'\s*$','','') + if ( len(comment)>1 ) + let new_line = substitute(new_line,'\s*'.comment[1].'\s*$','','') endif if new_line == curr_line @@ -209,10 +215,10 @@ func! CommentToggle() " NB 11.12.22 let v = '' " NB 11.12.22 let v = '' " Beginning of line - let new_line = substitute(curr_line,'^\([\t ]*\)','\1'.c[0].' '.MeNow().' ','') + let new_line = substitute(curr_line,'^\([\t ]*\)','\1'.comment[0].' '.MeNow().' ','') " End of line - if ( len(c)>1 ) - let new_line = substitute(new_line,'\s*$',' '.c[1],'') + if ( len(comment)>1 ) + let new_line = substitute(new_line,'\s*$',' '.comment[1],'') endif " let new_line = substitute(new_line,'\\n',"\n",'') endif