Mercurial > vim
view runtime/syntax/cheetah.vim @ 35308:22c03485f222 v9.1.0456
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Commit: https://github.com/vim/vim/commit/88d4f255b7b7a19bb4f6489e0ad0956e47d51fed
Author: Gary Johnson <garyjohn@spocom.com>
Date: Sat Jun 1 20:51:33 2024 +0200
patch 9.1.0456: Left shift is incorrect with vartabstop and shiftwidth=0
Problem: Left shift is incorrect with vartabstop and shiftwidth=0
Solution: make tabstop_at() function aware of shift direction
(Gary Johnson)
The problem was that with 'vartabstop' set and 'shiftwidth' equal 0,
left shifts using << were shifting the line to the wrong column. The
tabstop to the right of the first character in the line was being used
as the shift amount instead of the tabstop to the left of that first
character.
The reason was that the tabstop_at() function always returned the value
of the tabstop to the right of the given column and was not accounting
for the direction of the shift.
The solution was to make tabstop_at() aware of the direction of the
shift and to choose the tabtop accordingly.
A test was added to check this behavior and make sure it doesn't
regress.
While at it, also fix a few indentation/alignment issues.
fixes: #14864
closes: #14887
Signed-off-by: Gary Johnson <garyjohn@spocom.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 01 Jun 2024 21:00:03 +0200 |
| parents | 46763b01cd9a |
| children |
line wrap: on
line source
" Vim syntax file " Language: Cheetah template engine " Maintainer: Max Ischenko <mfi@ukr.net> " Last Change: 2003-05-11 " " Missing features: " match invalid syntax, like bad variable ref. or unmatched closing tag " PSP-style tags: <% .. %> (obsoleted feature) " doc-strings and header comments (rarely used feature) " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif syntax case match syn keyword cheetahKeyword contained if else unless elif for in not syn keyword cheetahKeyword contained while repeat break continue pass end syn keyword cheetahKeyword contained set del attr def global include raw echo syn keyword cheetahKeyword contained import from extends implements syn keyword cheetahKeyword contained assert raise try catch finally syn keyword cheetahKeyword contained errorCatcher breakpoint silent cache filter syn match cheetahKeyword contained "\<compiler-settings\>" " Matches cached placeholders syn match cheetahPlaceHolder "$\(\*[0-9.]\+[wdhms]\?\*\|\*\)\?\h\w*\(\.\h\w*\)*" display syn match cheetahPlaceHolder "$\(\*[0-9.]\+[wdhms]\?\*\|\*\)\?{\h\w*\(\.\h\w*\)*}" display syn match cheetahDirective "^\s*#[^#].*$" contains=cheetahPlaceHolder,cheetahKeyword,cheetahComment display syn match cheetahContinuation "\\$" syn match cheetahComment "##.*$" display syn region cheetahMultiLineComment start="#\*" end="\*#" " Define the default highlighting. " Only when an item doesn't have highlighting yet hi def link cheetahPlaceHolder Identifier hi def link cheetahDirective PreCondit hi def link cheetahKeyword Define hi def link cheetahContinuation Special hi def link cheetahComment Comment hi def link cheetahMultiLineComment Comment let b:current_syntax = "cheetah"