Add some more supports for the Java import syntax
Static imports are now highlight in green for functions and in yellow for the nested static classes. A minor bug has been fixed, because '.' was used instead of '\.' in the regexes. Given that the 'magic' option is set by default, it matched always any character instead of '.'.
This commit is contained in:
@@ -30,10 +30,12 @@ syntax match javaOdysseyType "\%(\<\u\w*\>\%(<\%(\u\w*\|,\|\s\|<\|>
|
||||
syntax match javaOdysseyConstructor "\%(\<\u\w*\>\)\%(<\%(\u\w*\|,\|\s\|<\|>\)*>\)\=\%((\|\[\)"me=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseySeparator
|
||||
syntax match javaOdysseyMethod "\<\l\w*\>("me=e-1 containedin=javaParenT,javaParenT1,javaParenT2
|
||||
syntax match javaOdysseyCasting "(\<\u\w*\>\%(<\%(\u\w*\|,\|\s\|<\|>\)\+>\)\=\%(\[\]\)\=)"hs=s+1,he=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator
|
||||
syntax match javaOdysseyImport "\%(\<import\>\s\+\%(\l\+.\)\+\)\@<=\%(\u\w*\)\%(\s*;\)\@="
|
||||
syntax match javaOdysseyImport "\%(\<import\>\s\+\%(\l\+\.\)\+\)\@<=\%(\u\w*\)\%(\s*;\)\@="
|
||||
syntax match javaOdysseyStaticMethod "\%(\<import\>\s\+\<static\>\s\+\%(\w\+\.\)\+\)\@<=\%(\l\w*\)\%(\s*;\)\@="
|
||||
syntax match javaOdysseyStaticClass "\%(\<import\>\s\+\<static\>\s\+\%(\w\+\.\)\+\)\@<=\%(\u\w*\)\%(\s*;\)\@="
|
||||
syntax match javaOdysseyExtends "\%(\<extends\>\s\+\)\@<=\%(\<\u\w*\>\)\%(<\%(\u\w*\|,\|\s\|<\|>\)*>\)\=" contains=javaOdysseyGeneric,javaOdysseySeparator
|
||||
syntax match javaOdysseyImplements "\%(\<implements\>\s\+\)\@<=\%(\<\u\w*\>\)\%(<\%(\u\w*\|,\|\s\|<\|>\)*>\)\=" contains=javaOdysseyGeneric,javaOdysseySeparator
|
||||
syntax match javaOdysseyDottedClass "\<\u\w*\>."me=e-1 containedin=javaParenT,javaParenT1,javaParenT2
|
||||
syntax match javaOdysseyDottedClass "\<\u\w*\>\."me=e-1 containedin=javaParenT,javaParenT1,javaParenT2
|
||||
syntax match javaOdysseyEnumValue "\<[A-Z][_A-Z0-9]\+\>" containedin=javaParenT,javaParenT1,javaParenT2,javaLabelRegion
|
||||
syntax match javaOdysseyEnumConstructor "\<[A-Z][_A-Z0-9]\+\>("me=e-1 containedin=javaParenT,javaParenT1,javaParenT2
|
||||
|
||||
|
||||
@@ -267,6 +267,8 @@ call s:l( 'javaOdysseyInterface', 'Type')
|
||||
call s:l( 'javaOdysseyEnum', 'Type')
|
||||
call s:l( 'javaOdysseyCasting', 'Type')
|
||||
call s:l( 'javaOdysseyImport', 'Type')
|
||||
call s:l( 'javaOdysseyStaticMethod', 'Function')
|
||||
call s:l( 'javaOdysseyStaticClass', 'Type')
|
||||
call s:l( 'javaOdysseyExtends', 'Type')
|
||||
call s:l( 'javaOdysseyImplements', 'Type')
|
||||
call s:l( 'javaOdysseyArray', 'Normal')
|
||||
|
||||
Reference in New Issue
Block a user