From 1bbf319ae5f20f33162aa1f6edd98d7e0237b69d Mon Sep 17 00:00:00 2001
From: Pavel Lutskov <pavel.lutskov@gmail.com>
Date: Wed, 28 Feb 2018 21:18:26 +0100
Subject: [PATCH] behold the COMMENTER

---
 ftplugin/c.vim      |  4 ----
 ftplugin/java.vim   |  4 ----
 ftplugin/python.vim |  5 -----
 ftplugin/tex.vim    |  6 ++---
 ftplugin/vim.vim    |  5 -----
 plugin/comment.vim  | 54 +++++++++++++++++++++++++++++++++++++++++++++
 plugin/settings.vim | 12 +++++++++-
 7 files changed, 68 insertions(+), 22 deletions(-)
 delete mode 100644 ftplugin/python.vim
 create mode 100644 plugin/comment.vim

diff --git a/ftplugin/c.vim b/ftplugin/c.vim
index 78cf857..a500415 100644
--- a/ftplugin/c.vim
+++ b/ftplugin/c.vim
@@ -1,9 +1,5 @@
 iabbrev <buffer> prn printf("\n");
 nnoremap <buffer> <localleader>fb ][%
 nnoremap <buffer> <localleader>fe ][
-nnoremap <buffer> <leader>c mcI//<space><esc>`c:delm c<cr>
-vnoremap <buffer> <leader>c <esc>`>o*/<esc>`<O/*<esc>
-nnoremap <buffer> <leader>xc mx?//<cr>xxx`x:noh<cr>:delm x<cr>
-nnoremap <buffer> <leader>xb mx?\/\*<cr>dd/\*\/<cr>dd`x:noh<cr>:delm x<cr>
 
 setlocal foldmethod=syntax foldlevel=99
diff --git a/ftplugin/java.vim b/ftplugin/java.vim
index 16a8a36..c03d7af 100644
--- a/ftplugin/java.vim
+++ b/ftplugin/java.vim
@@ -1,9 +1,5 @@
 iabbrev <buffer> cout System.out.println
 nnoremap <buffer> <localleader>fb ][%
 nnoremap <buffer> <localleader>fe ][
-nnoremap <buffer> <leader>c mcI//<esc>`c:delm c<cr>
-vnoremap <buffer> <leader>c <esc>`>o*/<esc>`<O/*<esc>
-nnoremap <buffer> <leader>xc mx^xx`x:delm x<cr>
-nnoremap <buffer> <leader>xb mx?\/\*<cr>dd/\*\/<cr>dd`x:noh<cr>:delm x<cr>
 
 setlocal foldmethod=syntax foldlevel=99
diff --git a/ftplugin/python.vim b/ftplugin/python.vim
deleted file mode 100644
index 88974af..0000000
--- a/ftplugin/python.vim
+++ /dev/null
@@ -1,5 +0,0 @@
-nnoremap <buffer> <leader>c mcI#<space><esc>`c:delm x<cr>
-vnoremap <buffer> <leader>c <esc>`>o"""<esc>`<O"""<esc>
-
-nnoremap <buffer> <leader>xb mx?"""<cr>dd/"""<cr>dd`x:noh<cr>:delm x<cr>
-nnoremap <buffer> <leader>xc mx?#<cr>xx`x:noh<cr>:delm x<cr>
diff --git a/ftplugin/tex.vim b/ftplugin/tex.vim
index 77b75a3..beeb76a 100644
--- a/ftplugin/tex.vim
+++ b/ftplugin/tex.vim
@@ -8,6 +8,6 @@ iabbrev <buffer> ssb \subsubsection
 iabbrev <buffer> td \todo
 iabbrev <buffer> mb \mathbf
 
-nnoremap <localleader>lm :Latexmk<cr>
-nnoremap <localleader>lv :LatexView<cr>
-nnoremap <localleader>T :LatexTOC<cr>
+nnoremap <buffer> <localleader>lm :Latexmk<cr>
+nnoremap <buffer> <localleader>lv :LatexView<cr>
+nnoremap <buffer> <localleader>T :LatexTOC<cr>
diff --git a/ftplugin/vim.vim b/ftplugin/vim.vim
index df9e9f7..8f32c9a 100644
--- a/ftplugin/vim.vim
+++ b/ftplugin/vim.vim
@@ -1,6 +1 @@
 setlocal foldmethod=marker foldlevel=0
-nnoremap <buffer> <leader>c mcI"<space><esc>`c:delm c<cr>
-vnoremap <buffer> <leader>c <esc>`>o"}}}<esc>`<O"{{{<esc>
-nnoremap <buffer> <leader>xb
-            \ mx?^"{{{<cr>dd/^"}}}<cr>dd`x:noh<cr>:delm x<cr>
-nnoremap <buffer> <leader>xc mx?"<cr>xx`x:noh<cr>:delm x<cr>
diff --git a/plugin/comment.vim b/plugin/comment.vim
new file mode 100644
index 0000000..9e80a31
--- /dev/null
+++ b/plugin/comment.vim
@@ -0,0 +1,54 @@
+let s:comment_filetype_map = {
+            \ 'c': '\/\/',
+            \ 'cpp': '\/\/',
+            \ 'java': '\/\/',
+            \ 'vhdl': '--',
+            \ 'python': '#',
+            \ 'vim': '"',
+            \ 'tex': '%',
+            \ 'sh': '#'
+            \ }
+
+let s:block_filetype_map = {
+            \ 'c': ['\/\*', '\*\/'],
+            \ 'java': ['\/\*', '\*\/'],
+            \ 'cpp': ['\/\*', '\*\/'],
+            \ 'python': ['"""', '"""'],
+            \ 'vim': ['" {{{', '" }}}']
+            \ }
+
+function! MyCommenter(uncomment) range
+    let comment = get(s:comment_filetype_map, &ft, '')
+    if !len(comment)
+        return
+    endif
+    let search_range = a:firstline . ',' . a:lastline
+    if !a:uncomment
+        execute search_range . 's/\(^\s*\)\(\S\)/\1' . comment . ' \2/e'
+    else
+        execute search_range . 's/\(^\s*\)' . comment . '\s*/\1/e'
+    endif
+    nohl
+endfunction
+
+function! MyBlocker(unblock) range
+    let block = get(s:block_filetype_map, &ft, [])
+    if !len(block)
+        return
+    endif
+    if !a:unblock
+        execute 'normal! ' . a:lastline . 'gg'
+        execute 'normal! o' . substitute(block[1], '\', '', 'g') . "\<esc>"
+        execute 'normal! ' . a:firstline . 'gg'
+        execute 'normal! O' . substitute(block[0], '\', '', 'g') . "\<esc>"
+    else
+        execute 'normal! ?' . block[0] . "\<cr>" . 'dd'
+        execute 'normal! /' . block[1] . "\<cr>" . 'dd'
+    endif
+    noh
+endfunction
+
+command! -range CommenseComment <line1>,<line2>call MyCommenter(0)
+command! -range CommenseUncomment <line1>,<line2>call MyCommenter(1)
+command! -range CommenseBlock <line1>,<line2>call MyBlocker(0)
+command! -range CommenseUnblock <line1>,<line2>call MyBlocker(1)
diff --git a/plugin/settings.vim b/plugin/settings.vim
index 010a39c..45b79b2 100644
--- a/plugin/settings.vim
+++ b/plugin/settings.vim
@@ -50,10 +50,11 @@ set langmenu=en_US.UTF-8
 " {{{
 let g:tagbar_autofocus = 1
 " }}}
-"
+
 " LatexBox stuff
 " {{{
 let g:LatexBox_no_mappings = 1
+let g:LatexBox_quickfix = 2
 let g:LatexBox_build_dir = 'build'
 let g:LatexBox_latexmk_options = '-xelatex -outdir=build'
 " }}}
@@ -121,6 +122,13 @@ else
     let my_settings_file = "$HOME/.vim/plugin/settings.vim"
 endif
 
+nnoremap <leader>c mc:CommenseComment<cr>`c:delm c<cr>
+nnoremap <leader>xc mc:CommenseUncomment<cr>`c:delm c<cr>
+vnoremap <leader>c :CommenseComment<cr>
+vnoremap <leader>xc :CommenseUncomment<cr>
+vnoremap <leader>b :CommenseBlock<cr>
+nnoremap <leader>xb mc:CommenseUnblock<cr>`c:delm c<cr>
+
 nnoremap <leader>sl :tabe $MYVIMRC<cr>
 nnoremap <leader>ss :execute 'tabe' my_settings_file<cr>
 nnoremap <leader>sv :source $MYVIMRC<cr>:execute 'source' my_settings_file<cr>
@@ -135,6 +143,8 @@ nnoremap <leader>fl mf081lF<space>r<cr>`f:delm f<cr>
 
 vnoremap <leader>" <esc>`>a"<esc>`<i"<esc>
 vnoremap <c-c> "+y
+nnoremap <c-v> "+p
+inoremap <c-v> <esc>"+p
 " }}}
 
 " Mappings for Plugins