Do correct the mapping

Author: bergercookie

.travis.yml

@@ -5,5 +5,4 @@ before_script: |
   git clone https://github.com/tpope/vim-repeat.git
 
 script:
-  # Will return 1 in case of errors - 0 otherwise
-  vim -Nu test/vimrc -c 'Vader! test/*'
+  ./test/run-tests.sh

README.md

@@ -149,7 +149,8 @@ this or other vim plugins
 * Use [vimdoc](https://github.com/google/vimdoc) to generate documentation from
     the `vim` docstring (instead of manually updating the .txt file). See the
     misc/build_doc for more on how this is done.
-* Use [vader](https://github.com/junegunn/vader.vim) for unittesting.
+* Use [vader](https://github.com/junegunn/vader.vim) for unittesting. Use
+    `test/run-tests.sh` to run them.
 
 
 ## TODO
@@ -158,14 +159,15 @@ this or other vim plugins
 - [ ] Method to delete all the debugging strings in current buffer
 - [x] Method to print name and contents of a variable
 - [ ] Add option for variable debugging in rest of langs
-- [ ] Make the counter buffer-specific
+- ~[ ]Make the counter buffer-specific~ Nope, we already have the filename &
+    line for file-specific text
 - [ ] Escape double single quotes vimscript variable printing
 - [x] Append to current line if that is empty
 - [x] Support repeat.vim
 - [ ] Use an assertion module
 - [x] Use vader.vim for TDD
 - [ ] Extend vader support for rest of languages
-- [ ] Use travis for CI
+- [x] Use travis for CI
 - [x] Bug with changing the filename of the current file
 - [x] Make vim-repeat dependency optional
 - [x] Turn supported languages into a table - what do we support in which

doc/debugstring.txt

@@ -29,13 +29,16 @@ logging statements around the various code snippets that you want to test.
 The form and syntax of the logging statements target the language at hand
 (e.g., use printf() in C/C++ but puts() in Ruby)
 
+vim-debugstring should be compatible with Vim >= 7.4.313
+
+
 ==============================================================================
 CONFIGURATION                                             *debugstring-config*
 
 To add a logging statement either use the default normal mode mapping
 (|g:default_dump_debug_map|) or define your own:
 
-  * nmap <your-key-combination> <Plug>DumpDebugString
+  * nmap <your-key-combination> <Plug>DumpDebugStringVar
 
   * nmap <a-second-key-combination> <Plug>DumpDebugStringExpr
 

plugin/debugstring.vim

@@ -25,7 +25,7 @@
 " To add a logging statement either use the default normal mode mapping
 " (@setting(default_dump_debug_map)) or define your own:
 "
-" * nmap <your-key-combination> <Plug>DumpDebugString
+" * nmap <your-key-combination> <Plug>DumpDebugStringVar
 "
 " * nmap <a-second-key-combination> <Plug>DumpDebugStringExpr
 
@@ -123,13 +123,15 @@ function! s:incrDebugCounter()
     let g:debugStringCounter += g:debugStringCounterStep
 endfunc
 
-if !hasmapto('<Plug>DumpDebugString')
+if !hasmapto('<Plug>DumpDebugStringVar')
     ""@setting default_dump_debug_map
     "
-    nmap <nowait> <unique> <Leader>ds  <Plug>DumpDebugString<CR>
+    nmap <unique> <Leader>ds  <Plug>DumpDebugStringVar
+endif
+if !hasmapto('<Plug>DumpDebugStringExpr')
     ""@setting default_dump_debug_map
     "
-    nmap <nowait> <unique> <Leader>dS  <Plug>DumpDebugStringExpr
+    nmap <unique> <Leader>dS  <Plug>DumpDebugStringExpr
 endif
 
 ""
@@ -168,7 +170,7 @@ function! s:debugFunctionWrapper(mode, ...)
         AddDebugString
 
         if &runtimepath =~# 'vim-repeat'
-          call repeat#set("\<Plug>DumpDebugString")
+          call repeat#set("\<Plug>DumpDebugStringVar<CR>")
         endif
 
     elseif a:mode ==# s:modes['var_debug']
@@ -187,8 +189,8 @@ function! s:debugFunctionWrapper(mode, ...)
 
         " Make way for repeat.vim
         if &runtimepath =~# 'vim-repeat'
-          execute 'nnoremap <silent> <Plug>DumpDebugStringSpecExpr :<C-U> :call <SID>debugFunctionWrapper(1, "' . l:expr . '")<CR>'
-          call repeat#set("\<Plug>DumpDebugStringSpecExpr")
+          execute 'nnoremap <silent> <Plug>DumpDebugStringSpecExpr :<C-U>call <SID>debugFunctionWrapper(1, "' . l:expr . '")<CR>'
+          call repeat#set("\<Plug>DumpDebugStringSpecExpr<CR>")
         endif
     else
         echoerr 's:debugFunctionWrapper - Unknown mode: ' a:mode
@@ -215,10 +217,10 @@ endfunc
 
 ""
 " For debugging, execute a <Plug> command using execute:
-" :execute "normal \<Plug>DumpDebugString"
+" :execute "normal \<Plug>DumpDebugStringVar"
 "
-nnoremap <silent> <Plug>DumpDebugString :<C-U> :call <SID>debugFunctionWrapper(0)<CR>
-nnoremap <silent> <Plug>DumpDebugStringExpr :<C-U> :call <SID>debugFunctionWrapper(1)<CR>
+nnoremap <silent> <Plug>DumpDebugStringVar :<C-U>call <SID>debugFunctionWrapper(0)<CR>
+nnoremap <silent> <Plug>DumpDebugStringExpr :<C-U>call <SID>debugFunctionWrapper(1)<CR>
 
 let &cpoptions = s:save_cpo
 unlet s:save_cpo

test/basic.vader

@@ -16,19 +16,23 @@ Execute (C +std_debug +Text):
   :set filetype=c
   3
   AssertEqual getline('.'), 'And each in your season', "Current line contents don't match"
+  Log join(getline(1,'$'), "\n")
   :normal ,ds
+  Log join(getline(1,'$'), "\n")
   :normal .
+  Log join(getline(1,'$'), "\n")
 
 Then ():
   4
   AssertEqual getline('.'), 'printf("[[Vader-workbench]:4] DEBUGGING STRING ==> %d\n", 0);'
-  6
-  AssertEqual getline('.'), 'printf("[[Vader-workbench]:6] DEBUGGING STRING ==> %d\n", 1);'
+  5
+  AssertEqual getline('.'), 'printf("[[Vader-workbench]:5] DEBUGGING STRING ==> %d\n", 1);'
 
 ================================================================================
 
 ""
-" What happens if there isn't any text at all in the buffer?
+" What happens if there isn't any text in the current line? - cursor should stay
+" at the same line
 Execute (C +std_debug -Text):
   :set filetype=c
   8

test/run-tests.sh

@@ -4,5 +4,6 @@
 # Do not "cd" to any existing "test" dir from CDPATH!
 unset CDPATH
 
-cd "$(dirname "${BASH_SOURCE[0]}")" && vim -Nu vimrc -c 'Vader! basic.vader' \
-    > /dev/null
+cd "$(dirname "$(dirname "${BASH_SOURCE[0]}")")"
+vim -Nu test/vimrc -c 'Vader! test/*'
+cd -

test/vimrc

@@ -1,6 +1,9 @@
 filetype off
 let g:mapleader = ","
 
+nmap <Leader>ds  <Plug>DumpDebugStringVar
+nmap <Leader>dS  <Plug>DumpDebugStringExpr
+
 set runtimepath+=.
 set runtimepath+=vader.vim
 set runtimepath+=vim-repeat
@@ -11,4 +14,3 @@ syntax enable
 set nomore
 set noswapfile
 set viminfo=
-