Mercurial > vim
view runtime/syntax/msql.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: msql " Maintainer: Lutz Eymers <ixtab@polzin.com> " URL: http://www.isp.de/data/msql.vim " Email: Subject: send syntax_vim.tgz " Last Change: 2001 May 10 " " Options msql_sql_query = 1 for SQL syntax highligthing inside strings " msql_minlines = x to sync at least x lines backwards " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif if !exists("main_syntax") let main_syntax = 'msql' endif runtime! syntax/html.vim unlet b:current_syntax syn cluster htmlPreproc add=msqlRegion syn case match " Internal Variables syn keyword msqlIntVar ERRMSG contained " Env Variables syn keyword msqlEnvVar SERVER_SOFTWARE SERVER_NAME SERVER_URL GATEWAY_INTERFACE contained syn keyword msqlEnvVar SERVER_PROTOCOL SERVER_PORT REQUEST_METHOD PATH_INFO contained syn keyword msqlEnvVar PATH_TRANSLATED SCRIPT_NAME QUERY_STRING REMOTE_HOST contained syn keyword msqlEnvVar REMOTE_ADDR AUTH_TYPE REMOTE_USER CONTEN_TYPE contained syn keyword msqlEnvVar CONTENT_LENGTH HTTPS HTTPS_KEYSIZE HTTPS_SECRETKEYSIZE contained syn keyword msqlEnvVar HTTP_ACCECT HTTP_USER_AGENT HTTP_IF_MODIFIED_SINCE contained syn keyword msqlEnvVar HTTP_FROM HTTP_REFERER contained " Inlclude lLite syn include @msqlLite <sfile>:p:h/lite.vim " Msql Region syn region msqlRegion matchgroup=Delimiter start="<!$" start="<![^!->D]" end=">" contains=@msqlLite,msql.* " sync if exists("msql_minlines") exec "syn sync minlines=" . msql_minlines else syn sync minlines=100 endif " Define the default highlighting. " Only when an item doesn't have highlighting yet hi def link msqlComment Comment hi def link msqlString String hi def link msqlNumber Number hi def link msqlFloat Float hi def link msqlIdentifier Identifier hi def link msqlGlobalIdentifier Identifier hi def link msqlIntVar Identifier hi def link msqlEnvVar Identifier hi def link msqlFunctions Function hi def link msqlRepeat Repeat hi def link msqlConditional Conditional hi def link msqlStatement Statement hi def link msqlType Type hi def link msqlInclude Include hi def link msqlDefine Define hi def link msqlSpecialChar SpecialChar hi def link msqlParentError Error hi def link msqlTodo Todo hi def link msqlOperator Operator hi def link msqlRelation Operator let b:current_syntax = "msql" if main_syntax == 'msql' unlet main_syntax endif " vim: ts=8