Mercurial > vim
view runtime/syntax/zir.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 | 15c80d8bc515 |
children |
line wrap: on
line source
" Vim syntax file " Language: Zir " Upstream: https://github.com/ziglang/zig.vim if exists("b:current_syntax") finish endif let b:current_syntax = "zir" syn region zirCommentLine start=";" end="$" contains=zirTodo,@Spell syn region zirBlock start="{" end="}" transparent fold syn keyword zirKeyword primitive fntype int str as ptrtoint fieldptr deref asm unreachable export ref fn syn keyword zirTodo contained TODO syn region zirString start=+c\?"+ skip=+\\\\\|\\"+ end=+"+ oneline contains=zirEscape,zirEscapeUnicode,zirEscapeError,@Spell syn match zirEscapeError display contained /\\./ syn match zirEscape display contained /\\\([nrt\\'"]\|x\x\{2}\)/ syn match zirEscapeUnicode display contained /\\\(u\x\{4}\|U\x\{6}\)/ syn match zirDecNumber display "\<[0-9]\+\%(.[0-9]\+\)\=\%([eE][+-]\?[0-9]\+\)\=" syn match zirHexNumber display "\<0x[a-fA-F0-9]\+\%([a-fA-F0-9]\+\%([pP][+-]\?[0-9]\+\)\?\)\=" syn match zirOctNumber display "\<0o[0-7]\+" syn match zirBinNumber display "\<0b[01]\+\%(.[01]\+\%([eE][+-]\?[0-9]\+\)\?\)\=" syn match zirGlobal display "[^a-zA-Z0-9_]\?\zs@[a-zA-Z0-9_]\+" syn match zirLocal display "[^a-zA-Z0-9_]\?\zs%[a-zA-Z0-9_]\+" hi def link zirCommentLine Comment hi def link zirTodo Todo hi def link zirKeyword Keyword hi def link zirString Constant hi def link zirEscape Special hi def link zirEscapeUnicode zirEscape hi def link zirEscapeError Error hi def link zirDecNumber Constant hi def link zirHexNumber Constant hi def link zirOctNumber Constant hi def link zirBinNumber Constant hi def link zirGlobal Identifier hi def link zirLocal Identifier