X-Git-Url: https://git.madduck.net/etc/vim.git/blobdiff_plain/63aabf4b47fc944afc210b974574d158eb7a08d0..d0ed42073e25a1c98f9098c80f5daa90ac827193:/ftplugin/markdown.vim?ds=sidebyside
diff --git a/ftplugin/markdown.vim b/ftplugin/markdown.vim
index 7e2b35e..200293e 100644
--- a/ftplugin/markdown.vim
+++ b/ftplugin/markdown.vim
@@ -303,43 +303,76 @@ function! s:Toc(...)
endif
- let b:bufnr = bufnr('%')
- let b:fenced_block = 0
- let b:header_list = []
+ let l:bufnr = bufnr('%')
+ let l:cursor_line = line('.')
+ let l:cursor_header = 0
+ let l:fenced_block = 0
+ let l:front_matter = 0
+ let l:header_list = []
let l:header_max_len = 0
+ let l:vim_markdown_toc_autofit = get(g:, "vim_markdown_toc_autofit", 0)
+ let l:vim_markdown_frontmatter = get(g:, "vim_markdown_frontmatter", 0)
for i in range(1, line('$'))
let l:lineraw = getline(i)
let l:l1 = getline(i+1)
let l:line = substitute(l:lineraw, "#", "\\\#", "g")
if l:line =~ '````*' || l:line =~ '\~\~\~\~*'
- if b:fenced_block == 0
- let b:fenced_block = 1
- elseif b:fenced_block == 1
- let b:fenced_block = 0
+ if l:fenced_block == 0
+ let l:fenced_block = 1
+ elseif l:fenced_block == 1
+ let l:fenced_block = 0
+ endif
+ elseif l:vim_markdown_frontmatter == 1
+ if l:front_matter == 1
+ if l:line == '---'
+ let l:front_matter = 0
+ endif
+ elseif i == 1
+ if l:line == '---'
+ let l:front_matter = 1
+ endif
endif
endif
- if l:line =~ '^#\+' || l:l1 =~ '^==\+\s*' || l:l1 =~ '^--\+\s*'
- let b:is_header = 1
+ if l:line =~ '^#\+' || (l:l1 =~ '^=\+\s*$' || l:l1 =~ '^-\+\s*$') && l:line =~ '^\S'
+ let l:is_header = 1
else
- let b:is_header = 0
+ let l:is_header = 0
endif
- if b:is_header == 1 && b:fenced_block == 0
+ if l:is_header == 1 && l:fenced_block == 0 && l:front_matter == 0
" append line to location list
- let b:item = {'lnum': i, 'text': l:line, 'valid': 1, 'bufnr': b:bufnr, 'col': 1}
- let b:header_list = b:header_list + [b:item]
+ let l:item = {'lnum': i, 'text': l:line, 'valid': 1, 'bufnr': l:bufnr, 'col': 1}
+ let l:header_list = l:header_list + [l:item]
+ " set header number of the cursor position
+ if l:cursor_header == 0
+ if i == l:cursor_line
+ let l:cursor_header = len(l:header_list)
+ elseif i > l:cursor_line
+ let l:cursor_header = len(l:header_list) - 1
+ endif
+ endif
+ " keep track of the longest header size (heading level + title)
+ let l:total_len = stridx(l:line, ' ') + strdisplaywidth(l:line)
+ if l:total_len > l:header_max_len
+ let l:header_max_len = l:total_len
+ endif
endif
endfor
- if len(b:header_list) == 0
+ call setloclist(0, l:header_list)
+ if len(l:header_list) == 0
echom "Toc: No headers."
return
endif
- call setloclist(0, b:header_list)
if l:window_type ==# 'horizontal'
lopen
elseif l:window_type ==# 'vertical'
vertical lopen
- let &winwidth=(&columns/2)
+ " auto-fit toc window when possible to shrink it
+ if (&columns/2) > l:header_max_len && l:vim_markdown_toc_autofit == 1
+ execute 'vertical resize ' . (l:header_max_len + 1)
+ else
+ execute 'vertical resize ' . (&columns/2)
+ endif
elseif l:window_type ==# 'tab'
tab lopen
else
@@ -367,7 +400,7 @@ function! s:Toc(...)
endfor
setlocal nomodified
setlocal nomodifiable
- normal! gg
+ execute 'normal! ' . l:cursor_header . 'G'
endfunction
" Convert Setex headers in range `line1 .. line2` to Atx.
@@ -423,11 +456,16 @@ function! s:TableFormat()
" Search instead of `normal! j` because of the table at beginning of file edge case.
call search('|')
normal! j
- " Remove everything that is not a pipe othewise well formated tables would grow
- " because of addition of 2 spaces on the separator line by Tabularize /|.
+ " Remove everything that is not a pipe, colon or hyphen next to a colon othewise
+ " well formated tables would grow because of addition of 2 spaces on the separator
+ " line by Tabularize /|.
let l:flags = (&gdefault ? '' : 'g')
- execute 's/[^|]//' . l:flags
+ execute 's/\(:\@<!-:\@!\|[^|:-]\)//e' . l:flags
+ execute 's/--/-/e' . l:flags
Tabularize /|
+ " Move colons for alignment to left or right side of the cell.
+ execute 's/:\( \+\)|/\1:|/e' . l:flags
+ execute 's/|\( \+\):/|:\1/e' . l:flags
execute 's/ /-/' . l:flags
call setpos('.', l:pos)
endfunction
@@ -538,6 +576,66 @@ function! s:OpenUrlUnderCursor()
endif
endfunction
+" We need a definition guard because we invoke 'edit' which will reload this
+" script while this function is running. We must not replace it.
+if !exists('*s:EditUrlUnderCursor')
+ function s:EditUrlUnderCursor()
+ let l:url = s:Markdown_GetUrlForPosition(line('.'), col('.'))
+ if l:url != ''
+ if get(g:, 'vim_markdown_autowrite', 0)
+ write
+ endif
+ let l:anchor = ''
+ if get(g:, 'vim_markdown_follow_anchor', 0)
+ let l:parts = split(l:url, '#', 1)
+ if len(l:parts) == 2
+ let [l:url, l:anchor] = parts
+ let l:anchorexpr = get(g:, 'vim_markdown_anchorexpr', '')
+ if l:anchorexpr != ''
+ let l:anchor = eval(substitute(
+ \ l:anchorexpr, 'v:anchor',
+ \ escape('"'.l:anchor.'"', '"'), ''))
+ endif
+ endif
+ endif
+ if l:url != ''
+ let l:ext = ''
+ if get(g:, 'vim_markdown_no_extensions_in_markdown', 0)
+ " use another file extension if preferred
+ if exists('g:vim_markdown_auto_extension_ext')
+ let l:ext = '.'.g:vim_markdown_auto_extension_ext
+ else
+ let l:ext = '.md'
+ endif
+ endif
+ let l:url = fnameescape(fnamemodify(expand('%:h').'/'.l:url.l:ext, ':.'))
+ let l:editmethod = ''
+ " determine how to open the linked file (split, tab, etc)
+ if exists('g:vim_markdown_edit_url_in')
+ if g:vim_markdown_edit_url_in == 'tab'
+ let l:editmethod = 'tabnew'
+ elseif g:vim_markdown_edit_url_in == 'vsplit'
+ let l:editmethod = 'vsp'
+ elseif g:vim_markdown_edit_url_in == 'hsplit'
+ let l:editmethod = 'sp'
+ else
+ let l:editmethod = 'edit'
+ endif
+ else
+ " default to current buffer
+ let l:editmethod = 'edit'
+ endif
+ execute l:editmethod l:url
+ endif
+ if l:anchor != ''
+ silent! execute '/'.l:anchor
+ endif
+ else
+ echomsg 'The cursor is not on a link.'
+ endif
+ endfunction
+endif
+
function! s:VersionAwareNetrwBrowseX(url)
if has('patch-7.4.567')
call netrw#BrowseX(a:url, 0)
@@ -560,6 +658,7 @@ call <sid>MapNormVis('<Plug>Markdown_MoveToPreviousSiblingHeader', '<sid>MoveToP
call <sid>MapNormVis('<Plug>Markdown_MoveToParentHeader', '<sid>MoveToParentHeader')
call <sid>MapNormVis('<Plug>Markdown_MoveToCurHeader', '<sid>MoveToCurHeader')
nnoremap <Plug>Markdown_OpenUrlUnderCursor :call <sid>OpenUrlUnderCursor()<cr>
+nnoremap <Plug>Markdown_EditUrlUnderCursor :call <sid>EditUrlUnderCursor()<cr>
if !get(g:, 'vim_markdown_no_default_key_mappings', 0)
call <sid>MapNotHasmapto(']]', 'Markdown_MoveToNextHeader')
@@ -569,6 +668,7 @@ if !get(g:, 'vim_markdown_no_default_key_mappings', 0)
call <sid>MapNotHasmapto(']u', 'Markdown_MoveToParentHeader')
call <sid>MapNotHasmapto(']c', 'Markdown_MoveToCurHeader')
call <sid>MapNotHasmapto('gx', 'Markdown_OpenUrlUnderCursor')
+ call <sid>MapNotHasmapto('ge', 'Markdown_EditUrlUnderCursor')
endif
command! -buffer -range=% HeaderDecrease call s:HeaderDecrease(<line1>, <line2>)
@@ -581,22 +681,37 @@ command! -buffer Tocv call s:Toc('vertical')
command! -buffer Toct call s:Toc('tab')
" Heavily based on vim-notes - http://peterodding.com/code/vim/notes/
-let s:filetype_dict = {
- \ 'c++': 'cpp',
- \ 'viml': 'vim'
-\ }
+if exists('g:vim_markdown_fenced_languages')
+ let s:filetype_dict = {}
+ for s:filetype in g:vim_markdown_fenced_languages
+ let key = matchstr(s:filetype, "[^=]*")
+ let val = matchstr(s:filetype, "[^=]*$")
+ let s:filetype_dict[key] = val
+ endfor
+else
+ let s:filetype_dict = {
+ \ 'c++': 'cpp',
+ \ 'viml': 'vim',
+ \ 'bash': 'sh',
+ \ 'ini': 'dosini'
+ \ }
+endif
-function! s:Markdown_highlight_sources(force)
+function! s:MarkdownHighlightSources(force)
" Syntax highlight source code embedded in notes.
" Look for code blocks in the current file
let filetypes = {}
for line in getline(1, '$')
- let ft = matchstr(line, '```\zs[0-9A-Za-z_+-]*')
+ let ft = matchstr(line, '```\s*\zs[0-9A-Za-z_+-]*')
if !empty(ft) && ft !~ '^\d*$' | let filetypes[ft] = 1 | endif
endfor
if !exists('b:mkd_known_filetypes')
let b:mkd_known_filetypes = {}
endif
+ if !exists('b:mkd_included_filetypes')
+ " set syntax file name included
+ let b:mkd_included_filetypes = {}
+ endif
if !a:force && (b:mkd_known_filetypes == filetypes || empty(filetypes))
return
endif
@@ -612,9 +727,14 @@ function! s:Markdown_highlight_sources(force)
let filetype = ft
endif
let group = 'mkdSnippet' . toupper(substitute(filetype, "[+-]", "_", "g"))
- let include = s:syntax_include(filetype)
- let command = 'syntax region %s matchgroup=%s start="^\s*```%s$" matchgroup=%s end="\s*```$" keepend contains=%s%s'
- execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') ? ' concealends' : '')
+ if !has_key(b:mkd_included_filetypes, filetype)
+ let include = s:SyntaxInclude(filetype)
+ let b:mkd_included_filetypes[filetype] = 1
+ else
+ let include = '@' . toupper(filetype)
+ endif
+ let command = 'syntax region %s matchgroup=%s start="^\s*```\s*%s$" matchgroup=%s end="\s*```$" keepend contains=%s%s'
+ execute printf(command, group, startgroup, ft, endgroup, include, has('conceal') && get(g:, 'vim_markdown_conceal', 1) && get(g:, 'vim_markdown_conceal_code_blocks', 1) ? ' concealends' : '')
execute printf('syntax cluster mkdNonListItem add=%s', group)
let b:mkd_known_filetypes[ft] = 1
@@ -622,7 +742,7 @@ function! s:Markdown_highlight_sources(force)
endfor
endfunction
-function! s:syntax_include(filetype)
+function! s:SyntaxInclude(filetype)
" Include the syntax highlighting of another {filetype}.
let grouplistname = '@' . toupper(a:filetype)
" Unset the name of the current syntax while including the other syntax
@@ -647,16 +767,25 @@ function! s:syntax_include(filetype)
endfunction
-function! s:Markdown_refresh_syntax(force)
- if &filetype == 'markdown' && line('$') > 1
- call s:Markdown_highlight_sources(a:force)
+function! s:MarkdownRefreshSyntax(force)
+ if &filetype =~ 'markdown' && line('$') > 1
+ call s:MarkdownHighlightSources(a:force)
+ endif
+endfunction
+
+function! s:MarkdownClearSyntaxVariables()
+ if &filetype =~ 'markdown'
+ unlet! b:mkd_included_filetypes
endif
endfunction
augroup Mkd
- autocmd!
- au BufWinEnter * call s:Markdown_refresh_syntax(1)
- au BufWritePost * call s:Markdown_refresh_syntax(0)
- au InsertEnter,InsertLeave * call s:Markdown_refresh_syntax(0)
- au CursorHold,CursorHoldI * call s:Markdown_refresh_syntax(0)
+ " These autocmd calling s:MarkdownRefreshSyntax need to be kept in sync with
+ " the autocmds calling s:MarkdownSetupFolding in after/ftplugin/markdown.vim.
+ autocmd! * <buffer>
+ autocmd BufWinEnter <buffer> call s:MarkdownRefreshSyntax(1)
+ autocmd BufUnload <buffer> call s:MarkdownClearSyntaxVariables()
+ autocmd BufWritePost <buffer> call s:MarkdownRefreshSyntax(0)
+ autocmd InsertEnter,InsertLeave <buffer> call s:MarkdownRefreshSyntax(0)
+ autocmd CursorHold,CursorHoldI <buffer> call s:MarkdownRefreshSyntax(0)
augroup END