Mercurial > vim
view runtime/syntax/changelog.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 | 46763b01cd9a |
| children |
line wrap: on
line source
" Vim syntax file " Language: generic ChangeLog file " Written By: Gediminas Paulauskas <menesis@delfi.lt> " Maintainer: Corinna Vinschen <vinschen@redhat.com> " Last Change: June 1, 2003 " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif syn case ignore if exists('b:changelog_spacing_errors') let s:spacing_errors = b:changelog_spacing_errors elseif exists('g:changelog_spacing_errors') let s:spacing_errors = g:changelog_spacing_errors else let s:spacing_errors = 1 endif if s:spacing_errors syn match changelogError "^ \+" endif syn match changelogText "^\s.*$" contains=changelogMail,changelogNumber,changelogMonth,changelogDay,changelogError syn match changelogHeader "^\S.*$" contains=changelogNumber,changelogMonth,changelogDay,changelogMail syn region changelogFiles start="^\s\+[+*]\s" end=":" end="^$" contains=changelogBullet,changelogColon,changelogFuncs,changelogError keepend syn region changelogFiles start="^\s\+[([]" end=":" end="^$" contains=changelogBullet,changelogColon,changelogFuncs,changelogError keepend syn match changelogFuncs contained "(.\{-})" extend syn match changelogFuncs contained "\[.\{-}]" extend syn match changelogColon contained ":" syn match changelogBullet contained "^\s\+[+*]\s" contains=changelogError syn match changelogMail contained "<[A-Za-z0-9\._:+-]\+@[A-Za-z0-9\._-]\+>" syn keyword changelogMonth contained jan feb mar apr may jun jul aug sep oct nov dec syn keyword changelogDay contained mon tue wed thu fri sat sun syn match changelogNumber contained "[.-]*[0-9]\+" " Define the default highlighting. " Only when an item doesn't have highlighting yet hi def link changelogText Normal hi def link changelogBullet Type hi def link changelogColon Type hi def link changelogFiles Comment hi def link changelogFuncs Comment hi def link changelogHeader Statement hi def link changelogMail Special hi def link changelogNumber Number hi def link changelogMonth Number hi def link changelogDay Number hi def link changelogError Folded let b:current_syntax = "changelog" " vim: ts=8