Mercurial > vim
view runtime/syntax/spyce.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 | 43efa4f5a8ea |
| children |
line wrap: on
line source
" Vim syntax file " Language: SPYCE " Maintainer: Rimon Barr <rimon AT acm DOT org> " URL: http://spyce.sourceforge.net " Last Change: 2009 Nov 11 " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif " we define it here so that included files can test for it if !exists("main_syntax") let main_syntax='spyce' endif " Read the HTML syntax to start with let b:did_indent = 1 " don't perform HTML indentation! let html_no_rendering = 1 " do not render <b>,<i>, etc... runtime! syntax/html.vim unlet b:current_syntax syntax spell default " added by Bram " include python syn include @Python <sfile>:p:h/python.vim syn include @Html <sfile>:p:h/html.vim " spyce definitions syn keyword spyceDirectiveKeyword include compact module import contained syn keyword spyceDirectiveArg name names file contained syn region spyceDirectiveString start=+"+ end=+"+ contained syn match spyceDirectiveValue "=[\t ]*[^'", \t>][^, \t>]*"hs=s+1 contained syn match spyceBeginErrorS ,\[\[, syn match spyceBeginErrorA ,<%, syn cluster spyceBeginError contains=spyceBeginErrorS,spyceBeginErrorA syn match spyceEndErrorS ,\]\], syn match spyceEndErrorA ,%>, syn cluster spyceEndError contains=spyceEndErrorS,spyceEndErrorA syn match spyceEscBeginS ,\\\[\[, syn match spyceEscBeginA ,\\<%, syn cluster spyceEscBegin contains=spyceEscBeginS,spyceEscBeginA syn match spyceEscEndS ,\\\]\], syn match spyceEscEndA ,\\%>, syn cluster spyceEscEnd contains=spyceEscEndS,spyceEscEndA syn match spyceEscEndCommentS ,--\\\]\], syn match spyceEscEndCommentA ,--\\%>, syn cluster spyceEscEndComment contains=spyceEscEndCommentS,spyceEscEndCommentA syn region spyceStmtS matchgroup=spyceStmtDelim start=,\[\[, end=,\]\], contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend syn region spyceStmtA matchgroup=spyceStmtDelim start=,<%, end=,%>, contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend syn region spyceChunkS matchgroup=spyceChunkDelim start=,\[\[\\, end=,\]\], contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend syn region spyceChunkA matchgroup=spyceChunkDelim start=,<%\\, end=,%>, contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend syn region spyceEvalS matchgroup=spyceEvalDelim start=,\[\[=, end=,\]\], contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend syn region spyceEvalA matchgroup=spyceEvalDelim start=,<%=, end=,%>, contains=@Python,spyceLambdaS,spyceLambdaA,spyceBeginError keepend syn region spyceDirectiveS matchgroup=spyceDelim start=,\[\[\., end=,\]\], contains=spyceBeginError,spyceDirectiveKeyword,spyceDirectiveArg,spyceDirectiveValue,spyceDirectiveString keepend syn region spyceDirectiveA matchgroup=spyceDelim start=,<%@, end=,%>, contains=spyceBeginError,spyceDirectiveKeyword,spyceDirectiveArg,spyceDirectiveValue,spyceDirectiveString keepend syn region spyceCommentS matchgroup=spyceCommentDelim start=,\[\[--, end=,--\]\], syn region spyceCommentA matchgroup=spyceCommentDelim start=,<%--, end=,--%>, syn region spyceLambdaS matchgroup=spyceLambdaDelim start=,\[\[spy!\?, end=,\]\], contains=@Html,@spyce extend syn region spyceLambdaA matchgroup=spyceLambdaDelim start=,<%spy!\?, end=,%>, contains=@Html,@spyce extend syn cluster spyce contains=spyceStmtS,spyceStmtA,spyceChunkS,spyceChunkA,spyceEvalS,spyceEvalA,spyceCommentS,spyceCommentA,spyceDirectiveS,spyceDirectiveA syn cluster htmlPreproc contains=@spyce hi link spyceDirectiveKeyword Special hi link spyceDirectiveArg Type hi link spyceDirectiveString String hi link spyceDirectiveValue String hi link spyceDelim Special hi link spyceStmtDelim spyceDelim hi link spyceChunkDelim spyceDelim hi link spyceEvalDelim spyceDelim hi link spyceLambdaDelim spyceDelim hi link spyceCommentDelim Comment hi link spyceBeginErrorS Error hi link spyceBeginErrorA Error hi link spyceEndErrorS Error hi link spyceEndErrorA Error hi link spyceStmtS spyce hi link spyceStmtA spyce hi link spyceChunkS spyce hi link spyceChunkA spyce hi link spyceEvalS spyce hi link spyceEvalA spyce hi link spyceDirectiveS spyce hi link spyceDirectiveA spyce hi link spyceCommentS Comment hi link spyceCommentA Comment hi link spyceLambdaS Normal hi link spyceLambdaA Normal hi link spyce Statement let b:current_syntax = "spyce" if main_syntax == 'spyce' unlet main_syntax endif