Mercurial > vim
view runtime/syntax/atlas.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 | 46763b01cd9a |
| children |
line wrap: on
line source
" Vim syntax file " Language: ATLAS " Maintainer: Inaki Saez <jisaez@sfe.indra.es> " Last Change: 2001 May 09 " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif syn case ignore syn keyword atlasStatement begin terminate syn keyword atlasStatement fill calculate compare syn keyword atlasStatement setup connect close open disconnect reset syn keyword atlasStatement initiate read fetch syn keyword atlasStatement apply measure verify remove syn keyword atlasStatement perform leave finish output delay syn keyword atlasStatement prepare execute syn keyword atlasStatement do syn match atlasStatement "\<go[ ]\+to\>" syn match atlasStatement "\<wait[ ]\+for\>" syn keyword atlasInclude include syn keyword atlasDefine define require declare identify "syn keyword atlasReserved true false go nogo hi lo via syn keyword atlasReserved true false syn keyword atlasStorageClass external global syn keyword atlasConditional if then else end syn keyword atlasRepeat while for thru " Flags BEF and statement number syn match atlasSpecial "^[BE ][ 0-9]\{,6}\>" " Number formats syn match atlasHexNumber "\<X'[0-9A-F]\+'" syn match atlasOctalNumber "\<O'[0-7]\+'" syn match atlasBinNumber "\<B'[01]\+'" syn match atlasNumber "\<\d\+\>" "Floating point number part only syn match atlasDecimalNumber "\.\d\+\([eE][-+]\=\d\)\=\>" syn region atlasFormatString start=+((+ end=+\())\)\|\()[ ]*\$\)+me=e-1 syn region atlasString start=+\<C'+ end=+'+ oneline syn region atlasComment start=+^C+ end=+\$+ syn region atlasComment2 start=+\$.\++ms=s+1 end=+$+ oneline syn match atlasIdentifier "'[A-Za-z0-9 ._-]\+'" "Synchronization with Statement terminator $ syn sync match atlasTerminator grouphere atlasComment "^C" syn sync match atlasTerminator groupthere NONE "\$" syn sync maxlines=100 " Define the default highlighting. " Only when an item doesn't have highlighting yet hi def link atlasConditional Conditional hi def link atlasRepeat Repeat hi def link atlasStatement Statement hi def link atlasNumber Number hi def link atlasHexNumber Number hi def link atlasOctalNumber Number hi def link atlasBinNumber Number hi def link atlasDecimalNumber Float hi def link atlasFormatString String hi def link atlasString String hi def link atlasComment Comment hi def link atlasComment2 Comment hi def link atlasInclude Include hi def link atlasDefine Macro hi def link atlasReserved PreCondit hi def link atlasStorageClass StorageClass hi def link atlasIdentifier NONE hi def link atlasSpecial Special let b:current_syntax = "atlas" " vim: ts=8