Merge the changes for the Java method references

It closes #10 on Github.
This commit is contained in:
Ludovic Koenig
2019-09-07 15:40:40 +02:00
3 changed files with 7 additions and 0 deletions
+3
View File
@@ -17,6 +17,9 @@ project adheres to [Semantic Versioning].
+ Some new syntax groups for types and functions have been added.
- Add the support for the Java method references by using the `Type` and
`Function` highlight groups.
- Adds three Java syntax groups in order to be able to fold multiline
comments, `import` statement blocks and `import static` statement blocks.
+2
View File
@@ -44,6 +44,8 @@ syntax match javaOdysseyGetStaticMethod "\%(\<import\>\s\+\<static\>\s\+\%(\w\
syntax match javaOdysseyGetStaticClass "\%(\<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 javaOdysseyMethodRef "::\<\l\w*\>"ms=s+2 containedin=javaParenT,javaParenT1,javaParenT2
syntax match javaOdysseyClassMethodRef "\<\u\w*\>::"me=e-2 containedin=javaParenT,javaParenT1,javaParenT2
syntax region javaOdysseyComment start=+/\*+ end=+\*/+ transparent fold keepend
syntax region javaOdysseyImport start=/\%(^import\)\@<=\s.\+;/ end=+^\s*$+ transparent fold keepend
syntax region javaOdysseyImportStatic start=/\%(^import static\)\@<=\s.\+;/ end=+^\s*$+ transparent fold keepend
+2
View File
@@ -282,6 +282,8 @@ call s:l( 'javaOdysseyArrow', 'Operator')
call s:l( 'javaOdysseyLombok', 'Statement')
call s:l( 'javaOdysseyEnumValue', 'Constant')
call s:l('javaOdysseyEnumConstructor', 'Constant')
call s:l( 'javaOdysseyMethodRef', 'Function')
call s:l( 'javaOdysseyClassMethodRef', 'Type')
if exists('g:odyssey_java_javadoc') && g:odyssey_java_javadoc != 0
if exists('g:java_ignore_javadoc')