Mercurial > vim

comparison runtime/syntax/java.vim @ 10051:46763b01cd9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c Author: Bram Moolenaar <Bram@vim.org> Date: Wed Aug 31 22:22:10 2016 +0200 Updated runtime files. Remove HiLink commands.
author Christian Brabandt <cb@256bit.org>
date Wed, 31 Aug 2016 22:30:08 +0200
parents 43efa4f5a8ea
children 2f7e67dd088c
comparison
equal deleted inserted replaced
10050:b702edc4b2b8 10051:46763b01cd9a
17 endif 17 endif
18 18
19 let s:cpo_save = &cpo 19 let s:cpo_save = &cpo
20 set cpo&vim 20 set cpo&vim
21 21
22 " don't use standard HiLink, it will not work with included syntax files
23 command! -nargs=+ JavaHiLink hi def link <args>
24
25 " some characters that cannot be in a java program (outside a string) 22 " some characters that cannot be in a java program (outside a string)
26 syn match javaError "[\\@`]" 23 syn match javaError "[\\@`]"
27 syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/" 24 syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
28 25
29 syn match javaOK "\.\.\." 26 syn match javaOK "\.\.\."
30 27
31 " use separate name so that it can be deleted in javacc.vim 28 " use separate name so that it can be deleted in javacc.vim
32 syn match javaError2 "#\|=<" 29 syn match javaError2 "#\|=<"
33 JavaHiLink javaError2 javaError 30 hi def link javaError2 javaError
34 31
35 32
36 33
37 " keyword definitions 34 " keyword definitions
38 syn keyword javaExternal native package 35 syn keyword javaExternal native package
71 " java.lang.* 68 " java.lang.*
72 syn match javaLangClass "\<System\>" 69 syn match javaLangClass "\<System\>"
73 syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException 70 syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
74 syn cluster javaTop add=javaR_JavaLang 71 syn cluster javaTop add=javaR_JavaLang
75 syn cluster javaClasses add=javaR_JavaLang 72 syn cluster javaClasses add=javaR_JavaLang
76 JavaHiLink javaR_JavaLang javaR_Java 73 hi def link javaR_JavaLang javaR_Java
77 syn keyword javaC_JavaLang Process RuntimePermission StringKeySet CharacterData01 Class ThreadLocal ThreadLocalMap CharacterData0E Package Character StringCoding Long ProcessImpl ProcessEnvironment Short AssertionStatusDirectives 1PackageInfoProxy UnicodeBlock InheritableThreadLocal AbstractStringBuilder StringEnvironment ClassLoader ConditionalSpecialCasing CharacterDataPrivateUse StringBuffer StringDecoder Entry StringEntry WrappedHook StringBuilder StrictMath State ThreadGroup Runtime CharacterData02 MethodArray Object CharacterDataUndefined Integer Gate Boolean Enum Variable Subset StringEncoder Void Terminator CharsetSD IntegerCache CharacterCache Byte CharsetSE Thread SystemClassLoaderAction CharacterDataLatin1 StringValues StackTraceElement Shutdown ShortCache String ConverterSD ByteCache Lock EnclosingMethodInfo Math Float Value Double SecurityManager LongCache ProcessBuilder StringEntrySet Compiler Number UNIXProcess ConverterSE ExternalData CaseInsensitiveComparator CharacterData00 NativeLibrary 74 syn keyword javaC_JavaLang Process RuntimePermission StringKeySet CharacterData01 Class ThreadLocal ThreadLocalMap CharacterData0E Package Character StringCoding Long ProcessImpl ProcessEnvironment Short AssertionStatusDirectives 1PackageInfoProxy UnicodeBlock InheritableThreadLocal AbstractStringBuilder StringEnvironment ClassLoader ConditionalSpecialCasing CharacterDataPrivateUse StringBuffer StringDecoder Entry StringEntry WrappedHook StringBuilder StrictMath State ThreadGroup Runtime CharacterData02 MethodArray Object CharacterDataUndefined Integer Gate Boolean Enum Variable Subset StringEncoder Void Terminator CharsetSD IntegerCache CharacterCache Byte CharsetSE Thread SystemClassLoaderAction CharacterDataLatin1 StringValues StackTraceElement Shutdown ShortCache String ConverterSD ByteCache Lock EnclosingMethodInfo Math Float Value Double SecurityManager LongCache ProcessBuilder StringEntrySet Compiler Number UNIXProcess ConverterSE ExternalData CaseInsensitiveComparator CharacterData00 NativeLibrary
78 syn cluster javaTop add=javaC_JavaLang 75 syn cluster javaTop add=javaC_JavaLang
79 syn cluster javaClasses add=javaC_JavaLang 76 syn cluster javaClasses add=javaC_JavaLang
80 JavaHiLink javaC_JavaLang javaC_Java 77 hi def link javaC_JavaLang javaC_Java
81 syn keyword javaE_JavaLang IncompatibleClassChangeError InternalError UnknownError ClassCircularityError AssertionError ThreadDeath IllegalAccessError NoClassDefFoundError ClassFormatError UnsupportedClassVersionError NoSuchFieldError VerifyError ExceptionInInitializerError InstantiationError LinkageError NoSuchMethodError Error UnsatisfiedLinkError StackOverflowError AbstractMethodError VirtualMachineError OutOfMemoryError 78 syn keyword javaE_JavaLang IncompatibleClassChangeError InternalError UnknownError ClassCircularityError AssertionError ThreadDeath IllegalAccessError NoClassDefFoundError ClassFormatError UnsupportedClassVersionError NoSuchFieldError VerifyError ExceptionInInitializerError InstantiationError LinkageError NoSuchMethodError Error UnsatisfiedLinkError StackOverflowError AbstractMethodError VirtualMachineError OutOfMemoryError
82 syn cluster javaTop add=javaE_JavaLang 79 syn cluster javaTop add=javaE_JavaLang
83 syn cluster javaClasses add=javaE_JavaLang 80 syn cluster javaClasses add=javaE_JavaLang
84 JavaHiLink javaE_JavaLang javaE_Java 81 hi def link javaE_JavaLang javaE_Java
85 syn keyword javaX_JavaLang CloneNotSupportedException Exception NoSuchMethodException IllegalAccessException NoSuchFieldException Throwable InterruptedException ClassNotFoundException InstantiationException 82 syn keyword javaX_JavaLang CloneNotSupportedException Exception NoSuchMethodException IllegalAccessException NoSuchFieldException Throwable InterruptedException ClassNotFoundException InstantiationException
86 syn cluster javaTop add=javaX_JavaLang 83 syn cluster javaTop add=javaX_JavaLang
87 syn cluster javaClasses add=javaX_JavaLang 84 syn cluster javaClasses add=javaX_JavaLang
88 JavaHiLink javaX_JavaLang javaX_Java 85 hi def link javaX_JavaLang javaX_Java
89 86
90 JavaHiLink javaR_Java javaR_ 87 hi def link javaR_Java javaR_
91 JavaHiLink javaC_Java javaC_ 88 hi def link javaC_Java javaC_
92 JavaHiLink javaE_Java javaE_ 89 hi def link javaE_Java javaE_
93 JavaHiLink javaX_Java javaX_ 90 hi def link javaX_Java javaX_
94 JavaHiLink javaX_ javaExceptions 91 hi def link javaX_ javaExceptions
95 JavaHiLink javaR_ javaExceptions 92 hi def link javaR_ javaExceptions
96 JavaHiLink javaE_ javaExceptions 93 hi def link javaE_ javaExceptions
97 JavaHiLink javaC_ javaConstant 94 hi def link javaC_ javaConstant
98 95
99 syn keyword javaLangObject clone equals finalize getClass hashCode 96 syn keyword javaLangObject clone equals finalize getClass hashCode
100 syn keyword javaLangObject notify notifyAll toString wait 97 syn keyword javaLangObject notify notifyAll toString wait
101 JavaHiLink javaLangObject javaConstant 98 hi def link javaLangObject javaConstant
102 syn cluster javaTop add=javaLangObject 99 syn cluster javaTop add=javaLangObject
103 endif 100 endif
104 101
105 if filereadable(expand("<sfile>:p:h")."/javaid.vim") 102 if filereadable(expand("<sfile>:p:h")."/javaid.vim")
106 source <sfile>:p:h/javaid.vim 103 source <sfile>:p:h/javaid.vim
139 endif 136 endif
140 syn region javaComment start="/\*" end="\*/" contains=@javaCommentSpecial,javaTodo,@Spell 137 syn region javaComment start="/\*" end="\*/" contains=@javaCommentSpecial,javaTodo,@Spell
141 syn match javaCommentStar contained "^\s*\*[^/]"me=e-1 138 syn match javaCommentStar contained "^\s*\*[^/]"me=e-1
142 syn match javaCommentStar contained "^\s*\*$" 139 syn match javaCommentStar contained "^\s*\*$"
143 syn match javaLineComment "//.*" contains=@javaCommentSpecial2,javaTodo,@Spell 140 syn match javaLineComment "//.*" contains=@javaCommentSpecial2,javaTodo,@Spell
144 JavaHiLink javaCommentString javaString 141 hi def link javaCommentString javaString
145 JavaHiLink javaComment2String javaString 142 hi def link javaComment2String javaString
146 JavaHiLink javaCommentCharacter javaCharacter 143 hi def link javaCommentCharacter javaCharacter
147 144
148 syn cluster javaTop add=javaComment,javaLineComment 145 syn cluster javaTop add=javaComment,javaLineComment
149 146
150 if !exists("java_ignore_javadoc") && main_syntax != 'jsp' 147 if !exists("java_ignore_javadoc") && main_syntax != 'jsp'
151 syntax case ignore 148 syntax case ignore
234 syn match javaDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen 231 syn match javaDebug "[A-Za-z][a-zA-Z0-9_]*\.printStackTrace\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
235 syn match javaDebug "\<trace[SL]\=\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen 232 syn match javaDebug "\<trace[SL]\=\s*("me=e-1 contains=javaDebug.* nextgroup=javaDebugParen
236 233
237 syn cluster javaTop add=javaDebug 234 syn cluster javaTop add=javaDebug
238 235
239 JavaHiLink javaDebug Debug 236 hi def link javaDebug Debug
240 JavaHiLink javaDebugString DebugString 237 hi def link javaDebugString DebugString
241 JavaHiLink javaDebugStringError javaError 238 hi def link javaDebugStringError javaError
242 JavaHiLink javaDebugType DebugType 239 hi def link javaDebugType DebugType
243 JavaHiLink javaDebugBoolean DebugBoolean 240 hi def link javaDebugBoolean DebugBoolean
244 JavaHiLink javaDebugNumber Debug 241 hi def link javaDebugNumber Debug
245 JavaHiLink javaDebugSpecial DebugSpecial 242 hi def link javaDebugSpecial DebugSpecial
246 JavaHiLink javaDebugSpecialCharacter DebugSpecial 243 hi def link javaDebugSpecialCharacter DebugSpecial
247 JavaHiLink javaDebugCharacter DebugString 244 hi def link javaDebugCharacter DebugString
248 JavaHiLink javaDebugParen Debug 245 hi def link javaDebugParen Debug
249 246
250 JavaHiLink DebugString String 247 hi def link DebugString String
251 JavaHiLink DebugSpecial Special 248 hi def link DebugSpecial Special
252 JavaHiLink DebugBoolean Boolean 249 hi def link DebugBoolean Boolean
253 JavaHiLink DebugType Type 250 hi def link DebugType Type
254 endif 251 endif
255 252
256 if exists("java_mark_braces_in_parens_as_errors") 253 if exists("java_mark_braces_in_parens_as_errors")
257 syn match javaInParen contained "[{}]" 254 syn match javaInParen contained "[{}]"
258 JavaHiLink javaInParen javaError 255 hi def link javaInParen javaError
259 syn cluster javaTop add=javaInParen 256 syn cluster javaTop add=javaInParen
260 endif 257 endif
261 258
262 " catch errors caused by wrong parenthesis 259 " catch errors caused by wrong parenthesis
263 syn region javaParenT transparent matchgroup=javaParen start="(" end=")" contains=@javaTop,javaParenT1 260 syn region javaParenT transparent matchgroup=javaParen start="(" end=")" contains=@javaTop,javaParenT1
268 syn region javaParenT transparent matchgroup=javaParen start="\[" end="\]" contains=@javaTop,javaParenT1 265 syn region javaParenT transparent matchgroup=javaParen start="\[" end="\]" contains=@javaTop,javaParenT1
269 syn region javaParenT1 transparent matchgroup=javaParen1 start="\[" end="\]" contains=@javaTop,javaParenT2 contained 266 syn region javaParenT1 transparent matchgroup=javaParen1 start="\[" end="\]" contains=@javaTop,javaParenT2 contained
270 syn region javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT contained 267 syn region javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT contained
271 syn match javaParenError "\]" 268 syn match javaParenError "\]"
272 269
273 JavaHiLink javaParenError javaError 270 hi def link javaParenError javaError
274 271
275 if exists("java_highlight_functions") 272 if exists("java_highlight_functions")
276 syn match javaLambdaDef "([a-zA-Z0-9_<>\[\], \t]*)\s*->" 273 syn match javaLambdaDef "([a-zA-Z0-9_<>\[\], \t]*)\s*->"
277 " needs to be defined after the parenthesis error catcher to work 274 " needs to be defined after the parenthesis error catcher to work
278 endif 275 endif
281 let java_minlines = 10 278 let java_minlines = 10
282 endif 279 endif
283 exec "syn sync ccomment javaComment minlines=" . java_minlines 280 exec "syn sync ccomment javaComment minlines=" . java_minlines
284 281
285 " The default highlighting. 282 " The default highlighting.
286 JavaHiLink javaLambdaDef Function 283 hi def link javaLambdaDef Function
287 JavaHiLink javaFuncDef Function 284 hi def link javaFuncDef Function
288 JavaHiLink javaVarArg Function 285 hi def link javaVarArg Function
289 JavaHiLink javaBraces Function 286 hi def link javaBraces Function
290 JavaHiLink javaBranch Conditional 287 hi def link javaBranch Conditional
291 JavaHiLink javaUserLabelRef javaUserLabel 288 hi def link javaUserLabelRef javaUserLabel
292 JavaHiLink javaLabel Label 289 hi def link javaLabel Label
293 JavaHiLink javaUserLabel Label 290 hi def link javaUserLabel Label
294 JavaHiLink javaConditional Conditional 291 hi def link javaConditional Conditional
295 JavaHiLink javaRepeat Repeat 292 hi def link javaRepeat Repeat
296 JavaHiLink javaExceptions Exception 293 hi def link javaExceptions Exception
297 JavaHiLink javaAssert Statement 294 hi def link javaAssert Statement
298 JavaHiLink javaStorageClass StorageClass 295 hi def link javaStorageClass StorageClass
299 JavaHiLink javaMethodDecl javaStorageClass 296 hi def link javaMethodDecl javaStorageClass
300 JavaHiLink javaClassDecl javaStorageClass 297 hi def link javaClassDecl javaStorageClass
301 JavaHiLink javaScopeDecl javaStorageClass 298 hi def link javaScopeDecl javaStorageClass
302 JavaHiLink javaBoolean Boolean 299 hi def link javaBoolean Boolean
303 JavaHiLink javaSpecial Special 300 hi def link javaSpecial Special
304 JavaHiLink javaSpecialError Error 301 hi def link javaSpecialError Error
305 JavaHiLink javaSpecialCharError Error 302 hi def link javaSpecialCharError Error
306 JavaHiLink javaString String 303 hi def link javaString String
307 JavaHiLink javaCharacter Character 304 hi def link javaCharacter Character
308 JavaHiLink javaSpecialChar SpecialChar 305 hi def link javaSpecialChar SpecialChar
309 JavaHiLink javaNumber Number 306 hi def link javaNumber Number
310 JavaHiLink javaError Error 307 hi def link javaError Error
311 JavaHiLink javaStringError Error 308 hi def link javaStringError Error
312 JavaHiLink javaStatement Statement 309 hi def link javaStatement Statement
313 JavaHiLink javaOperator Operator 310 hi def link javaOperator Operator
314 JavaHiLink javaComment Comment 311 hi def link javaComment Comment
315 JavaHiLink javaDocComment Comment 312 hi def link javaDocComment Comment
316 JavaHiLink javaLineComment Comment 313 hi def link javaLineComment Comment
317 JavaHiLink javaConstant Constant 314 hi def link javaConstant Constant
318 JavaHiLink javaTypedef Typedef 315 hi def link javaTypedef Typedef
319 JavaHiLink javaTodo Todo 316 hi def link javaTodo Todo
320 JavaHiLink javaAnnotation PreProc 317 hi def link javaAnnotation PreProc
321 318
322 JavaHiLink javaCommentTitle SpecialComment 319 hi def link javaCommentTitle SpecialComment
323 JavaHiLink javaDocTags Special 320 hi def link javaDocTags Special
324 JavaHiLink javaDocParam Function 321 hi def link javaDocParam Function
325 JavaHiLink javaDocSeeTagParam Function 322 hi def link javaDocSeeTagParam Function
326 JavaHiLink javaCommentStar javaComment 323 hi def link javaCommentStar javaComment
327 324
328 JavaHiLink javaType Type 325 hi def link javaType Type
329 JavaHiLink javaExternal Include 326 hi def link javaExternal Include
330 327
331 JavaHiLink htmlComment Special 328 hi def link htmlComment Special
332 JavaHiLink htmlCommentPart Special 329 hi def link htmlCommentPart Special
333 JavaHiLink javaSpaceError Error 330 hi def link javaSpaceError Error
334
335 delcommand JavaHiLink
336 331
337 let b:current_syntax = "java" 332 let b:current_syntax = "java"
338 333
339 if main_syntax == 'java' 334 if main_syntax == 'java'
340 unlet main_syntax 335 unlet main_syntax