From e49f9e7e3fc041dab0e9a1de4b564b3ddd8f77aa Mon Sep 17 00:00:00 2001 From: Felipe Morales Date: Fri, 15 May 2020 02:01:28 +0200 Subject: [PATCH] fixes for working alongside the minimized flavor of v-p-s --- autoload/markdown/headers.vim | 2 +- autoload/pandoc/formatting.vim | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/autoload/markdown/headers.vim b/autoload/markdown/headers.vim index 7a1c964..d239763 100644 --- a/autoload/markdown/headers.vim +++ b/autoload/markdown/headers.vim @@ -6,7 +6,7 @@ function! markdown#headers#CheckValidHeader(lnum) abort "{{{1 if a:lnum != 0 if exists('g:vim_pandoc_syntax_exists') let synId = synIDattr(synID(a:lnum, 1, 1), 'name') - if synId !~# '^pandoc' || synId ==# 'pandocDelimitedCodeBlock' + if synId !~# '\v^(pandoc|pdc)' || synId ==# 'pandocDelimitedCodeBlock' return 0 endif endif diff --git a/autoload/pandoc/formatting.vim b/autoload/pandoc/formatting.vim index 6365e41..f3649cf 100644 --- a/autoload/pandoc/formatting.vim +++ b/autoload/pandoc/formatting.vim @@ -18,13 +18,16 @@ function! pandoc#formatting#Init() abort "{{{1 let g:pandoc#formatting#smart_autoformat_blacklist = [ \ 'pandoc.+header', \ 'pandoc\S{-}(code|title|line|math)block(title)?', + \ 'pdc(delimited|latex)?codeblock', \ 'pandoc.+table', \ 'pandoctable', \ 'pandoc.+latex', \ 'pandocreferencedefinition', \ 'pandocreferencelabel', \ 'tex.*', + \ 'pdclatex*', \ 'yaml.*', + \ 'pdcyaml', \ 'delimiter' \] endif @@ -202,7 +205,7 @@ function! pandoc#formatting#AutoFormat(force) abort "{{{1 catch /E684/ let l:p_synName = '' endtry - if match(l:synName.l:p_synName, '\c\vpandocu?list') >= 0 + if match(l:synName.l:p_synName, '\c\v(pandoc|pdc)[uo]?list') >= 0 let l:context_prevents = 1 endif else @@ -211,7 +214,7 @@ function! pandoc#formatting#AutoFormat(force) abort "{{{1 let l:context_prevents = 1 elseif l:p_synName =~? '\c\vpandochrule' let l:context_prevents = 1 - elseif l:p_synName =~? '\c\vpandoccodeblock' && indent('.')%4 == 0 + elseif l:p_synName =~? '\c\v(pandoc|pdc)codeblock' && indent('.')%4 == 0 let l:context_prevents = 1 elseif getline(l:line -1) =~? '^\w\+:' let l:context_prevents = 1 @@ -226,7 +229,7 @@ function! pandoc#formatting#AutoFormat(force) abort "{{{1 setlocal formatoptions+=t " block quotes are formatted like text comments (hackish, i know), " so we want to make them break at textwidth - if l:stack != [] && l:synName ==? 'pandocBlockQuote' + if l:stack != [] && l:synName ==? '\c\v(pandoc|pdc)blockquote' setlocal formatoptions+=c endif elseif l:should_enable == 0