dotfiles

commit 6132967b0f8dc3e95c318f18e474406afa10d9d8
parent 0fb5c8034907ac299a990ebbcb46b9479bbf1262
Author: Daniel Moch <daniel@danielmoch.com>
Date:   Sat,  4 Aug 2018 17:00:26 -0400

Vimrc: Handle {s,m,e}O comment tags in MySkeleton

Iterative learning is fun and all, but hopefully this is the last
MySkeleton update for a while

Diffstat:
M
.vim/after/ftplugin/java.vim
 | 
2
+-
M
.vim/vimrc
 | 
6
++++--

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.vim/after/ftplugin/java.vim b/.vim/after/ftplugin/java.vim
@@ -11,4 +11,4 @@ compiler javac
 
 execute InitializeClasspath() | execute BuildJavaMakeprg()
 
-let &comments='sr:/*,mb:*,ex:*/,b://'
+let &comments='sO:* -,mO:*  ,exO:*/,sr:/*,mb:*,ex:*/,b://'
diff --git a/.vim/vimrc b/.vim/vimrc
@@ -132,7 +132,7 @@ function! MySkeleton()
     let l:lastcomment = ''
     let l:space = ''
     for l:token in l:comments
-        if l:token =~ '^s'
+        if l:token =~ '^s[^O]'
             let l:firstcomment = substitute(l:token, '^s.\+:', '', '')
             let l:comment = substitute(l:comments[l:idx + 1], '^m.\+:', '', '')
             if l:token =~ '^sr'
@@ -142,14 +142,16 @@ function! MySkeleton()
             endif
             let l:lastcomment = substitute(l:comments[l:idx + 2], '^e.\+:', '', '')
             let l:space = (l:comments[l:idx + 1] =~ '^mb') ? ' ' : ''
+            break
         elseif l:token =~ '^b\?:'
             let l:comment = substitute(l:token, '^b\?:', '', '')
             let l:firstcomment = l:comment
             let l:lastcomment = l:comment
             let l:rightalign = v:false
             let l:space = (l:token =~ '^b') ? ' ' : ''
+            break
         endif
-        break
+        let l:idx += 1
     endfor
     let l:idx = 0
     for l:line in l:skel