Add support for repeat.vim

Author: bergercookie

README.md

@@ -1,8 +1,5 @@
 # vim-debugstring
 
-[![Project status][badge-status]][vimscripts]
-[![Current release][badge-release]][releases]
-[![Open issues][badge-issues]][issues]
 
 ```
      _      _                     _        _
@@ -42,6 +39,12 @@ Currently the following languages are supported:
 - Shell
 - Vim
 
+### Features
+
+
+- Support for [vim-repeat](https://github.com/tpope/vim-repeat). No
+    need for repeat the same mapping, or rewrite the lengthy expression that you
+    want to monitor, just use the `.` character
 
 For a more detailed outline of `debugstring` check
 [doc/debugstring.txt](https://github.com/bergercookie/vim-debugstring/blob/master/doc/debugstring.txt)
@@ -65,6 +68,12 @@ Default mapping is: `<Leader>ds`
 
 ## Installation
 
+### Dependencies
+
+debugstring depends on the following vim plugins:
+
+- vim-repeat
+
 ### Using a runtimepath/package manager
 
 I would personally recommend using [Pathogen](https://github.com/tpope/vim-pathogen/) for
@@ -74,10 +83,9 @@ please raise an
 [issue](https://github.com/bergercookie/vim-debugstring/issues) on Github)
 
 ```bash
+git clone https://github.com/tpope/vim-repeat ~/.vim/bundle/vim-repeat
 git clone https://github.com/bergercookie/vim-debustring.git ~/.vim/bundle/vim-debugstring
 
-# If you're using submodules to handle your vim-dotfiles:
-cd $BUNDLE; git submodule add https://github.com/bergercookie/vim-debustring.git
 ```
 
 ### Manual installation
@@ -111,7 +119,7 @@ vim.org](https://vim.sourceforge.io/scripts/script.php?script_id=5634)
 - [ ] Make the counter buffer-specific
 - [ ] Escape double single quotes vimscript variable printing
 - [ ] Append to current line if that is empty
-- [ ] Support repeat.vim
-
+- [x] Support repeat.vim
+- [ ] Use an assertion module
 
 

plugin/debugstring.vim

@@ -64,6 +64,12 @@ let s:save_cpo = &cpoptions
 set cpoptions&vim
 " }}}
 "
+
+""
+" Available modes - to be used with the debugFunctionWrapper method
+"@setting debugging_modes
+"
+"
 let s:modes = {
             \ 'std_debug': 0,
             \ 'var_debug': 1,
@@ -75,10 +81,14 @@ let g:debugStringCounterStep = 1
 
 " By default debugging lines should be of the form <directive_to_print> " <prefix_string><debug_number>
 function! g:DebugstringPrefixStr()
-  let l:debug_str =
-        \ '[' . fnamemodify(bufname('%'), ':t') .
-        \ ':' .  getcurpos()[1] .
-        \ '] DEBUGGING STRING ==> '
+  let l:debug_str = '[' . fnamemodify(bufname('%'), ':t') . ':'
+  if getline('.') =~# "^$" " Empty line
+      let l:debug_str .= getcurpos()[1]
+  else
+      let l:debug_str .= string(str2nr(getcurpos()[1]) + 1)
+  endif
+  let l:debug_str .= '] DEBUGGING STRING ==> '
+
   return l:debug_str
 endfunc
 
@@ -122,7 +132,14 @@ let g:debugstringAlwaysIncludeHeader = 0 " Include Header in place?
 " Wrapper around the low-level debug* methods.
 " It also takes care of incrementing the g:debugCounter
 "
-function! s:debugFunctionWrapper(mode)
+" {mode} refers to the type of debugging that is to be done. See
+" @setting(debugging_modes) for the available modes
+"
+" If an additional argument is provided it will be used as the expression - This
+" additional argument implies that the debugging mode is 'var_debug'
+"
+"
+function! s:debugFunctionWrapper(mode, ...)
     let l:prev_pos = getcurpos()
 
     let l:append_at_same_line = 0
@@ -137,21 +154,32 @@ function! s:debugFunctionWrapper(mode)
         endif
 
         AddDebugString
+        call repeat#set("\<Plug>DumpDebugString")
 
     elseif a:mode ==# s:modes['var_debug']
         if !exists(':AddDebugStringExpr')
             echoerr "Command AddDebugStringExpr isn't implemented for filetype \"" . &filetype . "\""
             return 0
         endif
-        let l:expr = input("Input Expression: ")
+        let l:expr = ""
+        if len(a:000) ==# 0
+            let l:expr = input("Input Expression: ")
+        else
+            let l:expr = a:1
+        endif
+
         AddDebugStringExpr(l:expr)
+
+        " Make way for repeat.vim
+        execute 'nnoremap <silent> <Plug>DumpDebugStringSpecExpr :<C-U> :call <SID>debugFunctionWrapper(1, "' . l:expr . '")<CR>'
+        call repeat#set("\<Plug>DumpDebugStringSpecExpr")
     else
         echoerr 's:debugFunctionWrapper - Unknown mode: ' a:mode
         return 0
     endif
 
     " correct indentation level
-    " normal ==
+    normal ==
 
     call s:incrDebugCounter() " increase the counter