Mercurial > vim
view runtime/syntax/art.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 | 91e53bcb7946 |
children |
line wrap: on
line source
" Vim syntax file " Language: ART-IM and ART*Enterprise " Maintainer: Dorai Sitaram <ds26@gte.com> " URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html " Last Change: 2011 Dec 28 by Thilo Six if exists("b:current_syntax") finish endif let s:cpo_save = &cpo set cpo&vim syn case ignore syn keyword artspform => and assert bind syn keyword artspform declare def-art-fun deffacts defglobal defrule defschema do syn keyword artspform else for if in$ not or syn keyword artspform progn retract salience schema test then while syn match artvariable "?[^ \t";()|&~]\+" syn match artglobalvar "?\*[^ \t";()|&~]\+\*" syn match artinstance "![^ \t";()|&~]\+" syn match delimiter "[()|&~]" syn region string start=/"/ skip=/\\[\\"]/ end=/"/ syn match number "\<[-+]\=\([0-9]\+\(\.[0-9]*\)\=\|\.[0-9]\+\)\>" syn match comment ";.*$" syn match comment "#+:\=ignore" nextgroup=artignore skipwhite skipnl syn region artignore start="(" end=")" contained contains=artignore,comment syn region artignore start=/"/ skip=/\\[\\"]/ end=/"/ contained hi def link artinstance type hi def link artglobalvar preproc hi def link artignore comment hi def link artspform statement hi def link artvariable function let b:current_syntax = "art" let &cpo = s:cpo_save unlet s:cpo_save