Mercurial > vim
view runtime/syntax/cvsrc.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 | 1218c5353e2b |
children |
line wrap: on
line source
" Vim syntax file " Language: cvs(1) RC file " Previous Maintainer: Nikolai Weibull <now@bitwi.se> " Latest Revision: 2006-04-19 if exists("b:current_syntax") finish endif let s:cpo_save = &cpo set cpo&vim syn region cvsrcString display oneline start=+"+ skip=+\\\\\|\\\\"+ end=+"+ syn region cvsrcString display oneline start=+'+ skip=+\\\\\|\\\\'+ end=+'+ syn match cvsrcNumber display '\<\d\+\>' syn match cvsrcBegin display '^' nextgroup=cvsrcCommand skipwhite syn region cvsrcCommand contained transparent matchgroup=cvsrcCommand \ start='add\|admin\|checkout\|commit\|cvs\|diff' \ start='export\|history\|import\|init\|log' \ start='rdiff\|release\|remove\|rtag\|status\|tag' \ start='update' \ end='$' \ contains=cvsrcOption,cvsrcString,cvsrcNumber \ keepend syn match cvsrcOption contained display '-\a\+' hi def link cvsrcString String hi def link cvsrcNumber Number hi def link cvsrcCommand Keyword hi def link cvsrcOption Identifier let b:current_syntax = "cvsrc" let &cpo = s:cpo_save unlet s:cpo_save