Mercurial > vim
view runtime/syntax/openvpn.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 | eb2638f278bf |
| children |
line wrap: on
line source
" Vim syntax file " Language: OpenVPN " Maintainer: ObserverOfTime <chronobserver@disroot.org> " Filenames: *.ovpn " Last Change: 2022 Oct 16 if exists('b:current_syntax') finish endif let s:cpo_save = &cpoptions set cpoptions&vim " Options syntax match openvpnOption /^[a-z-]\+/ \ skipwhite nextgroup=openvpnArgList syntax match openvpnArgList /.*$/ transparent contained \ contains=openvpnArgument,openvpnNumber, \ openvpnIPv4Address,openvpnIPv6Address, \ openvpnSignal,openvpnComment " Arguments syntax match openvpnArgument /[^\\"' \t]\+/ \ contained contains=openvpnEscape syntax region openvpnArgument matchgroup=openvpnQuote \ start=/"/ skip=/\\"/ end=/"/ \ oneline contained contains=openvpnEscape syntax region openvpnArgument matchgroup=openvpnQuote \ start=/'/ skip=/\\'/ end=/'/ \ oneline contained syntax match openvpnEscape /\\[\\" \t]/ contained " Numbers syntax match openvpnNumber /\<[1-9][0-9]*\(\.[0-9]\+\)\?\>/ contained " Signals syntax match openvpnSignal /SIG\(HUP\|INT\|TERM\|USER[12]\)/ contained " IP addresses syntax match openvpnIPv4Address /\(\d\{1,3}\.\)\{3}\d\{1,3}/ \ contained nextgroup=openvpnSlash syntax match openvpnIPv6Address /\([A-F0-9]\{1,4}:\)\{7}\[A-F0-9]\{1,4}/ \ contained nextgroup=openvpnSlash syntax match openvpnSlash "/" contained \ nextgroup=openvpnIPv4Address,openvpnIPv6Address,openvpnNumber " Inline files syntax region openvpnInline matchgroup=openvpnTag \ start=+^<\z([a-z-]\+\)>+ end=+^</\z1>+ " Comments syntax keyword openvpnTodo contained TODO FIXME NOTE XXX syntax match openvpnComment /^[;#].*$/ contains=openvpnTodo syntax match openvpnComment /\s\+\zs[;#].*$/ contains=openvpnTodo hi def link openvpnArgument String hi def link openvpnComment Comment hi def link openvpnEscape SpecialChar hi def link openvpnIPv4Address Constant hi def link openvpnIPv6Address Constant hi def link openvpnNumber Number hi def link openvpnOption Keyword hi def link openvpnQuote Quote hi def link openvpnSignal Special hi def link openvpnSlash Delimiter hi def link openvpnTag Tag hi def link openvpnTodo Todo let b:current_syntax = 'openvpn' let &cpoptions = s:cpo_save unlet s:cpo_save