Mercurial > vim
view runtime/syntax/jsp.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: JSP (Java Server Pages) " Maintainer: Rafael Garcia-Suarez <rgarciasuarez@free.fr> " URL: http://rgarciasuarez.free.fr/vim/syntax/jsp.vim " Last change: 2004 Feb 02 " Credits : Patch by Darren Greaves (recognizes <jsp:...> tags) " Patch by Thomas Kimpton (recognizes jspExpr inside HTML tags) " quit when a syntax file was already loaded if exists("b:current_syntax") finish endif if !exists("main_syntax") let main_syntax = 'jsp' endif " Source HTML syntax runtime! syntax/html.vim unlet b:current_syntax " Next syntax items are case-sensitive syn case match " Include Java syntax syn include @jspJava syntax/java.vim syn region jspScriptlet matchgroup=jspTag start=/<%/ keepend end=/%>/ contains=@jspJava syn region jspComment start=/<%--/ end=/--%>/ syn region jspDecl matchgroup=jspTag start=/<%!/ keepend end=/%>/ contains=@jspJava syn region jspExpr matchgroup=jspTag start=/<%=/ keepend end=/%>/ contains=@jspJava syn region jspDirective start=/<%@/ end=/%>/ contains=htmlString,jspDirName,jspDirArg syn keyword jspDirName contained include page taglib syn keyword jspDirArg contained file uri prefix language extends import session buffer autoFlush syn keyword jspDirArg contained isThreadSafe info errorPage contentType isErrorPage syn region jspCommand start=/<jsp:/ start=/<\/jsp:/ keepend end=/>/ end=/\/>/ contains=htmlString,jspCommandName,jspCommandArg syn keyword jspCommandName contained include forward getProperty plugin setProperty useBean param params fallback syn keyword jspCommandArg contained id scope class type beanName page flush name value property syn keyword jspCommandArg contained code codebase name archive align height syn keyword jspCommandArg contained width hspace vspace jreversion nspluginurl iepluginurl " Redefine htmlTag so that it can contain jspExpr syn clear htmlTag syn region htmlTag start=+<[^/%]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster,jspExpr,javaScript " Define the default highlighting. " Only when an item doesn't have highlighting yet " java.vim has redefined htmlComment highlighting hi def link htmlComment Comment hi def link htmlCommentPart Comment " Be consistent with html highlight settings hi def link jspComment htmlComment hi def link jspTag htmlTag hi def link jspDirective jspTag hi def link jspDirName htmlTagName hi def link jspDirArg htmlArg hi def link jspCommand jspTag hi def link jspCommandName htmlTagName hi def link jspCommandArg htmlArg if main_syntax == 'jsp' unlet main_syntax endif let b:current_syntax = "jsp" " vim: ts=8