]> git.madduck.net Git - etc/vim.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Undo noremap, add header map tests
authorCiro Santilli <ciro.santilli@gmail.com>
Sun, 7 Dec 2014 17:44:59 +0000 (18:44 +0100)
committerCiro Santilli <ciro.santilli@gmail.com>
Sun, 7 Dec 2014 17:49:11 +0000 (18:49 +0100)
Reverts #141 which @cirosantilli wrongfully merged.

Add regression tests that would have prevented that.

Correction pointed out by @shanesmith at #147.

ftplugin/mkd.vim
test/map.vader [new file with mode: 0644]

index 916e47f3ec390d519d450a13ea199c34bdfb04f1..312c2a4d92910adb5d7cbeb1fd4cb32a895b7079 100644 (file)
@@ -421,19 +421,19 @@ call <sid>MapNormVis('<Plug>(Markdown_MoveToParentHeader)', '<sid>Markdown_MoveT
 call <sid>MapNormVis('<Plug>(Markdown_MoveToCurHeader)', '<sid>Markdown_MoveToCurHeader')
 
 if !get(g:, 'vim_markdown_no_default_key_mappings', 0)
 call <sid>MapNormVis('<Plug>(Markdown_MoveToCurHeader)', '<sid>Markdown_MoveToCurHeader')
 
 if !get(g:, 'vim_markdown_no_default_key_mappings', 0)
-    nnoremap <buffer> ]] <Plug>(Markdown_MoveToNextHeader)
-    nnoremap <buffer> [[ <Plug>(Markdown_MoveToPreviousHeader)
-    nnoremap <buffer> ][ <Plug>(Markdown_MoveToNextSiblingHeader)
-    nnoremap <buffer> [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
-    nnoremap <buffer> ]u <Plug>(Markdown_MoveToParentHeader)
-    nnoremap <buffer> ]c <Plug>(Markdown_MoveToCurHeader)
+    nmap <buffer> ]] <Plug>(Markdown_MoveToNextHeader)
+    nmap <buffer> [[ <Plug>(Markdown_MoveToPreviousHeader)
+    nmap <buffer> ][ <Plug>(Markdown_MoveToNextSiblingHeader)
+    nmap <buffer> [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
+    nmap <buffer> ]u <Plug>(Markdown_MoveToParentHeader)
+    nmap <buffer> ]c <Plug>(Markdown_MoveToCurHeader)
 
 
-    vnoremap <buffer> ]] <Plug>(Markdown_MoveToNextHeader)
-    vnoremap <buffer> [[ <Plug>(Markdown_MoveToPreviousHeader)
-    vnoremap <buffer> ][ <Plug>(Markdown_MoveToNextSiblingHeader)
-    vnoremap <buffer> [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
-    vnoremap <buffer> ]u <Plug>(Markdown_MoveToParentHeader)
-    vnoremap <buffer> ]c <Plug>(Markdown_MoveToCurHeader)
+    vmap <buffer> ]] <Plug>(Markdown_MoveToNextHeader)
+    vmap <buffer> [[ <Plug>(Markdown_MoveToPreviousHeader)
+    vmap <buffer> ][ <Plug>(Markdown_MoveToNextSiblingHeader)
+    vmap <buffer> [] <Plug>(Markdown_MoveToPreviousSiblingHeader)
+    vmap <buffer> ]u <Plug>(Markdown_MoveToParentHeader)
+    vmap <buffer> ]c <Plug>(Markdown_MoveToCurHeader)
 endif
 
 command! -buffer -range=% HeaderDecrease call s:HeaderDecrease(<line1>, <line2>)
 endif
 
 command! -buffer -range=% HeaderDecrease call s:HeaderDecrease(<line1>, <line2>)
diff --git a/test/map.vader b/test/map.vader
new file mode 100644 (file)
index 0000000..0153269
--- /dev/null
@@ -0,0 +1,62 @@
+Given mkd;
+# a
+
+b
+
+# c
+
+d
+
+Execute (]] same level):
+  AssertEqual line('.'), 1
+  normal ]]
+  AssertEqual line('.'), 5
+  normal [[
+  AssertEqual line('.'), 1
+
+Given mkd;
+# a
+
+b
+
+## c
+
+d
+
+Execute (]] different levels level):
+  AssertEqual line('.'), 1
+  normal ]]
+  AssertEqual line('.'), 5
+  normal [[
+  AssertEqual line('.'), 1
+
+Given mkd;
+# a
+
+b
+
+## c
+
+d
+
+# e
+
+f
+
+Execute (][ different levels level):
+  AssertEqual line('.'), 1
+  normal ][
+  AssertEqual line('.'), 9
+  normal []
+  AssertEqual line('.'), 1
+
+Given mkd;
+# a
+
+b
+
+Execute (]c):
+  normal! 3G
+  AssertEqual line('.'), 3
+  normal ]c
+  AssertEqual line('.'), 1