Merge pull request #367 from 91khr/master

[etc/vim.git] / indent / markdown.vim

diff --git a/indent/markdown.vim b/indent/markdown.vim
index 23944f242b5029c94a22a9fd8100574387e98ec1..2fa4cda8f7686fb9dd43a76286ea0e6088688080 100755 (executable)
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -5,51 +5,70 @@ setlocal indentexpr=GetMarkdownIndent()
 setlocal nolisp
 setlocal autoindent
 
 setlocal nolisp
 setlocal autoindent
 

-" Automatically insert bullets
-setlocal formatoptions+=r
-" Do not automatically insert bullets when auto-wrapping with text-width
-setlocal formatoptions-=c
-" Accept various markers as bullets
-setlocal comments=b:*,b:+,b:-
-

 " Automatically continue blockquote on line break
 " Automatically continue blockquote on line break

-setlocal comments+=b:>
+setlocal formatoptions+=r
+setlocal comments=b:>
+if get(g:, "vim_markdown_auto_insert_bullets", 1)
+    " Do not automatically insert bullets when auto-wrapping with text-width
+    setlocal formatoptions-=c
+    " Accept various markers as bullets
+    setlocal comments+=b:*,b:+,b:-
+endif

 
 " Only define the function once
 if exists("*GetMarkdownIndent") | finish | endif
 
 
 " Only define the function once
 if exists("*GetMarkdownIndent") | finish | endif
 

-function! s:is_li_start(line)
+function! s:IsMkdCode(lnum)
+    let name = synIDattr(synID(a:lnum, 1, 0), 'name')
+    return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
+endfunction
+
+function! s:IsLiStart(line)

     return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
       \    a:line =~ '^\s*[*+-] \+'
 endfunction
 
     return a:line !~ '^ *\([*-]\)\%( *\1\)\{2}\%( \|\1\)*$' &&
       \    a:line =~ '^\s*[*+-] \+'
 endfunction
 

-function! s:is_blank_line(line)
+function! s:IsHeaderLine(line)
+    return a:line =~ '^\s*#'
+endfunction
+
+function! s:IsBlankLine(line)

     return a:line =~ '^$'
 endfunction
 
     return a:line =~ '^$'
 endfunction
 

-function! s:prevnonblank(lnum)
+function! s:PrevNonBlank(lnum)

     let i = a:lnum
     let i = a:lnum

-    while i > 1 && s:is_blank_line(getline(i))
+    while i > 1 && s:IsBlankLine(getline(i))

         let i -= 1
     endwhile
     return i
 endfunction
 
 function GetMarkdownIndent()
         let i -= 1
     endwhile
     return i
 endfunction
 
 function GetMarkdownIndent()

-    let list_ind = 4
+    if v:lnum > 2 && s:IsBlankLine(getline(v:lnum - 1)) && s:IsBlankLine(getline(v:lnum - 2))
+        return 0
+    endif
+    let list_ind = get(g:, "vim_markdown_new_list_item_indent", 4)

     " Find a non-blank line above the current line.
     " Find a non-blank line above the current line.

-    let lnum = prevnonblank(v:lnum - 1)
+    let lnum = s:PrevNonBlank(v:lnum - 1)

     " At the start of the file use zero indent.
     if lnum == 0 | return 0 | endif
     let ind = indent(lnum)
     let line = getline(lnum)    " Last line
     let cline = getline(v:lnum) " Current line
     " At the start of the file use zero indent.
     if lnum == 0 | return 0 | endif
     let ind = indent(lnum)
     let line = getline(lnum)    " Last line
     let cline = getline(v:lnum) " Current line

-    if s:is_li_start(cline) 
+    if s:IsLiStart(cline)

         " Current line is the first line of a list item, do not change indent
         return indent(v:lnum)
         " Current line is the first line of a list item, do not change indent
         return indent(v:lnum)

-    elseif s:is_li_start(line)
-        " Last line is the first line of a list item, increase indent
-        return ind + list_ind
+    elseif s:IsHeaderLine(cline) && !s:IsMkdCode(v:lnum)
+        " Current line is the header, do not indent
+        return 0
+    elseif s:IsLiStart(line)
+        if s:IsMkdCode(lnum)
+            return ind
+        else
+            " Last line is the first line of a list item, increase indent
+            return ind + list_ind
+        end

     else
         return ind
     endif
     else
         return ind
     endif