Mercurial > vim
view runtime/syntax/modula2.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 | ff27442e7851 |
line wrap: on
line source
" Vim syntax file " Language: Modula 2 " Maintainer: pf@artcom0.north.de (Peter Funk) " based on original work of Bram Moolenaar <Bram@vim.org> " Last Change: 2001 May 09 " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif " Don't ignore case (Modula-2 is case significant). This is the default in vim " Especially emphasize headers of procedures and modules: syn region modula2Header matchgroup=modula2Header start="PROCEDURE " end="(" contains=modula2Ident oneline syn region modula2Header matchgroup=modula2Header start="MODULE " end=";" contains=modula2Ident oneline syn region modula2Header matchgroup=modula2Header start="BEGIN (\*" end="\*)" contains=modula2Ident oneline syn region modula2Header matchgroup=modula2Header start="END " end=";" contains=modula2Ident oneline syn region modula2Keyword start="END" end=";" contains=ALLBUT,modula2Ident oneline " Some very important keywords which should be emphasized more than others: syn keyword modula2AttKeyword CONST EXIT HALT RETURN TYPE VAR " All other keywords in alphabetical order: syn keyword modula2Keyword AND ARRAY BY CASE DEFINITION DIV DO ELSE syn keyword modula2Keyword ELSIF EXPORT FOR FROM IF IMPLEMENTATION IMPORT syn keyword modula2Keyword IN LOOP MOD NOT OF OR POINTER QUALIFIED RECORD syn keyword modula2Keyword SET THEN TO UNTIL WHILE WITH syn keyword modula2Type ADDRESS BITSET BOOLEAN CARDINAL CHAR INTEGER REAL WORD syn keyword modula2StdFunc ABS CAP CHR DEC EXCL INC INCL ORD SIZE TSIZE VAL syn keyword modula2StdConst FALSE NIL TRUE " The following may be discussed, since NEW and DISPOSE are some kind of " special builtin macro functions: syn keyword modula2StdFunc NEW DISPOSE " The following types are added later on and may be missing from older " Modula-2 Compilers (they are at least missing from the original report " by N.Wirth from March 1980 ;-) Highlighting should apply nevertheless: syn keyword modula2Type BYTE LONGCARD LONGINT LONGREAL PROC SHORTCARD SHORTINT " same note applies to min and max, which were also added later to m2: syn keyword modula2StdFunc MAX MIN " The underscore was originally disallowed in m2 ids, it was also added later: syn match modula2Ident " [A-Z,a-z][A-Z,a-z,0-9,_]*" contained " Comments may be nested in Modula-2: syn region modula2Comment start="(\*" end="\*)" contains=modula2Comment,modula2Todo syn keyword modula2Todo contained TODO FIXME XXX " Strings syn region modula2String start=+"+ end=+"+ syn region modula2String start="'" end="'" syn region modula2Set start="{" end="}" " Define the default highlighting. " Only when an item doesn't have highlighting yet hi def link modula2Ident Identifier hi def link modula2StdConst Boolean hi def link modula2Type Identifier hi def link modula2StdFunc Identifier hi def link modula2Header Type hi def link modula2Keyword Statement hi def link modula2AttKeyword PreProc hi def link modula2Comment Comment " The following is just a matter of taste (you want to try this instead): " hi modula2Comment term=bold ctermfg=DarkBlue guifg=Blue gui=bold hi def link modula2Todo Todo hi def link modula2String String hi def link modula2Set String let b:current_syntax = "modula2" " vim: ts=8