vim-patch:a03647acc313

runtime(mermaid): Syntax fix (vim/vim#13774)

* runtime(mermaid): Fix arrow syntax
* runtime(mermaid): Disable syntax for identifier to avoid false match
* runtime(mermaid): Add some C++ type syntax highlight
* runtime(mermaid): Update last change time in header

a03647acc3

Co-authored-by: KSR-Yasuda <31273423+KSR-Yasuda@users.noreply.github.com>
This commit is contained in:
Christian Clason
2023-12-27 19:03:37 +01:00
parent aece3a7f5f
commit 44c7833193

View File

@@ -2,7 +2,7 @@
" Language: Mermaid " Language: Mermaid
" Maintainer: Craig MacEahern <https://github.com/craigmac/vim-mermaid> " Maintainer: Craig MacEahern <https://github.com/craigmac/vim-mermaid>
" Filenames: *.mmd " Filenames: *.mmd
" Last Change: 2022 Nov 22 " Last Change: 2023 Dec 26
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
@@ -85,54 +85,30 @@ syntax keyword mermaidKeyword
highlight link mermaidKeyword Keyword highlight link mermaidKeyword Keyword
syntax match mermaidStatement "|" syntax match mermaidStatement "|"
syntax match mermaidStatement "--\?[>x)]>\?+\?-\?"
syntax match mermaidStatement "\~\~\~" syntax match mermaidStatement "\~\~\~"
syntax match mermaidStatement "--" syntax match mermaidStatement "--"
syntax match mermaidStatement "---" syntax match mermaidStatement "\%(<|\|[<*o]\)\?\%(--\|\.\.\)\%(|>\|[>*o]\)\?"
syntax match mermaidStatement "-->" syntax match mermaidStatement "-\{2,4}[>ox-]"
syntax match mermaidStatement "\.-[>ox]"
syntax match mermaidStatement "-\." syntax match mermaidStatement "-\."
syntax match mermaidStatement "\.->" syntax match mermaidStatement "-\.\{1,3}-"
syntax match mermaidStatement "-\.-"
syntax match mermaidStatement "-\.\.-"
syntax match mermaidStatement "-\.\.\.-"
syntax match mermaidStatement "==" syntax match mermaidStatement "=="
syntax match mermaidStatement "==>" syntax match mermaidStatement "=\{2,4}[>ox=]"
syntax match mermaidStatement "===>"
syntax match mermaidStatement "====>"
syntax match mermaidStatement "&" syntax match mermaidStatement "&"
syntax match mermaidStatement "--o" syntax match mermaidStatement "--\?[>x)]>\?[+-]\?"
syntax match mermaidStatement "--x"
syntax match mermaidStatement "x--x" syntax match mermaidStatement "x--x"
syntax match mermaidStatement "-----" syntax match mermaidStatement "o--o\?"
syntax match mermaidStatement "---->" syntax match mermaidStatement "<-->\?"
syntax match mermaidStatement "==="
syntax match mermaidStatement "===="
syntax match mermaidStatement "====="
syntax match mermaidStatement ":::" syntax match mermaidStatement ":::"
syntax match mermaidStatement "<|--"
syntax match mermaidStatement "\*--"
syntax match mermaidStatement "o--"
syntax match mermaidStatement "o--o"
syntax match mermaidStatement "<--"
syntax match mermaidStatement "<-->"
syntax match mermaidStatement "\.\."
syntax match mermaidStatement "<\.\."
syntax match mermaidStatement "<|\.\."
syntax match mermaidStatement "--|>"
syntax match mermaidStatement "--\*"
syntax match mermaidStatement "--o"
syntax match mermaidStatement "\.\.>"
syntax match mermaidStatement "\.\.|>"
syntax match mermaidStatement "<|--|>"
syntax match mermaidStatement "||--o{" syntax match mermaidStatement "||--o{"
highlight link mermaidStatement Statement highlight link mermaidStatement Statement
syntax match mermaidIdentifier "[\+-]\?\w\+(.*)[\$\*]\?" " FIXME: This unexpectedly matches flow chart node `id1(text)` or others.
highlight link mermaidIdentifier Identifier "syntax match mermaidIdentifier "[\+-]\?\w\+(.*)[\$\*]\?"
"highlight link mermaidIdentifier Identifier
syntax match mermaidType "[\+-\#\~]\?\cint\>" syntax match mermaidType "[\+-\#\~]\?\c\%(const\s\+\|\*\s*\)*\%(unsigned\s\+\)\?\%(int\|u\?int\%(8\|16\|32\|64\)_t\|char\|long\|long\s\+long\)\>\%(\s\+const\|\s*[\*&]\)*"
syntax match mermaidType "[\+-\#\~]\?\cString\>" syntax match mermaidType "[\+-\#\~]\?\c\%(const\s\+\|\*\s*\)*\%(double\|float\|String\|bool\)\>\%(\s\+const\|\s*[\*&]\)*"
syntax match mermaidType "[\+-\#\~]\?\cbool\>"
syntax match mermaidType "[\+-\#\~]\?\cBigDecimal\>" syntax match mermaidType "[\+-\#\~]\?\cBigDecimal\>"
syntax match mermaidType "[\+-\#\~]\?\cList\~.\+\~" syntax match mermaidType "[\+-\#\~]\?\cList\~.\+\~"
syntax match mermaidType "<<\w\+>>" syntax match mermaidType "<<\w\+>>"