Mercurial > vim
view runtime/syntax/gdmo.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: GDMO " (ISO-10165-4; Guidelines for the Definition of Managed Object) " Maintainer: Gyuman (Chester) Kim <violkim@gmail.com> " URL: http://classicalprogrammer.wikidot.com/local--files/vim-syntax-file-for-gdmo/gdmo.vim " Last change: 8th June, 2011 " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif " keyword definitions syn match gdmoCategory "MANAGED\s\+OBJECT\s\+CLASS" syn keyword gdmoCategory NOTIFICATION ATTRIBUTE BEHAVIOUR PACKAGE ACTION syn match gdmoCategory "NAME\s\+BINDING" syn match gdmoRelationship "DERIVED\s\+FROM" syn match gdmoRelationship "SUPERIOR\s\+OBJECT\s\+CLASS" syn match gdmoRelationship "SUBORDINATE\s\+OBJECT\s\+CLASS" syn match gdmoExtension "AND\s\+SUBCLASSES" syn match gdmoDefinition "DEFINED\s\+AS" syn match gdmoDefinition "REGISTERED\s\+AS" syn match gdmoExtension "ORDER\s\+BY" syn match gdmoReference "WITH\s\+ATTRIBUTE" syn match gdmoReference "WITH\s\+INFORMATION\s\+SYNTAX" syn match gdmoReference "WITH\s\+REPLY\s\+SYNTAX" syn match gdmoReference "WITH\s\+ATTRIBUTE\s\+SYNTAX" syn match gdmoExtension "AND\s\+ATTRIBUTE\s\+IDS" syn match gdmoExtension "MATCHES\s\+FOR" syn match gdmoReference "CHARACTERIZED\s\+BY" syn match gdmoReference "CONDITIONAL\s\+PACKAGES" syn match gdmoExtension "PRESENT\s\+IF" syn match gdmoExtension "DEFAULT\s\+VALUE" syn match gdmoExtension "PERMITTED\s\+VALUES" syn match gdmoExtension "REQUIRED\s\+VALUES" syn match gdmoExtension "NAMED\s\+BY" syn keyword gdmoReference ATTRIBUTES NOTIFICATIONS ACTIONS syn keyword gdmoExtension DELETE CREATE syn keyword gdmoExtension EQUALITY SUBSTRINGS ORDERING syn match gdmoExtension "REPLACE-WITH-DEFAULT" syn match gdmoExtension "GET" syn match gdmoExtension "GET-REPLACE" syn match gdmoExtension "ADD-REMOVE" syn match gdmoExtension "WITH-REFERENCE-OBJECT" syn match gdmoExtension "WITH-AUTOMATIC-INSTANCE-NAMING" syn match gdmoExtension "ONLY-IF-NO-CONTAINED-OBJECTS" " Strings and constants syn match gdmoSpecial contained "\\\d\d\d\|\\." syn region gdmoString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=gdmoSpecial syn match gdmoCharacter "'[^\\]'" syn match gdmoSpecialCharacter "'\\.'" syn match gdmoNumber "0[xX][0-9a-fA-F]\+\>" syn match gdmoLineComment "--.*" syn match gdmoLineComment "--.*--" syn match gdmoDefinition "^\s*[a-zA-Z][-a-zA-Z0-9_.\[\] \t{}]* *::="me=e-3 syn match gdmoBraces "[{}]" syn sync ccomment gdmoComment " Define the default highlighting. " Only when an item doesn't have highlighting yet hi def link gdmoCategory Structure hi def link gdmoRelationship Macro hi def link gdmoDefinition Statement hi def link gdmoReference Type hi def link gdmoExtension Operator hi def link gdmoBraces Function hi def link gdmoSpecial Special hi def link gdmoString String hi def link gdmoCharacter Character hi def link gdmoSpecialCharacter gdmoSpecial hi def link gdmoComment Comment hi def link gdmoLineComment gdmoComment hi def link gdmoType Type let b:current_syntax = "gdmo" " vim: ts=8