mirror of
https://github.com/amix/vimrc
synced 2025-06-16 09:35:01 +08:00
Updated plugins
This commit is contained in:
@ -9,15 +9,15 @@
|
||||
|
||||
function! s:is_mkdCode(lnum)
|
||||
let name = synIDattr(synID(a:lnum, 1, 0), 'name')
|
||||
return (name =~ '^mkd\%(Code$\|Snippet\)' || name != '' && name !~ '^\%(mkd\|html\)')
|
||||
return (name =~# '^mkd\%(Code$\|Snippet\)' || name !=# '' && name !~? '^\%(mkd\|html\)')
|
||||
endfunction
|
||||
|
||||
if get(g:, "vim_markdown_folding_style_pythonic", 0)
|
||||
if get(g:, 'vim_markdown_folding_style_pythonic', 0)
|
||||
function! Foldexpr_markdown(lnum)
|
||||
let l1 = getline(a:lnum)
|
||||
"~~~~~ keep track of fenced code blocks ~~~~~
|
||||
"If we hit a code block fence
|
||||
if l1 =~ '````*' || l1 =~ '\~\~\~\~*'
|
||||
if l1 =~# '````*' || l1 =~# '\~\~\~\~*'
|
||||
" toggle the variable that says if we're in a code block
|
||||
if b:fenced_block == 0
|
||||
let b:fenced_block = 1
|
||||
@ -30,14 +30,14 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
|
||||
if b:front_matter == 1 && a:lnum > 2
|
||||
let l0 = getline(a:lnum-1)
|
||||
" if the previous line fenced front matter
|
||||
if l0 == '---'
|
||||
if l0 ==# '---'
|
||||
" we must not be in front matter
|
||||
let b:front_matter = 0
|
||||
endif
|
||||
" else, if we're on line one
|
||||
elseif a:lnum == 1
|
||||
" if we hit a front matter fence
|
||||
if l1 == '---'
|
||||
if l1 ==# '---'
|
||||
" we're in the front matter
|
||||
let b:front_matter = 1
|
||||
endif
|
||||
@ -45,8 +45,8 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
|
||||
endif
|
||||
|
||||
" if we're in a code block or front matter
|
||||
if b:fenced_block == 1 || b:front_matter == 1
|
||||
if a:lnum == 1
|
||||
if b:fenced_block ==# 1 || b:front_matter ==# 1
|
||||
if a:lnum ==# 1
|
||||
" fold any 'preamble'
|
||||
return '>1'
|
||||
else
|
||||
@ -58,18 +58,19 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
|
||||
let l2 = getline(a:lnum+1)
|
||||
" if the next line starts with two or more '='
|
||||
" and is not code
|
||||
if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
|
||||
if l2 =~# '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
|
||||
" next line is underlined (level 1)
|
||||
return '>0'
|
||||
" else, if the nex line starts with two or more '-'
|
||||
" but is not comment closer (-->)
|
||||
" and is not code
|
||||
elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
|
||||
elseif l2 =~# '^--\+\s*$' && !s:is_mkdCode(a:lnum+1)
|
||||
" next line is underlined (level 2)
|
||||
return '>1'
|
||||
endif
|
||||
|
||||
"if we're on a non-code line starting with a pound sign
|
||||
if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
|
||||
if l1 =~# '^#' && !s:is_mkdCode(a:lnum)
|
||||
" set the fold level to the number of hashes -1
|
||||
" return '>'.(matchend(l1, '^#\+') - 1)
|
||||
" set the fold level to the number of hashes
|
||||
@ -87,13 +88,13 @@ if get(g:, "vim_markdown_folding_style_pythonic", 0)
|
||||
function! Foldtext_markdown()
|
||||
let line = getline(v:foldstart)
|
||||
let has_numbers = &number || &relativenumber
|
||||
let nucolwidth = &fdc + has_numbers * &numberwidth
|
||||
let nucolwidth = &foldcolumn + has_numbers * &numberwidth
|
||||
let windowwidth = winwidth(0) - nucolwidth - 6
|
||||
let foldedlinecount = v:foldend - v:foldstart
|
||||
let line = strpart(line, 0, windowwidth - 2 -len(foldedlinecount))
|
||||
let line = substitute(line, '\%("""\|''''''\)', '', '')
|
||||
let fillcharcount = windowwidth - len(line) - len(foldedlinecount) + 1
|
||||
return line . ' ' . repeat("-", fillcharcount) . ' ' . foldedlinecount
|
||||
return line . ' ' . repeat('-', fillcharcount) . ' ' . foldedlinecount
|
||||
endfunction
|
||||
else " vim_markdown_folding_style_pythonic == 0
|
||||
function! Foldexpr_markdown(lnum)
|
||||
@ -104,7 +105,7 @@ else " vim_markdown_folding_style_pythonic == 0
|
||||
endif
|
||||
|
||||
" keep track of fenced code blocks
|
||||
if l0 =~ '````*' || l0 =~ '\~\~\~\~*'
|
||||
if l0 =~# '````*' || l0 =~# '\~\~\~\~*'
|
||||
if b:fenced_block == 0
|
||||
let b:fenced_block = 1
|
||||
elseif b:fenced_block == 1
|
||||
@ -112,11 +113,11 @@ else " vim_markdown_folding_style_pythonic == 0
|
||||
endif
|
||||
elseif g:vim_markdown_frontmatter == 1
|
||||
if b:front_matter == 1
|
||||
if l0 == '---'
|
||||
if l0 ==# '---'
|
||||
let b:front_matter = 0
|
||||
endif
|
||||
elseif a:lnum == 2
|
||||
if l0 == '---'
|
||||
if l0 ==# '---'
|
||||
let b:front_matter = 1
|
||||
endif
|
||||
endif
|
||||
@ -128,10 +129,10 @@ else " vim_markdown_folding_style_pythonic == 0
|
||||
endif
|
||||
|
||||
let l2 = getline(a:lnum+1)
|
||||
if l2 =~ '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
|
||||
if l2 =~# '^==\+\s*' && !s:is_mkdCode(a:lnum+1)
|
||||
" next line is underlined (level 1)
|
||||
return '>1'
|
||||
elseif l2 =~ '^--\+\s*' && !s:is_mkdCode(a:lnum+1)
|
||||
elseif l2 =~# '^--\+\s*$' && !s:is_mkdCode(a:lnum+1)
|
||||
" next line is underlined (level 2)
|
||||
if s:vim_markdown_folding_level >= 2
|
||||
return '>1'
|
||||
@ -141,7 +142,7 @@ else " vim_markdown_folding_style_pythonic == 0
|
||||
endif
|
||||
|
||||
let l1 = getline(a:lnum)
|
||||
if l1 =~ '^#' && !s:is_mkdCode(a:lnum)
|
||||
if l1 =~# '^#' && !s:is_mkdCode(a:lnum)
|
||||
" fold level according to option
|
||||
if s:vim_markdown_folding_level == 1 || matchend(l1, '^#\+') > s:vim_markdown_folding_level
|
||||
if a:lnum == line('$')
|
||||
@ -155,7 +156,7 @@ else " vim_markdown_folding_style_pythonic == 0
|
||||
endif
|
||||
endif
|
||||
|
||||
if l0 =~ '^#' && !s:is_mkdCode(a:lnum-1)
|
||||
if l0 =~# '^#' && !s:is_mkdCode(a:lnum-1)
|
||||
" previous line starts with hashes
|
||||
return '>'.matchend(l0, '^#\+')
|
||||
else
|
||||
@ -168,12 +169,12 @@ endif
|
||||
|
||||
let b:fenced_block = 0
|
||||
let b:front_matter = 0
|
||||
let s:vim_markdown_folding_level = get(g:, "vim_markdown_folding_level", 1)
|
||||
let s:vim_markdown_folding_level = get(g:, 'vim_markdown_folding_level', 1)
|
||||
|
||||
function! s:MarkdownSetupFolding()
|
||||
if !get(g:, "vim_markdown_folding_disabled", 0)
|
||||
if get(g:, "vim_markdown_folding_style_pythonic", 0)
|
||||
if get(g:, "vim_markdown_override_foldtext", 1)
|
||||
if !get(g:, 'vim_markdown_folding_disabled', 0)
|
||||
if get(g:, 'vim_markdown_folding_style_pythonic', 0)
|
||||
if get(g:, 'vim_markdown_override_foldtext', 1)
|
||||
setlocal foldtext=Foldtext_markdown()
|
||||
endif
|
||||
endif
|
||||
@ -183,9 +184,9 @@ function! s:MarkdownSetupFolding()
|
||||
endfunction
|
||||
|
||||
function! s:MarkdownSetupFoldLevel()
|
||||
if get(g:, "vim_markdown_folding_style_pythonic", 0)
|
||||
if get(g:, 'vim_markdown_folding_style_pythonic', 0)
|
||||
" set default foldlevel
|
||||
execute "setlocal foldlevel=".s:vim_markdown_folding_level
|
||||
execute 'setlocal foldlevel='.s:vim_markdown_folding_level
|
||||
endif
|
||||
endfunction
|
||||
|
||||
|
Reference in New Issue
Block a user