Mercurial > vim

comparison runtime/syntax/java.vim @ 14421:2f7e67dd088c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update runtime files. commit https://github.com/vim/vim/commit/91f84f6e11cd879d43d651c0903d85bff95f0716 Author: Bram Moolenaar <Bram@vim.org> Date: Sun Jul 29 15:07:52 2018 +0200 Update runtime files.
author Christian Brabandt <cb@256bit.org>
date Sun, 29 Jul 2018 15:15:06 +0200
parents 46763b01cd9a
children c58baa6d6dda
comparison
equal deleted inserted replaced
14420:9114cf8a3e07 14421:2f7e67dd088c
1 " Vim syntax file 1 " Vim syntax file
2 " Language: Java 2 " Language: Java
3 " Maintainer: Claudio Fleiner <claudio@fleiner.com> 3 " Maintainer: Claudio Fleiner <claudio@fleiner.com>
4 " URL: http://www.fleiner.com/vim/syntax/java.vim 4 " URL: https://github.com/fleiner/vim/blob/master/runtime/syntax/java.vim
5 " Last Change: 2015 March 01 5 " Last Change: 2018 July 26
6 6
7 " Please check :help java.vim for comments on some of the options available. 7 " Please check :help java.vim for comments on some of the options available.
8 8
9 " quit when a syntax file was already loaded 9 " quit when a syntax file was already loaded
10 if !exists("main_syntax") 10 if !exists("main_syntax")
26 syn match javaOK "\.\.\." 26 syn match javaOK "\.\.\."
27 27
28 " 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
29 syn match javaError2 "#\|=<" 29 syn match javaError2 "#\|=<"
30 hi def link javaError2 javaError 30 hi def link javaError2 javaError
31
32
33 31
34 " keyword definitions 32 " keyword definitions
35 syn keyword javaExternal native package 33 syn keyword javaExternal native package
36 syn match javaExternal "\<import\>\(\s\+static\>\)\?" 34 syn match javaExternal "\<import\>\(\s\+static\>\)\?"
37 syn keyword javaError goto const 35 syn keyword javaError goto const
38 syn keyword javaConditional if else switch 36 syn keyword javaConditional if else switch
39 syn keyword javaRepeat while for do 37 syn keyword javaRepeat while for do
40 syn keyword javaBoolean true false 38 syn keyword javaBoolean true false
41 syn keyword javaConstant null 39 syn keyword javaConstant null
42 syn keyword javaTypedef this super 40 syn keyword javaTypedef this super
43 syn keyword javaOperator new instanceof 41 syn keyword javaOperator var new instanceof
44 syn keyword javaType boolean char byte short int long float double 42 syn keyword javaType boolean char byte short int long float double
45 syn keyword javaType void 43 syn keyword javaType void
46 syn keyword javaStatement return 44 syn keyword javaStatement return
47 syn keyword javaStorageClass static synchronized transient volatile final strictfp serializable 45 syn keyword javaStorageClass static synchronized transient volatile final strictfp serializable
48 syn keyword javaExceptions throw try catch finally 46 syn keyword javaExceptions throw try catch finally
52 " to differentiate the keyword class from MyClass.class we use a match here 50 " to differentiate the keyword class from MyClass.class we use a match here
53 syn match javaTypedef "\.\s*\<class\>"ms=s+1 51 syn match javaTypedef "\.\s*\<class\>"ms=s+1
54 syn keyword javaClassDecl enum 52 syn keyword javaClassDecl enum
55 syn match javaClassDecl "^class\>" 53 syn match javaClassDecl "^class\>"
56 syn match javaClassDecl "[^.]\s*\<class\>"ms=s+1 54 syn match javaClassDecl "[^.]\s*\<class\>"ms=s+1
57 syn match javaAnnotation "@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>\(([^)]*)\)\=" contains=javaString 55 syn match javaAnnotation "@\([_$a-zA-Z][_$a-zA-Z0-9]*\.\)*[_$a-zA-Z][_$a-zA-Z0-9]*\>" contains=javaString
58 syn match javaClassDecl "@interface\>" 56 syn match javaClassDecl "@interface\>"
59 syn keyword javaBranch break continue nextgroup=javaUserLabelRef skipwhite 57 syn keyword javaBranch break continue nextgroup=javaUserLabelRef skipwhite
60 syn match javaUserLabelRef "\k\+" contained 58 syn match javaUserLabelRef "\k\+" contained
61 syn match javaVarArg "\.\.\." 59 syn match javaVarArg "\.\.\."
62 syn keyword javaScopeDecl public protected private abstract 60 syn keyword javaScopeDecl public protected private abstract
63 61
62 " Java Modules(Since Java 9, for "module-info.java" file)
63 if fnamemodify(bufname("%"), ":t") == "module-info.java"
64 syn keyword javaModuleStorageClass module transitive
65 syn keyword javaModuleStmt open requires exports opens uses provides
66 syn keyword javaModuleExternal to with
67 syn cluster javaTop add=javaModuleStorageClass,javaModuleStmt,javaModuleExternal
68 endif
69
64 if exists("java_highlight_java_lang_ids") 70 if exists("java_highlight_java_lang_ids")
65 let java_highlight_all=1 71 let java_highlight_all=1
66 endif 72 endif
67 if exists("java_highlight_all") || exists("java_highlight_java") || exists("java_highlight_java_lang") 73 if exists("java_highlight_all") || exists("java_highlight_java") || exists("java_highlight_java_lang")
68 " java.lang.* 74 " java.lang.*
69 syn match javaLangClass "\<System\>" 75 syn match javaLangClass "\<System\>"
70 syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException 76 syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
71 syn cluster javaTop add=javaR_JavaLang 77 syn cluster javaTop add=javaR_JavaLang
72 syn cluster javaClasses add=javaR_JavaLang 78 syn cluster javaClasses add=javaR_JavaLang
294 hi def link javaAssert Statement 300 hi def link javaAssert Statement
295 hi def link javaStorageClass StorageClass 301 hi def link javaStorageClass StorageClass
296 hi def link javaMethodDecl javaStorageClass 302 hi def link javaMethodDecl javaStorageClass
297 hi def link javaClassDecl javaStorageClass 303 hi def link javaClassDecl javaStorageClass
298 hi def link javaScopeDecl javaStorageClass 304 hi def link javaScopeDecl javaStorageClass
305
299 hi def link javaBoolean Boolean 306 hi def link javaBoolean Boolean
300 hi def link javaSpecial Special 307 hi def link javaSpecial Special
301 hi def link javaSpecialError Error 308 hi def link javaSpecialError Error
302 hi def link javaSpecialCharError Error 309 hi def link javaSpecialCharError Error
303 hi def link javaString String 310 hi def link javaString String
327 334
328 hi def link htmlComment Special 335 hi def link htmlComment Special
329 hi def link htmlCommentPart Special 336 hi def link htmlCommentPart Special
330 hi def link javaSpaceError Error 337 hi def link javaSpaceError Error
331 338
339 if fnamemodify(bufname("%"), ":t") == "module-info.java"
340 hi def link javaModuleStorageClass StorageClass
341 hi def link javaModuleStmt Statement
342 hi def link javaModuleExternal Include
343 endif
344
332 let b:current_syntax = "java" 345 let b:current_syntax = "java"
333 346
334 if main_syntax == 'java' 347 if main_syntax == 'java'
335 unlet main_syntax 348 unlet main_syntax
336 endif 349 endif