Skip to content

Commit cd96075

Browse files
zzzyxwvutchrisbra
authored andcommitted
runtime(java): Quietly opt out for unsupported markdown.vim versions
fixes #16349 closes: #16369 Signed-off-by: Aliaksei Budavei <32549825+zzzyxwvut@users.noreply.github.com> Signed-off-by: Christian Brabandt <cb@256bit.org>
1 parent 6139766 commit cd96075

1 file changed

Lines changed: 23 additions & 10 deletions

File tree

runtime/syntax/java.vim

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" Maintainer: Aliaksei Budavei <0x000c70 AT gmail DOT com>
44
" Former Maintainer: Claudio Fleiner <claudio@fleiner.com>
55
" Repository: https://github.com/zzzyxwvut/java-vim.git
6-
" Last Change: 2024 Oct 10
6+
" Last Change: 2025 Jan 02
77

88
" Please check ":help java.vim" for comments on some of the options
99
" available.
@@ -391,18 +391,32 @@ if !exists("g:java_ignore_javadoc") && (s:with_html || s:with_markdown) && g:mai
391391
if s:with_markdown
392392
try
393393
syntax include @javaMarkdown syntax/markdown.vim
394-
let s:ff.WithMarkdown = s:ff.LeftConstant
394+
395+
try
396+
syn clear markdownId markdownLineStart markdownH1 markdownH2 markdownHeadingRule markdownRule markdownCode markdownCodeBlock markdownIdDeclaration
397+
let s:ff.WithMarkdown = s:ff.LeftConstant
398+
catch /\<E28:/
399+
call s:ReportOnce(v:exception)
400+
let s:no_support = 1
401+
unlet! g:java_ignore_markdown
402+
let g:java_ignore_markdown = 28
403+
endtry
395404
catch /\<E48[45]:/
396405
call s:ReportOnce(v:exception)
397-
unlockvar s:with_markdown
398-
let s:with_markdown = 0
399-
lockvar s:with_markdown
400-
hi clear markdownCode
401-
hi clear markdownCodeBlock
402-
hi clear markdownCodeDelimiter
403-
hi clear markdownLinkDelimiter
406+
let s:no_support = 1
404407
finally
405408
unlet! b:current_syntax
409+
410+
if exists("s:no_support")
411+
unlet s:no_support
412+
unlockvar s:with_markdown
413+
let s:with_markdown = 0
414+
lockvar s:with_markdown
415+
hi clear markdownCode
416+
hi clear markdownCodeBlock
417+
hi clear markdownCodeDelimiter
418+
hi clear markdownLinkDelimiter
419+
endif
406420
endtry
407421
endif
408422

@@ -422,7 +436,6 @@ if !exists("g:java_ignore_javadoc") && (s:with_html || s:with_markdown) && g:mai
422436
exec 'syn region javaMarkdownCommentTitle contained matchgroup=javaMarkdownComment start="\%(///.*\r\=\n\s*\)\@' . s:ff.Peek('80', '') . '<!///\s*\%({@return\>\)\@=" matchgroup=javaMarkdownCommentTitle end="}\%(\s*\.*\)*" contains=javaMarkdownShortcutLink,@javaMarkdown,javaMarkdownCommentMask,javaTodo,@Spell,@javaDocTags,javaTitleSkipBlock'
423437
exec 'syn region javaMarkdownCommentTitle contained matchgroup=javaMarkdownComment start="\%(///.*\r\=\n\s*\)\@' . s:ff.Peek('80', '') . '<!///\s*\%({@summary\>\)\@=" matchgroup=javaMarkdownCommentTitle end="}" contains=javaMarkdownShortcutLink,@javaMarkdown,javaMarkdownCommentMask,javaTodo,@Spell,@javaDocTags,javaTitleSkipBlock'
424438

425-
syn clear markdownId markdownLineStart markdownH1 markdownH2 markdownHeadingRule markdownRule markdownCode markdownCodeBlock markdownIdDeclaration
426439
" REDEFINE THE MARKDOWN ITEMS ANCHORED WITH "^", OBSERVING THE
427440
" DEFINITION ORDER.
428441
syn match markdownLineStart contained "^\s*///\s*[<@]\@!" contains=@markdownBlock,javaMarkdownCommentTitle,javaMarkdownCommentMask nextgroup=@markdownBlock,htmlSpecialChar

0 commit comments

Comments
 (0)