Mercurial > vim
view runtime/syntax/srec.vim @ 34412:b67de41ae869 v9.1.0129
patch 9.1.0129: Fix truncation of text_wrap 'wrap' virt text after EOL list char
Commit: https://github.com/vim/vim/commit/f548ae7b6357c7934411df243bc987800c9b76d1
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Sat Feb 24 10:17:11 2024 +0100
patch 9.1.0129: Fix truncation of text_wrap 'wrap' virt text after EOL list char
Problem: Virtual text with text_wrap 'wrap' was effectively being
truncated by a break conditional on the EOL list character
being added to the screen line. (BigPeet)
Solution: Remove the condition that was leading to the early break and
instead fix a similar but incorrectly written outer condition
that checks if there is more to add at the end of the screen
line. (Dylan Thacker-Smith)
Also, related:
- update comment in win_line()
- remove no longer necessary at_end_str variable in win_line()
fixes: #12725
closes: #14079
Co-authored-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 24 Feb 2024 10:30:05 +0100 |
| parents | 46763b01cd9a |
| children |
line wrap: on
line source
" Vim syntax file " Language: Motorola S-Record " Maintainer: Markus Heidelberg <markus.heidelberg@web.de> " Last Change: 2015 Feb 24 " Each record (line) is built as follows: " " field digits states " " +----------+ " | start | 1 ('S') srecRecStart " +----------+ " | type | 1 srecRecType, (srecRecTypeUnknown) " +----------+ " | count | 2 srecByteCount " +----------+ " | address | 4/6/8 srecNoAddress, srecDataAddress, srecRecCount, srecStartAddress, (srecAddressFieldUnknown) " +----------+ " | data | 0..504/502/500 srecDataOdd, srecDataEven, (srecDataUnexpected) " +----------+ " | checksum | 2 srecChecksum " +----------+ " " States in parentheses in the upper format description indicate that they " should not appear in a valid file. " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif syn match srecRecStart "^S" syn match srecRecTypeUnknown "^S." contains=srecRecStart syn match srecRecType "^S[0-35-9]" contains=srecRecStart syn match srecByteCount "^S.[0-9a-fA-F]\{2}" contains=srecRecTypeUnknown nextgroup=srecAddressFieldUnknown,srecChecksum syn match srecByteCount "^S[0-35-9][0-9a-fA-F]\{2}" contains=srecRecType syn match srecAddressFieldUnknown "[0-9a-fA-F]\{2}" contained nextgroup=srecAddressFieldUnknown,srecChecksum syn match srecNoAddress "^S0[0-9a-fA-F]\{6}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum syn match srecDataAddress "^S1[0-9a-fA-F]\{6}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum syn match srecDataAddress "^S2[0-9a-fA-F]\{8}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum syn match srecDataAddress "^S3[0-9a-fA-F]\{10}" contains=srecByteCount nextgroup=srecDataOdd,srecChecksum syn match srecRecCount "^S5[0-9a-fA-F]\{6}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum syn match srecRecCount "^S6[0-9a-fA-F]\{8}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum syn match srecStartAddress "^S7[0-9a-fA-F]\{10}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum syn match srecStartAddress "^S8[0-9a-fA-F]\{8}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum syn match srecStartAddress "^S9[0-9a-fA-F]\{6}" contains=srecByteCount nextgroup=srecDataUnexpected,srecChecksum " alternating highlight per byte for easier reading syn match srecDataOdd "[0-9a-fA-F]\{2}" contained nextgroup=srecDataEven,srecChecksum syn match srecDataEven "[0-9a-fA-F]\{2}" contained nextgroup=srecDataOdd,srecChecksum " data bytes which should not exist syn match srecDataUnexpected "[0-9a-fA-F]\{2}" contained nextgroup=srecDataUnexpected,srecChecksum " Data digit pair regex usage also results in only highlighting the checksum " if the number of data characters is even. syn match srecChecksum "[0-9a-fA-F]\{2}$" contained " Define the default highlighting. " Only when an item doesn't have highlighting yet " The default methods for highlighting. Can be overridden later hi def link srecRecStart srecRecType hi def link srecRecTypeUnknown srecRecType hi def link srecRecType WarningMsg hi def link srecByteCount Constant hi def srecAddressFieldUnknown term=italic cterm=italic gui=italic hi def link srecNoAddress DiffAdd hi def link srecDataAddress Comment hi def link srecRecCount srecNoAddress hi def link srecStartAddress srecDataAddress hi def srecDataOdd term=bold cterm=bold gui=bold hi def srecDataEven term=NONE cterm=NONE gui=NONE hi def link srecDataUnexpected Error hi def link srecChecksum DiffChange let b:current_syntax = "srec" " vim: ts=8