Mercurial > vim
view runtime/syntax/scdoc.vim @ 33872:2c5ae1ce5af2 v9.0.2146
patch 9.0.2146: text-property without type errors when joining
Commit: https://github.com/vim/vim/commit/0d0b3b19517c321b089d637919e88e49a07a3d85
Author: Christian Brabandt <cb@256bit.org>
Date: Sun Dec 3 17:56:43 2023 +0100
patch 9.0.2146: text-property without type errors when joining
Problem: text-property without type errors when joining
Solution: count all text-properties, with or without type
before joining lines
Error when joining lines with text properties without a proper type
When joining lines, we need to consider all text properties that are
attached to a line, even when those text properties are invalid and do
not have a type attached to them.
However, since patch v9.0.0993
(commit: 89469d157aea01513bde826b4519dd6b5fbceae4)
those text properties won't be counted when joining lines and therefore
this will cause the adjustment for text properties on joining to go
wrong (and may later cause SIGABRT with an invalid free pointer)
I am not sure, why the condition to not count text properties with a
valid type was added in patch v9.0.993, because no test fails if those
condition is removed. So let's just remove this condition and add a test
that verifies, that we are able to join lines, even when the text
properties attached to it do not have a valid type.
fixes: #13609
closes: #13614
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 10 Dec 2023 15:16:11 +0100 |
| parents | cd68a630f0d0 |
| children |
line wrap: on
line source
" Syntax file for scdoc files " Maintainer: Gregory Anders <contact@gpanders.com> " Last Updated: 2022-05-09 " Upstream: https://github.com/gpanders/vim-scdoc if exists('b:current_syntax') finish endif let b:current_syntax = 'scdoc' syntax match scdocFirstLineError "\%^.*$" syntax match scdocFirstLineValid "\%^\S\+(\d[0-9A-Za-z]*)\%(\s\+\"[^"]*\"\%(\s\+\"[^"]*\"\)\=\)\=$" syntax region scdocCommentError start="^;\S" end="$" keepend syntax region scdocComment start="^; " end="$" keepend syntax region scdocHeaderError start="^#\{3,}" end="$" keepend syntax region scdocHeader start="^#\{1,2}" end="$" keepend syntax match scdocIndentError "^[ ]\+" syntax match scdocLineBreak "++$" syntax region scdocOrderedListItem matchgroup=scdocOrderedListMarker start="^\z(\s*\)\." skip="^\z1 .*$" end="^" contains=scdocBold,scdocUnderline syntax region scdocListItem matchgroup=scdocListMarker start="^\z(\s*\)-" skip="^\z1 .*$" end="^" contains=scdocBold,scdocUnderline " Tables cannot start with a column syntax match scdocTableError "^:" syntax region scdocTable matchgroup=scdocTableEntry start="^[\[|\]][\[\-\]<=>]" end="^$" contains=scdocTableEntry,scdocTableError,scdocTableContinuation,scdocBold,scdocUnderline,scdocPre syntax match scdocTableError "^.*$" contained syntax match scdocTableContinuation "^ \+\S\+" contained syntax match scdocTableEntry "^[|:][\[\-\]<=> ]" contained syntax match scdocTableError "^[|:][\[\-\]<=> ]\S.*$" contained syntax region scdocBold concealends matchgroup=scdocBoldDelimiter start="\\\@<!\*" end="\\\@<!\*" syntax region scdocUnderline concealends matchgroup=scdocUnderlineDelimiter start="\<\\\@<!_" end="\\\@<!_\>" syntax region scdocPre matchgroup=scdocPreDelimiter start="^\t*```" end="^\t*```" syntax sync minlines=50 hi default link scdocFirstLineValid Comment hi default link scdocComment Comment hi default link scdocHeader Title hi default link scdocOrderedListMarker Statement hi default link scdocListMarker scdocOrderedListMarker hi default link scdocLineBreak Special hi default link scdocTableSpecifier Statement hi default link scdocTableEntry Statement hi default link scdocFirstLineError Error hi default link scdocCommentError Error hi default link scdocHeaderError Error hi default link scdocIndentError Error hi default link scdocTableError Error hi default link scdocTableError Error hi default link scdocPreDelimiter Delimiter hi default scdocBold term=bold cterm=bold gui=bold hi default scdocUnderline term=underline cterm=underline gui=underline hi default link scdocBoldDelimiter scdocBold hi default link scdocUnderlineDelimiter scdocUnderline