From 788ffcb3cd6b50f34131fd71c6ba4441aeea8d76 Mon Sep 17 00:00:00 2001
From: acelya <acelya@pm.me>
Date: Mon, 23 Nov 2020 19:36:37 +0100
Subject: [PATCH] Add comment and yank (#138)

---
 doc/commentary.txt    | 11 +++++++++++
 plugin/commentary.vim | 34 ++++++++++++++++++++++++++--------
 2 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/doc/commentary.txt b/doc/commentary.txt
index b53eca7..4cfb12a 100644
--- a/doc/commentary.txt
+++ b/doc/commentary.txt
@@ -18,6 +18,16 @@ gcc                     Comment or uncomment [count] lines.
                                                 *v_gc*
 {Visual}gc              Comment or uncomment the highlighted lines.
 
+                                                *gy*
+gy{motion}              Yank and comment or uncomment lines that {motion}
+                        moves over.
+
+                                                *gyy*
+gyy                     Yank and comment or uncomment [count] lines.
+
+                                                *v_gy*
+{Visual}gy              Yank and comment or uncomment the highlighted lines.
+
                                                 *o_gc*
 gc                      Text object for a comment (operator pending mode
                         only.)
@@ -46,3 +56,4 @@ The |User| CommentaryPost autocommand fires after a successful operation and
 can be used for advanced customization.
 
  vim:tw=78:et:ft=help:norl:
+
diff --git a/plugin/commentary.vim b/plugin/commentary.vim
index 304fbb9..bc09b4f 100644
--- a/plugin/commentary.vim
+++ b/plugin/commentary.vim
@@ -32,17 +32,29 @@ endfunction
 
 function! s:go(...) abort
   if !a:0
-    let &operatorfunc = matchstr(expand('<sfile>'), '[^. ]*$')
+    let &operatorfunc = expand('<SID>') . 'go'
     return 'g@'
-  elseif a:0 > 1
-    let [lnum1, lnum2] = [a:1, a:2]
-  else
-    let [lnum1, lnum2] = [line("'["), line("']")]
   endif
 
+  let [l1, l2] = a:0 > 1 ? [a:1, a:2] : [line("'["), line("']")]
+  call s:apply(l1, l2)
+endfunction
+
+function! s:yank(...) abort
+  if !a:0
+    let &operatorfunc = expand('<SID>') . 'yank'
+    return 'g@'
+  endif
+
+  let [l1, l2] = a:0 > 1 ? [a:1, a:2] : [line("'["), line("']")]
+  execute l1 . ',' . l2 . 'yank' v:register
+  call s:apply(l1, l2)
+endfunction
+
+function! s:apply(lnum1, lnum2) abort
   let [l, r] = commentary#surroundings()
   let uncomment = 2
-  for lnum in range(lnum1,lnum2)
+  for lnum in range(a:lnum1,a:lnum2)
     let line = matchstr(getline(lnum),'\S.*\s\@<!')
     let [l, r] = s:strip_white_space(l,r,line)
     if len(line) && (stridx(line,l) || line[strlen(line)-strlen(r) : -1] != r)
@@ -56,7 +68,7 @@ function! s:go(...) abort
     let indent = '^\s*'
   endif
 
-  for lnum in range(lnum1,lnum2)
+  for lnum in range(a:lnum1,a:lnum2)
     let line = getline(lnum)
     if strlen(r) > 2 && l.r !~# '\\'
       let line = substitute(line,
@@ -66,7 +78,7 @@ function! s:go(...) abort
     if uncomment
       let line = substitute(line,'\S.*\s\@<!','\=submatch(0)[strlen(l):-strlen(r)-1]','')
     else
-      let line = substitute(line,'^\%('.matchstr(getline(lnum1),indent).'\|\s*\)\zs.*\S\@<=','\=l.submatch(0).r','')
+      let line = substitute(line,'^\%('.matchstr(getline(a:lnum1),indent).'\|\s*\)\zs.*\S\@<=','\=l.submatch(0).r','')
     endif
     call setline(lnum,line)
   endfor
@@ -108,12 +120,18 @@ nnoremap <expr>   <Plug>CommentaryLine <SID>go() . '_'
 onoremap <silent> <Plug>Commentary        :<C-U>call <SID>textobject(get(v:, 'operator', '') ==# 'c')<CR>
 nnoremap <silent> <Plug>ChangeCommentary c:<C-U>call <SID>textobject(1)<CR>
 nmap <silent> <Plug>CommentaryUndo :echoerr "Change your <Plug>CommentaryUndo map to <Plug>Commentary<Plug>Commentary"<CR>
+xnoremap <expr> <Plug>(CommentaryYank)     <SID>yank()
+nnoremap <expr> <Plug>(CommentaryYank)     <SID>yank()
+nnoremap <expr> <Plug>(CommentaryYankLine) <SID>yank() . '_'
 
 if !hasmapto('<Plug>Commentary') || maparg('gc','n') ==# ''
   xmap gc  <Plug>Commentary
   nmap gc  <Plug>Commentary
   omap gc  <Plug>Commentary
   nmap gcc <Plug>CommentaryLine
+  xmap gy  <Plug>(CommentaryYank)
+  nmap gy  <Plug>(CommentaryYank)
+  nmap gyy <Plug>(CommentaryYankLine)
   if maparg('c','n') ==# '' && !exists('v:operator')
     nmap cgc <Plug>ChangeCommentary
   endif