Merge pull request #607 from lggruspe/fix-setextoatx

Fixes #606

Author: alerque

ftplugin/markdown.vim

@@ -494,7 +494,9 @@ endfunction
 function! s:SetexToAtx(line1, line2)
     let l:originalNumLines = line('$')
     execute 'silent! ' . a:line1 . ',' . a:line2 . 'substitute/\v(.*\S.*)\n\=+$/# \1/'
-    execute 'silent! ' . a:line1 . ',' . a:line2 . 'substitute/\v(.*\S.*)\n-+$/## \1/'
+
+    let l:changed = l:originalNumLines - line('$')
+    execute 'silent! ' . a:line1 . ',' . (a:line2 - l:changed) . 'substitute/\v(.*\S.*)\n-+$/## \1'
     return l:originalNumLines - line('$')
 endfunction
 

test/header-decrease.vader

@@ -0,0 +1,116 @@
+Given markdown;
+# a
+
+## b
+
+### c
+
+#### d
+
+##### e
+
+Execute (HeaderIncrease without forbidden level):
+  :HeaderIncrease
+
+Expect (increase level of all headers):
+  ## a
+
+  ### b
+
+  #### c
+
+  ##### d
+
+  ###### e
+
+Given markdown;
+# a
+
+###### b
+
+Execute (HeaderIncrease with forbidden level):
+  :HeaderIncrease
+
+Expect (no changes):
+  # a
+
+  ###### b
+
+Given markdown;
+## a
+
+### b
+
+#### c
+
+##### d
+
+###### e
+
+Execute (HeaderDecrease without forbidden level):
+  :HeaderDecrease
+
+Expect (decrease level of all headers):
+  # a
+
+  ## b
+
+  ### c
+
+  #### d
+
+  ##### e
+
+Given markdown;
+# a
+
+## b
+
+### c
+
+#### d
+
+##### e
+
+###### f
+
+Execute (HeaderDecrease with forbidden level):
+  :HeaderDecrease
+
+Expect (no changes):
+  # a
+
+  ## b
+
+  ### c
+
+  #### d
+
+  ##### e
+
+  ###### f
+
+Given markdown;
+a
+=
+
+b
+-
+
+Execute (HeaderIncrease with setext headers):
+  :HeaderIncrease
+
+Expect (convert to atx headers):
+  ## a
+
+  ### b
+
+Given markdown;
+a
+-
+
+Execute (HeaderDecrease with setext headers):
+  :HeaderDecrease
+
+Expect (convert to atx headers):
+  # a

test/setextoatx.vader

@@ -0,0 +1,48 @@
+Given markdown;
+# a
+
+a
+=
+
+## b
+
+b
+-
+
+Execute (SetexToAtx):
+  :SetexToAtx
+
+Expect (convert setex-style headings to atx):
+  # a
+
+  # a
+
+  ## b
+
+  ## b
+
+Given markdown;
+a
+=
+
+b
+=
+
+c
+-
+
+d
+-
+
+Execute (SetexToAtx with range):
+  :1,8SetexToAtx
+
+Expect (only convert setex headings in original range):
+  # a
+
+  # b
+
+  ## c
+
+  d
+  -