Mercurial > vim
view runtime/syntax/registry.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: Windows Registry export with regedit (*.reg) " Maintainer: Dominique Stéphan (dominique@mggen.com) " URL: http://www.mggen.com/vim/syntax/registry.zip (doesn't work) " Last change: 2014 Oct 31 " Included patch from Alexander A. Ulitin " clear any unwanted syntax defs " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif " shut case off syn case ignore " Head of regedit .reg files, it's REGEDIT4 on Win9#/NT syn match registryHead "^REGEDIT[0-9]*\s*$\|^Windows Registry Editor Version \d*\.\d*\s*$" " Comment syn match registryComment "^;.*$" " Registry Key constant syn keyword registryHKEY HKEY_LOCAL_MACHINE HKEY_CLASSES_ROOT HKEY_CURRENT_USER syn keyword registryHKEY HKEY_USERS HKEY_CURRENT_CONFIG HKEY_DYN_DATA " Registry Key shortcuts syn keyword registryHKEY HKLM HKCR HKCU HKU HKCC HKDD " Some values often found in the registry " GUID (Global Unique IDentifier) syn match registryGUID "{[0-9A-Fa-f]\{8}\-[0-9A-Fa-f]\{4}\-[0-9A-Fa-f]\{4}\-[0-9A-Fa-f]\{4}\-[0-9A-Fa-f]\{12}}" contains=registrySpecial " Disk " syn match registryDisk "[a-zA-Z]:\\\\" " Special and Separator characters syn match registrySpecial "\\" syn match registrySpecial "\\\\" syn match registrySpecial "\\\"" syn match registrySpecial "\." syn match registrySpecial "," syn match registrySpecial "\/" syn match registrySpecial ":" syn match registrySpecial "-" " String syn match registryString "\".*\"" contains=registryGUID,registrySpecial " Path syn region registryPath start="\[" end="\]" contains=registryHKEY,registryGUID,registrySpecial " Path to remove " like preceding path but with a "-" at begin syn region registryRemove start="\[\-" end="\]" contains=registryHKEY,registryGUID,registrySpecial " Subkey syn match registrySubKey "^\".*\"=" " Default value syn match registrySubKey "^@=" " Numbers " Hex or Binary " The format can be precised between () : " 0 REG_NONE " 1 REG_SZ " 2 REG_EXPAND_SZ " 3 REG_BINARY " 4 REG_DWORD, REG_DWORD_LITTLE_ENDIAN " 5 REG_DWORD_BIG_ENDIAN " 6 REG_LINK " 7 REG_MULTI_SZ " 8 REG_RESOURCE_LIST " 9 REG_FULL_RESOURCE_DESCRIPTOR " 10 REG_RESOURCE_REQUIREMENTS_LIST " The value can take several lines, if \ ends the line " The limit to 999 matches is arbitrary, it avoids Vim crashing on a very long " line of hex values that ends in a comma. "syn match registryHex "hex\(([0-9]\{0,2})\)\=:\([0-9a-fA-F]\{2},\)\{0,999}\([0-9a-fA-F]\{2}\|\\\)$" contains=registrySpecial syn match registryHex "hex\(([0-9]\{0,2})\)\=:\([0-9a-fA-F]\{2},\)*\([0-9a-fA-F]\{2}\|\\\)$" contains=registrySpecial syn match registryHex "^\s*\([0-9a-fA-F]\{2},\)\{0,999}\([0-9a-fA-F]\{2}\|\\\)$" contains=registrySpecial " Dword (32 bits) syn match registryDword "dword:[0-9a-fA-F]\{8}$" contains=registrySpecial " The default methods for highlighting. Can be overridden later hi def link registryComment Comment hi def link registryHead Constant hi def link registryHKEY Constant hi def link registryPath Special hi def link registryRemove PreProc hi def link registryGUID Identifier hi def link registrySpecial Special hi def link registrySubKey Type hi def link registryString String hi def link registryHex Number hi def link registryDword Number let b:current_syntax = "registry" " vim:ts=8