aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

runtime(java): Tidy up the syntax file

Browse Source 
- Prefix all global variables with "g:".
- Add spaces around each variable assignment operator.
- Remove extraneous whitespace characters.
- Remove a spurious _serializable_ Java keyword (since v1.1,
  java.io.Serializable and java.io.Externalizable interfaces
  provide an API for object serialization; see vim-6-0j).
- Normalise the syntax definition argument order by making
  _contained_ the first argument of each such definition.
- Normalise the argument tabulation for highlighting group
  definitions.

Reference:
https://web.archive.org/web/20010821025330/java.sun.com/docs/books/jls/first_edition/html/1.1Update.html

related: #15399

Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Aliaksei Budavei 2024-07-31 22:14:37 +02:00 committed by Christian Brabandt
parent 3749dff093
commit 9aabcef1c8
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
1 changed files with 93 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
runtime/syntax/java.vim
View File

@ -8,12 +8,12 @@
" Please check :help java.vim for comments on some of the options available. " Please check :help java.vim for comments on some of the options available.
" quit when a syntax file was already loaded " quit when a syntax file was already loaded
if !exists("main_syntax") if !exists("g:main_syntax")
if exists("b:current_syntax") if exists("b:current_syntax")
finish finish
endif endif
" we define it here so that included files can test for it " we define it here so that included files can test for it
let main_syntax='java' let g:main_syntax = 'java'
endif endif
let s:cpo_save = &cpo let s:cpo_save = &cpo
@ -98,7 +98,7 @@ endtry
syn keyword javaType boolean char byte short int long float double syn keyword javaType boolean char byte short int long float double
syn keyword javaType void syn keyword javaType void
syn keyword javaStatement return syn keyword javaStatement return
syn keyword javaStorageClass static synchronized transient volatile strictfp serializable syn keyword javaStorageClass static synchronized transient volatile strictfp
syn keyword javaExceptions throw try catch finally syn keyword javaExceptions throw try catch finally
syn keyword javaAssert assert syn keyword javaAssert assert
syn keyword javaMethodDecl throws syn keyword javaMethodDecl throws
@ -113,7 +113,7 @@ syn match javaAnnotation "@\%(\K\k*\.\)*\K\k*\>"
syn region javaAnnotation transparent matchgroup=javaAnnotationStart start=/@\%(\K\k*\.\)*\K\k*(/ end=/)/ skip=/\/\*.\{-}\*\/\|\/\/.*$/ contains=javaAnnotation,javaParenT,javaBlock,javaString,javaBoolean,javaNumber,javaTypedef,javaComment,javaLineComment syn region javaAnnotation transparent matchgroup=javaAnnotationStart start=/@\%(\K\k*\.\)*\K\k*(/ end=/)/ skip=/\/\*.\{-}\*\/\|\/\/.*$/ contains=javaAnnotation,javaParenT,javaBlock,javaString,javaBoolean,javaNumber,javaTypedef,javaComment,javaLineComment
syn match javaClassDecl "@interface\>" syn match javaClassDecl "@interface\>"
syn keyword javaBranch break continue nextgroup=javaUserLabelRef skipwhite syn keyword javaBranch break continue nextgroup=javaUserLabelRef skipwhite
syn match javaUserLabelRef "\k\+" contained syn match javaUserLabelRef contained "\k\+"
syn match javaVarArg "\.\.\." syn match javaVarArg "\.\.\."
syn keyword javaScopeDecl public protected private syn keyword javaScopeDecl public protected private
syn keyword javaConceptKind abstract final syn keyword javaConceptKind abstract final
@ -139,7 +139,7 @@ else
let [s:ff.Engine, s:ff.UpperCase, s:ff.LowerCase] = repeat([s:ff.RightConstant], 3) let [s:ff.Engine, s:ff.UpperCase, s:ff.LowerCase] = repeat([s:ff.RightConstant], 3)
endif endif
if exists("java_highlight_signature") if exists("g:java_highlight_signature")
let [s:ff.PeekTo, s:ff.PeekFrom, s:ff.GroupArgs] = repeat([s:ff.LeftConstant], 3) let [s:ff.PeekTo, s:ff.PeekFrom, s:ff.GroupArgs] = repeat([s:ff.LeftConstant], 3)
else else
let [s:ff.PeekTo, s:ff.PeekFrom, s:ff.GroupArgs] = repeat([s:ff.RightConstant], 3) let [s:ff.PeekTo, s:ff.PeekFrom, s:ff.GroupArgs] = repeat([s:ff.RightConstant], 3)
@ -156,7 +156,7 @@ endif
" "
" Note that false positives may elsewhere occur whenever an identifier " Note that false positives may elsewhere occur whenever an identifier
" is butted against a less-than operator. Cf. (X<Y) and (X < Y). " is butted against a less-than operator. Cf. (X<Y) and (X < Y).
if exists("java_highlight_generics") if exists("g:java_highlight_generics")
syn keyword javaWildcardBound contained extends super syn keyword javaWildcardBound contained extends super
" Parameterised types are delegated to javaGenerics (s:ctx.gsg) and " Parameterised types are delegated to javaGenerics (s:ctx.gsg) and
@ -176,10 +176,10 @@ if exists("java_highlight_generics")
hi def link javaGenericsC2 javaType hi def link javaGenericsC2 javaType
endif endif
if exists("java_highlight_java_lang_ids") if exists("g:java_highlight_java_lang_ids")
let java_highlight_all=1 let g:java_highlight_all = 1
endif endif
if exists("java_highlight_all") || exists("java_highlight_java") || exists("java_highlight_java_lang") if exists("g:java_highlight_all") || exists("g:java_highlight_java") || exists("g:java_highlight_java_lang")
" java.lang.* " java.lang.*
" "
" The keywords of javaR_JavaLang, javaC_JavaLang, javaE_JavaLang, " The keywords of javaR_JavaLang, javaC_JavaLang, javaE_JavaLang,
@ -208,7 +208,7 @@ if exists("java_highlight_all") || exists("java_highlight_java") || exists("ja
syn keyword javaC_JavaLang Boolean Character ClassLoader Compiler Double Float Integer Long Math Number Object Process Runtime SecurityManager String StringBuffer Thread ThreadGroup Byte Short Void Package RuntimePermission StrictMath StackTraceElement ProcessBuilder StringBuilder Module ModuleLayer StackWalker Record syn keyword javaC_JavaLang Boolean Character ClassLoader Compiler Double Float Integer Long Math Number Object Process Runtime SecurityManager String StringBuffer Thread ThreadGroup Byte Short Void Package RuntimePermission StrictMath StackTraceElement ProcessBuilder StringBuilder Module ModuleLayer StackWalker Record
syn match javaC_JavaLang "\<System\>" " See javaDebug. syn match javaC_JavaLang "\<System\>" " See javaDebug.
if !exists("java_highlight_generics") if !exists("g:java_highlight_generics")
" The non-interface parameterised names of java.lang members. " The non-interface parameterised names of java.lang members.
exec 'syn match javaC_JavaLang "\%(\<Enum\.\)\@' . s:ff.Peek('5', '') . '<=\<EnumDesc\>"' exec 'syn match javaC_JavaLang "\%(\<Enum\.\)\@' . s:ff.Peek('5', '') . '<=\<EnumDesc\>"'
syn keyword javaC_JavaLang Class InheritableThreadLocal ThreadLocal Enum ClassValue syn keyword javaC_JavaLang Class InheritableThreadLocal ThreadLocal Enum ClassValue
@ -251,11 +251,11 @@ if filereadable(expand("<sfile>:p:h") . "/javaid.vim")
source <sfile>:p:h/javaid.vim source <sfile>:p:h/javaid.vim
endif endif
if exists("java_space_errors") if exists("g:java_space_errors")
if !exists("java_no_trail_space_error") if !exists("g:java_no_trail_space_error")
syn match javaSpaceError "\s\+$" syn match javaSpaceError "\s\+$"
endif endif
if !exists("java_no_tab_space_error") if !exists("g:java_no_tab_space_error")
syn match javaSpaceError " \+\t"me=e-1 syn match javaSpaceError " \+\t"me=e-1
endif endif
endif endif
@ -282,7 +282,7 @@ hi def link javaLabelCastType javaType
" Comments " Comments
syn keyword javaTodo contained TODO FIXME XXX syn keyword javaTodo contained TODO FIXME XXX
if exists("java_comment_strings") if exists("g:java_comment_strings")
syn region javaCommentString contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=javaSpecial,javaCommentStar,javaSpecialChar,@Spell syn region javaCommentString contained start=+"+ end=+"+ end=+$+ end=+\*/+me=s-1,he=s-1 contains=javaSpecial,javaCommentStar,javaSpecialChar,@Spell
syn region javaCommentString contained start=+"""[ \t\x0c\r]*$+hs=e+1 end=+"""+he=s-1 contains=javaSpecial,javaCommentStar,javaSpecialChar,@Spell,javaSpecialError,javaTextBlockError syn region javaCommentString contained start=+"""[ \t\x0c\r]*$+hs=e+1 end=+"""+he=s-1 contains=javaSpecial,javaCommentStar,javaSpecialChar,@Spell,javaSpecialError,javaTextBlockError
syn region javaComment2String contained start=+"+ end=+$\|"+ contains=javaSpecial,javaSpecialChar,@Spell syn region javaComment2String contained start=+"+ end=+$\|"+ contains=javaSpecial,javaSpecialChar,@Spell
@ -308,7 +308,7 @@ syn match javaCommentError contained "/\*"me=e-1 display
hi def link javaCommentError javaError hi def link javaCommentError javaError
hi def link javaCommentStart javaComment hi def link javaCommentStart javaComment
if !exists("java_ignore_javadoc") && main_syntax != 'jsp' if !exists("g:java_ignore_javadoc") && g:main_syntax != 'jsp'
" The overridable "html*" default links must be defined _before_ the " The overridable "html*" default links must be defined _before_ the
" inclusion of the same default links from "html.vim". " inclusion of the same default links from "html.vim".
hi def link htmlComment Special hi def link htmlComment Special
@ -381,10 +381,10 @@ syn match javaNumber "\<0[xX]\%(\x\%(_*\x\)*\.\=\|\%(\x\%(_*\x\)*\)\=\.\x\%(
syn match javaSpecial "\\u\x\x\x\x" syn match javaSpecial "\\u\x\x\x\x"
" Method declarations (JLS-17, §8.4.3, §8.4.4, §9.4). " Method declarations (JLS-17, §8.4.3, §8.4.4, §9.4).
if exists("java_highlight_functions") if exists("g:java_highlight_functions")
syn cluster javaFuncParams contains=javaAnnotation,@javaClasses,javaGenerics,javaType,javaVarArg,javaComment,javaLineComment syn cluster javaFuncParams contains=javaAnnotation,@javaClasses,javaGenerics,javaType,javaVarArg,javaComment,javaLineComment
if exists("java_highlight_signature") if exists("g:java_highlight_signature")
syn keyword javaParamModifier contained final syn keyword javaParamModifier contained final
syn cluster javaFuncParams add=javaParamModifier syn cluster javaFuncParams add=javaParamModifier
hi def link javaParamModifier javaConceptKind hi def link javaParamModifier javaConceptKind
@ -393,8 +393,8 @@ if exists("java_highlight_functions")
syn cluster javaFuncParams add=javaScopeDecl,javaConceptKind,javaStorageClass,javaExternal syn cluster javaFuncParams add=javaScopeDecl,javaConceptKind,javaStorageClass,javaExternal
endif endif
if java_highlight_functions =~# '^indent[1-8]\=$' if g:java_highlight_functions =~# '^indent[1-8]\=$'
let s:last = java_highlight_functions[-1 :] let s:last = g:java_highlight_functions[-1 :]
let s:indent = s:last != 't' ? repeat("\x20", s:last) : "\t" let s:indent = s:last != 't' ? repeat("\x20", s:last) : "\t"
" Try to not match other type members, initialiser blocks, enum " Try to not match other type members, initialiser blocks, enum
" constants (JLS-17, §8.9.1), and constructors (JLS-17, §8.1.7): " constants (JLS-17, §8.9.1), and constructors (JLS-17, §8.1.7):
@ -430,7 +430,7 @@ if exists("java_highlight_functions")
endif endif
endif endif
if exists("java_highlight_debug") if exists("g:java_highlight_debug")
" Strings and constants " Strings and constants
syn match javaDebugSpecial contained "\\\%(u\x\x\x\x\|[0-3]\o\o\|\o\o\=\|[bstnfr"'\\]\)" syn match javaDebugSpecial contained "\\\%(u\x\x\x\x\|[0-3]\o\o\|\o\o\=\|[bstnfr"'\\]\)"
syn region javaDebugString contained start=+"+ end=+"+ contains=javaDebugSpecial syn region javaDebugString contained start=+"+ end=+"+ contains=javaDebugSpecial
@ -453,7 +453,7 @@ if exists("java_highlight_debug")
syn match javaDebugNumber contained "\<0[xX]\%(\x\%(_*\x\)*\.\=\|\%(\x\%(_*\x\)*\)\=\.\x\%(_*\x\)*\)[pP][-+]\=\d\%(_*\d\)*[fFdD]\=\>" syn match javaDebugNumber contained "\<0[xX]\%(\x\%(_*\x\)*\.\=\|\%(\x\%(_*\x\)*\)\=\.\x\%(_*\x\)*\)[pP][-+]\=\d\%(_*\d\)*[fFdD]\=\>"
syn keyword javaDebugBoolean contained true false syn keyword javaDebugBoolean contained true false
syn keyword javaDebugType contained null this super syn keyword javaDebugType contained null this super
syn region javaDebugParen start=+(+ end=+)+ contained contains=javaDebug.*,javaDebugParen syn region javaDebugParen contained start=+(+ end=+)+ contains=javaDebug.*,javaDebugParen
" To make this work, define the highlighting for these groups. " To make this work, define the highlighting for these groups.
syn match javaDebug "\<System\.\%(out\|err\)\.print\%(ln\)\=\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen syn match javaDebug "\<System\.\%(out\|err\)\.print\%(ln\)\=\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
@ -485,31 +485,31 @@ endif
" but one such body. " but one such body.
exec 'syn region javaBlock transparent start="\%(^\|^\S[^:]\+\)\@' . s:ff.Peek('120', '') . '<!{" end="}" fold' exec 'syn region javaBlock transparent start="\%(^\|^\S[^:]\+\)\@' . s:ff.Peek('120', '') . '<!{" end="}" fold'
if exists("java_mark_braces_in_parens_as_errors") if exists("g:java_mark_braces_in_parens_as_errors")
syn match javaInParen contained "[{}]" syn match javaInParen contained "[{}]"
hi def link javaInParen javaError hi def link javaInParen javaError
endif endif
" catch errors caused by wrong parenthesis " catch errors caused by wrong parenthesis
syn region javaParenT transparent matchgroup=javaParen start="(" end=")" contains=@javaTop,javaInParen,javaParenT1 syn region javaParenT transparent matchgroup=javaParen start="(" end=")" contains=@javaTop,javaInParen,javaParenT1
syn region javaParenT1 transparent matchgroup=javaParen1 start="(" end=")" contains=@javaTop,javaInParen,javaParenT2 contained syn region javaParenT1 contained transparent matchgroup=javaParen1 start="(" end=")" contains=@javaTop,javaInParen,javaParenT2
syn region javaParenT2 transparent matchgroup=javaParen2 start="(" end=")" contains=@javaTop,javaInParen,javaParenT contained syn region javaParenT2 contained transparent matchgroup=javaParen2 start="(" end=")" contains=@javaTop,javaInParen,javaParenT
syn match javaParenError ")" syn match javaParenError ")"
" catch errors caused by wrong square parenthesis " catch errors caused by wrong square parenthesis
syn region javaParenT transparent matchgroup=javaParen start="\[" end="\]" contains=@javaTop,javaParenT1 syn region javaParenT transparent matchgroup=javaParen start="\[" end="\]" contains=@javaTop,javaParenT1
syn region javaParenT1 transparent matchgroup=javaParen1 start="\[" end="\]" contains=@javaTop,javaParenT2 contained syn region javaParenT1 contained transparent matchgroup=javaParen1 start="\[" end="\]" contains=@javaTop,javaParenT2
syn region javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT contained syn region javaParenT2 contained transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT
syn match javaParenError "\]" syn match javaParenError "\]"
hi def link javaParenError javaError hi def link javaParenError javaError
" Lambda expressions (JLS-17, §15.27) and method references (JLS-17, " Lambda expressions (JLS-17, §15.27) and method reference expressions
" §15.13). " (JLS-17, §15.13).
if exists("java_highlight_functions") if exists("g:java_highlight_functions")
syn match javaMethodRef ":::\@!" syn match javaMethodRef ":::\@!"
hi def link javaMethodRef javaFuncDef hi def link javaMethodRef javaFuncDef
if exists("java_highlight_signature") if exists("g:java_highlight_signature")
let s:ff.LambdaDef = s:ff.LeftConstant let s:ff.LambdaDef = s:ff.LeftConstant
else else
let s:ff.LambdaDef = s:ff.RightConstant let s:ff.LambdaDef = s:ff.RightConstant
@ -543,8 +543,8 @@ endif
" Note that the syntax file "aidl.vim" relies on its availability. " Note that the syntax file "aidl.vim" relies on its availability.
syn cluster javaTop contains=TOP,javaTopEnumDeclaration syn cluster javaTop contains=TOP,javaTopEnumDeclaration
if !exists("java_minlines") if !exists("g:java_minlines")
let java_minlines = 10 let g:java_minlines = 10
endif endif
" Note that variations of a /*/ balanced comment, e.g., /*/*/, /*//*/, " Note that variations of a /*/ balanced comment, e.g., /*/*/, /*//*/,
@ -553,7 +553,7 @@ endif
" to make synchronisation start further towards file's beginning by " to make synchronisation start further towards file's beginning by
" bumping up g:java_minlines or issuing ':syntax sync fromstart' or " bumping up g:java_minlines or issuing ':syntax sync fromstart' or
" preferring &foldmethod set to 'syntax'. " preferring &foldmethod set to 'syntax'.
exec "syn sync ccomment javaComment minlines=" . java_minlines exec "syn sync ccomment javaComment minlines=" . g:java_minlines
" The default highlighting. " The default highlighting.
hi def link javaLambdaDef Function hi def link javaLambdaDef Function
@ -617,8 +617,8 @@ endif
let b:current_syntax = "java" let b:current_syntax = "java"
if main_syntax == 'java' if g:main_syntax == 'java'
unlet main_syntax unlet g:main_syntax
endif endif
let b:spell_options = "contained" let b:spell_options = "contained"