Mercurial > vim
view runtime/syntax/expect.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: Expect " Maintainer: Ralph Jennings <knowbudy@oro.net> " Last Change: 2012 Jun 01 " (Dominique Pelle added @Spell) " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif " Reserved Expect variable prefixes. syn match expectVariables "\$exp[a-zA-Z0-9_]*\|\$inter[a-zA-Z0-9_]*" syn match expectVariables "\$spawn[a-zA-Z0-9_]*\|\$timeout[a-zA-Z0-9_]*" " Normal Expect variables. syn match expectVariables "\$env([^)]*)" syn match expectVariables "\$any_spawn_id\|\$argc\|\$argv\d*" syn match expectVariables "\$user_spawn_id\|\$spawn_id\|\$timeout" " Expect variable arrays. syn match expectVariables "\$\(expect\|interact\)_out([^)]*)" contains=expectOutVar " User defined variables. syn match expectVariables "\$[a-zA-Z_][a-zA-Z0-9_]*" " Reserved Expect command prefixes. syn match expectCommand "exp_[a-zA-Z0-9_]*" " Normal Expect commands. syn keyword expectStatement close debug disconnect syn keyword expectStatement exit exp_continue exp_internal exp_open syn keyword expectStatement exp_pid exp_version syn keyword expectStatement fork inter_return interpreter syn keyword expectStatement log_file log_user match_max overlay syn keyword expectStatement parity remove_nulls return syn keyword expectStatement send send_error send_log send_user syn keyword expectStatement sleep spawn strace stty system syn keyword expectStatement timestamp trace trap wait " Tcl commands recognized and used by Expect. syn keyword expectCommand proc syn keyword expectConditional if else syn keyword expectRepeat while for foreach " Expect commands with special arguments. syn keyword expectStatement expect expect_after expect_background nextgroup=expectExpectOpts syn keyword expectStatement expect_before expect_user interact nextgroup=expectExpectOpts syn match expectSpecial contained "\\." " Options for "expect", "expect_after", "expect_background", " "expect_before", "expect_user", and "interact". syn keyword expectExpectOpts default eof full_buffer null return timeout syn keyword expectOutVar contained spawn_id seconds seconds_total syn keyword expectOutVar contained string start end buffer " Numbers (Tcl style). syn case ignore syn match expectNumber "\<\d\+\(u\=l\=\|lu\|f\)\>" "floating point number, with dot, optional exponent syn match expectNumber "\<\d\+\.\d*\(e[-+]\=\d\+\)\=[fl]\=\>" "floating point number, starting with a dot, optional exponent syn match expectNumber "\.\d\+\(e[-+]\=\d\+\)\=[fl]\=\>" "floating point number, without dot, with exponent syn match expectNumber "\<\d\+e[-+]\=\d\+[fl]\=\>" "hex number syn match expectNumber "0x[0-9a-f]\+\(u\=l\=\|lu\)\>" "syn match expectIdentifier "\<[a-z_][a-z0-9_]*\>" syn case match syn region expectString start=+"+ end=+"+ contains=@Spell,expectVariables,expectSpecial " Are these really comments in Expect? (I never use it, so I'm just guessing). syn keyword expectTodo contained TODO syn match expectComment "#.*$" contains=@Spell,expectTodo syn match expectSharpBang "\%^#!.*" " Define the default highlighting. " Only when an item doesn't have highlighting yet hi def link expectSharpBang PreProc hi def link expectVariables Special hi def link expectCommand Function hi def link expectStatement Statement hi def link expectConditional Conditional hi def link expectRepeat Repeat hi def link expectExpectOpts Keyword hi def link expectOutVar Special hi def link expectSpecial Special hi def link expectNumber Number hi def link expectString String hi def link expectComment Comment hi def link expectTodo Todo "hi def link expectIdentifier Identifier let b:current_syntax = "expect" " vim: ts=8