Many improvements

rejects and accepts work in all cases
marks are concealed if possible.

Author: fmoralesc

autoload/criticmarkup.vim

@@ -4,69 +4,90 @@ function! criticmarkup#Init()
 endfunction
 
 function! criticmarkup#InjectHighlighting()
-    syn region criticAddition start=/{++/ end=/++}/ 
-    syn region criticDeletion start=/{--/ end=/--}/
-    syn region criticSubstitutionDeletion start=/{\~\~/ end=/.\(\~>\)\@=/
-    syn region criticSubstitutionAddition start=/\~>/ end=/\~\~}/
-    syn region criticComment start=/{>>/ end=/<<}/
-    syn region criticHighlight start=/{==/ end=/==}/
+    syn region criticAddition matchgroup=criticAdd start=/{++/ end=/++}/ concealends
+    syn region criticDeletion matchgroup=criticDel start=/{--/ end=/--}/ concealends
+    syn region criticSubstitutionDeletion start=/{\~\~/ end=/.\(\~>\)\@=/ keepend
+    syn region criticSubstitutionAddition start=/\~>/ end=/\~\~}/ keepend
+    syn match criticSubstitutionDeletionMark /{\~\~/ contained containedin=criticSubstitutionDeletion conceal
+    syn match criticSubstitutionAdditionMark /\~\~}/ contained containedin=criticSubstitutionAddition conceal
+    syn region criticComment matchgroup=criticMeta start=/{>>/ end=/<<}/ concealends
+    syn region criticHighlight matchgroup=criticHighlighter start=/{==/ end=/==}/ concealends
 
-    hi criticAddition guibg=#00ff00 guifg=#101010
-    hi criticDeletion guibg=#ff0000 guifg=#ffffff
+    hi criticAdd guibg=#00ff00 guifg=#101010
+    hi criticDel guibg=#ff0000 guifg=#ffffff
+    hi link criticAddition criticAdd
+    hi link criticDeletion criticDel
     hi link criticSubstitutionAddition criticAddition
     hi link criticSubstitutionDeletion criticDeletion
-    hi criticComment guibg=#0099FF guifg=#101010
-    hi criticHighlight guibg=#ffff00 guifg=#101010
+    hi link criticSubstitutionAdditionMark criticAddition
+    hi link criticSubstitutionDeletionMark criticDeletion
+    hi criticMeta guibg=#0099FF guifg=#101010
+    hi criticHighlighter guibg=#ffff00 guifg=#101010
+    hi link criticComment criticMeta
+    hi link criticHighlight criticHighlighter
 endfunction
 
 function! criticmarkup#Accept()
     let kind = synIDattr(synID(line("."), col("."), 1), "name")
-    if kind == "criticAddition"
+    if kind =~ "criticAdd"
         call search("{++", "cb")
         normal d3l
         call search("++}", "c")
         normal d3l
-    elseif kind == "criticDeletion"
+    elseif kind =~ "criticDel"
         call search("{--", "cb")
-        "fails at end of line
-        exe "normal d/\\(--}\\)\\@<=\\_.\<cr>"
+        exe "normal v/\\(--\\)\\@<=}\<cr>"
+        normal x
     elseif kind =~ "criticSubstitution"
         call search('{\~\~', "cb")
-        exe "normal d/\\(\\~>\\)\\@<=\\_.\<cr>"
+        exe "normal v/\\~\\@<=>\<cr>"
+        normal x
         call search('\~\~}', "c")
-        exe "normal d/\\(\\~\\~}\\)\\@<=\\_.\<cr>"
+        exe "normal d3l"
     endif
 endfunction
 
 function! criticmarkup#Reject()
     let kind = synIDattr(synID(line("."), col("."), 1), "name")
-    if kind == "criticDeletion"
+    if kind =~ "criticDel"
         call search("{--", "cb")
-        normal df}
-        call search("--}", "c")
-        normal d3l
-    elseif kind == "criticAddition"
+        exe "normal v/\\(--\\)\\@<=}\<cr>"
+        exe "normal :s/{\\=--}\\=//g\<cr>"
+    elseif kind =~ "criticAdd"
         call search("{++", "cb")
-        normal df}
+        exe "normal v/\\(++\\)\\@<=}\<cr>"
+        normal x
     elseif kind =~ "criticSubstitution"
         call search('{\~\~', "cb")
-        normal df>
-        call search('\~\~}', "c")
-        normal df}
+        exe "normal v/.\\(\\~>\\)\\@=\<cr>"
+        exe "normal :s/{\\~\\~//g\<cr>"
+        call search('\~>', "c")
+        exe "normal v/\\(\\~\\~\\)\\@<=}\<cr>"
+        normal x
     endif
 endfunction
 
 function! criticmarkup#Critic(args)
     if a:args =~ "accept"
         call criticmarkup#Accept()
-    elseif a:args =~ "\(reject\|delete\)"
+    elseif a:args =~ "reject"
+        call criticmarkup#Reject()
+    endif
+endfunction
+
+function! criticmarkup#CriticNext()
+    exe "normal /{[-+\\~]\\{2}\<cr>"
+    let op = input("What to do? ", "", "custom,criticmarkup#CriticCompleteFunc")
+    if op =~ "accept"
+        call criticmarkup#Accept()
+    elseif op =~ "reject"
         call criticmarkup#Reject()
     endif
 endfunction
 
 function! criticmarkup#CriticCompleteFunc(a, c, p)
     if len(split(a:c, " ", 1)) < 3
-        return "accept\nreject\ndelete"
+        return "accept\nreject"
     else
         return ""
     endif