Mercurial > vim
view runtime/syntax/xkb.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 | 5b7ea82bc18f |
children |
line wrap: on
line source
" Vim syntax file " This is a GENERATED FILE. Please always refer to source file at the URI below. " Language: XKB (X Keyboard Extension) components " Maintainer: David Ne\v{c}as (Yeti) <yeti@physics.muni.cz> " Last Change: 2020 Oct 18 " URL: http://trific.ath.cx/Ftp/vim/syntax/xkb.vim " Setup " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif syn case match syn sync minlines=100 " Comments syn region xkbComment start="//" skip="\\$" end="$" keepend contains=xkbTodo syn region xkbComment start="/\*" matchgroup=NONE end="\*/" contains=xkbCommentStartError,xkbTodo syn match xkbCommentError "\*/" syntax match xkbCommentStartError "/\*" contained syn sync ccomment xkbComment syn keyword xkbTodo TODO FIXME contained " Literal strings syn match xkbSpecialChar "\\\d\d\d\|\\." contained syn region xkbString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=xkbSpecialChar oneline " Catch errors caused by wrong parenthesization syn region xkbParen start='(' end=')' contains=ALLBUT,xkbParenError,xkbSpecial,xkbTodo transparent syn match xkbParenError ")" syn region xkbBrace start='{' end='}' contains=ALLBUT,xkbBraceError,xkbSpecial,xkbTodo transparent syn match xkbBraceError "}" syn region xkbBracket start='\[' end='\]' contains=ALLBUT,xkbBracketError,xkbSpecial,xkbTodo transparent syn match xkbBracketError "\]" " Physical keys syn match xkbPhysicalKey "<\w\+>" " Keywords syn keyword xkbPreproc augment include replace syn keyword xkbConstant False True syn keyword xkbModif override replace syn keyword xkbIdentifier action affect alias allowExplicit approx baseColor button clearLocks color controls cornerRadius count ctrls description driveskbd font fontSize gap group groups height indicator indicatorDrivesKeyboard interpret key keys labelColor latchToLock latchMods left level_name map maximum minimum modifier_map modifiers name offColor onColor outline preserve priority repeat row section setMods shape slant solid symbols text top type useModMapMods virtualModifier virtualMods virtual_modifiers weight whichModState width syn keyword xkbFunction AnyOf ISOLock LatchGroup LatchMods LockControls LockGroup LockMods LockPointerButton MovePtr NoAction PointerButton SetControls SetGroup SetMods SetPtrDflt Terminate syn keyword xkbTModif default hidden partial virtual syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types " Define the default highlighting hi def link xkbModif xkbPreproc hi def link xkbTModif xkbPreproc hi def link xkbPreproc Preproc hi def link xkbIdentifier Keyword hi def link xkbFunction Function hi def link xkbSect Type hi def link xkbPhysicalKey Identifier hi def link xkbKeyword Keyword hi def link xkbComment Comment hi def link xkbTodo Todo hi def link xkbConstant Constant hi def link xkbString String hi def link xkbSpecialChar xkbSpecial hi def link xkbSpecial Special hi def link xkbParenError xkbBalancingError hi def link xkbBraceError xkbBalancingError hi def link xkbBraketError xkbBalancingError hi def link xkbBalancingError xkbError hi def link xkbCommentStartError xkbCommentError hi def link xkbCommentError xkbError hi def link xkbError Error let b:current_syntax = "xkb"