Mercurial > vim
view runtime/syntax/pccts.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: PCCTS " Maintainer: Scott Bigham <dsb@killerbunnies.org> " Last Change: 10 Aug 1999 " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif " Read the C++ syntax to start with syn include @cppTopLevel syntax/cpp.vim syn region pcctsAction matchgroup=pcctsDelim start="<<" end=">>?\=" contains=@cppTopLevel,pcctsRuleRef syn region pcctsArgBlock matchgroup=pcctsDelim start="\(>\s*\)\=\[" end="\]" contains=@cppTopLevel,pcctsRuleRef syn region pcctsString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=pcctsSpecialChar syn match pcctsSpecialChar "\\\\\|\\\"" contained syn region pcctsComment start="/\*" end="\*/" contains=cTodo syn match pcctsComment "//.*$" contains=cTodo syn region pcctsDirective start="^\s*#header\s\+<<" end=">>" contains=pcctsAction keepend syn match pcctsDirective "^\s*#parser\>.*$" contains=pcctsString,pcctsComment syn match pcctsDirective "^\s*#tokdefs\>.*$" contains=pcctsString,pcctsComment syn match pcctsDirective "^\s*#token\>.*$" contains=pcctsString,pcctsAction,pcctsTokenName,pcctsComment syn region pcctsDirective start="^\s*#tokclass\s\+[A-Z]\i*\s\+{" end="}" contains=pcctsString,pcctsTokenName syn match pcctsDirective "^\s*#lexclass\>.*$" contains=pcctsTokenName syn region pcctsDirective start="^\s*#errclass\s\+[^{]\+\s\+{" end="}" contains=pcctsString,pcctsTokenName syn match pcctsDirective "^\s*#pred\>.*$" contains=pcctsTokenName,pcctsAction syn cluster pcctsInRule contains=pcctsString,pcctsRuleName,pcctsTokenName,pcctsAction,pcctsArgBlock,pcctsSubRule,pcctsLabel,pcctsComment syn region pcctsRule start="\<[a-z][A-Za-z0-9_]*\>\(\s*\[[^]]*\]\)\=\(\s*>\s*\[[^]]*\]\)\=\s*:" end=";" contains=@pcctsInRule syn region pcctsSubRule matchgroup=pcctsDelim start="(" end=")\(+\|\*\|?\(\s*=>\)\=\)\=" contains=@pcctsInRule contained syn region pcctsSubRule matchgroup=pcctsDelim start="{" end="}" contains=@pcctsInRule contained syn match pcctsRuleName "\<[a-z]\i*\>" contained syn match pcctsTokenName "\<[A-Z]\i*\>" contained syn match pcctsLabel "\<\I\i*:\I\i*" contained contains=pcctsLabelHack,pcctsRuleName,pcctsTokenName syn match pcctsLabel "\<\I\i*:\"\([^\\]\|\\.\)*\"" contained contains=pcctsLabelHack,pcctsString syn match pcctsLabelHack "\<\I\i*:" contained syn match pcctsRuleRef "\$\I\i*\>" contained syn match pcctsRuleRef "\$\d\+\(\.\d\+\)\>" contained syn keyword pcctsClass class nextgroup=pcctsClassName skipwhite syn match pcctsClassName "\<\I\i*\>" contained nextgroup=pcctsClassBlock skipwhite skipnl syn region pcctsClassBlock start="{" end="}" contained contains=pcctsRule,pcctsComment,pcctsDirective,pcctsAction,pcctsException,pcctsExceptionHandler syn keyword pcctsException exception nextgroup=pcctsExceptionRuleRef skipwhite syn match pcctsExceptionRuleRef "\[\I\i*\]" contained contains=pcctsExceptionID syn match pcctsExceptionID "\I\i*" contained syn keyword pcctsExceptionHandler catch default syn keyword pcctsExceptionHandler NoViableAlt NoSemViableAlt syn keyword pcctsExceptionHandler MismatchedToken syn sync clear syn sync match pcctsSyncAction grouphere pcctsAction "<<" syn sync match pcctsSyncAction "<<\([^>]\|>[^>]\)*>>" syn sync match pcctsSyncRule grouphere pcctsRule "\<[a-z][A-Za-z0-9_]*\>\s*\[[^]]*\]\s*:" syn sync match pcctsSyncRule grouphere pcctsRule "\<[a-z][A-Za-z0-9_]*\>\(\s*\[[^]]*\]\)\=\s*>\s*\[[^]]*\]\s*:" " Define the default highlighting. " Only when an item doesn't have highlighting yet hi def link pcctsDelim Special hi def link pcctsTokenName Identifier hi def link pcctsRuleName Statement hi def link pcctsLabelHack Label hi def link pcctsDirective PreProc hi def link pcctsString String hi def link pcctsComment Comment hi def link pcctsClass Statement hi def link pcctsClassName Identifier hi def link pcctsException Statement hi def link pcctsExceptionHandler Keyword hi def link pcctsExceptionRuleRef pcctsDelim hi def link pcctsExceptionID Identifier hi def link pcctsRuleRef Identifier hi def link pcctsSpecialChar SpecialChar let b:current_syntax = "pccts" " vim: ts=8