Mercurial > vim
view runtime/syntax/mermaid.vim @ 34397:f0cdbcf53264 v9.1.0124
patch 9.1.0124: display of below/right virtual text with non-virtual text overlap
Commit: https://github.com/vim/vim/commit/8055721c2d30f21cfabe7453014f526e7becfc06
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Wed Feb 21 21:00:59 2024 +0100
patch 9.1.0124: display of below/right virtual text with non-virtual text overlap
Problem: Virtual text with text_align 'right'/'below' wasn't being
used when a non-virtual text property overlaps with the end of
the line. This was because the non-virtual text property had a
higher priority, preventing the virtual text from being used.
Solution: Fix the sorting of text properties so virtual text properties
have a higher priority than non-virtual text properties.
(Dylan Thacker-Smith)
related: #14063
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Wed, 21 Feb 2024 21:15:03 +0100 |
parents | 681a291388d5 |
children |
line wrap: on
line source
" Vim syntax file " Language: Mermaid " Maintainer: Craig MacEahern <https://github.com/craigmac/vim-mermaid> " Filenames: *.mmd " Last Change: 2023 Dec 26 if exists("b:current_syntax") finish endif let s:cpo_save = &cpo set cpo&vim syntax iskeyword @,48-57,192-255,$,_,-,: syntax keyword mermaidKeyword \ _blank \ _self \ _parent \ _top \ ::icon \ accDescr \ accTitle \ actor \ activate \ alt \ and \ as \ autonumber \ branch \ break \ callback \ checkout \ class \ classDef \ classDiagram \ click \ commit \ commitgitGraph \ critical \ dataFormat \ dateFormat \ deactivate \ direction \ element \ else \ end \ erDiagram \ flowchart \ gantt \ gitGraph \ graph \ journey \ link \ LR \ TD \ TB \ RL \ loop \ merge \ mindmap root \ Note \ Note right of \ Note left of \ Note over \ note \ note right of \ note left of \ note over \ opt \ option \ par \ participant \ pie \ rect \ requirement \ rgb \ section \ sequenceDiagram \ state \ stateDiagram \ stateDiagram-v2 \ style \ subgraph \ title highlight link mermaidKeyword Keyword syntax match mermaidStatement "|" syntax match mermaidStatement "\~\~\~" syntax match mermaidStatement "--" syntax match mermaidStatement "\%(<|\|[<*o]\)\?\%(--\|\.\.\)\%(|>\|[>*o]\)\?" syntax match mermaidStatement "-\{2,4}[>ox-]" syntax match mermaidStatement "\.-[>ox]" syntax match mermaidStatement "-\." syntax match mermaidStatement "-\.\{1,3}-" syntax match mermaidStatement "==" syntax match mermaidStatement "=\{2,4}[>ox=]" syntax match mermaidStatement "&" syntax match mermaidStatement "--\?[>x)]>\?[+-]\?" syntax match mermaidStatement "x--x" syntax match mermaidStatement "o--o\?" syntax match mermaidStatement "<-->\?" syntax match mermaidStatement ":::" syntax match mermaidStatement "||--o{" highlight link mermaidStatement Statement " FIXME: This unexpectedly matches flow chart node `id1(text)` or others. "syntax match mermaidIdentifier "[\+-]\?\w\+(.*)[\$\*]\?" "highlight link mermaidIdentifier Identifier 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 "[\+-\#\~]\?\c\%(const\s\+\|\*\s*\)*\%(double\|float\|String\|bool\)\>\%(\s\+const\|\s*[\*&]\)*" syntax match mermaidType "[\+-\#\~]\?\cBigDecimal\>" syntax match mermaidType "[\+-\#\~]\?\cList\~.\+\~" syntax match mermaidType "<<\w\+>>" highlight link mermaidType Type syntax match mermaidComment "%%.*$" highlight link mermaidComment Comment syntax region mermaidDirective start="%%{" end="\}%%" highlight link mermaidDirective PreProc syntax region mermaidString start=/"/ skip=/\\"/ end=/"/ highlight link mermaidString String let b:current_syntax = "mermaid" let &cpo = s:cpo_save unlet s:cpo_save " vim:set sw=2: