From 34fbaa57925e466dfc905c09f240b95996f1074b Mon Sep 17 00:00:00 2001 From: Ludovic Koenig Date: Tue, 30 Apr 2019 22:09:52 +0200 Subject: [PATCH] Take into account the Java diamond operator Up to now the following text 'new ArrayList<>()' was not highlighted correctly. The modification that has been done highlights it like a normal type name. --- after/syntax/java.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/after/syntax/java.vim b/after/syntax/java.vim index 1857b4d..912d353 100644 --- a/after/syntax/java.vim +++ b/after/syntax/java.vim @@ -22,8 +22,8 @@ syntax match javaOdysseyInterface "\%(\\s\+\)\@<=\<\u\w*\>" syntax match javaOdysseyArray "\[\]" contained syntax match javaOdysseyGeneric "[><]" contained syntax match javaOdysseySeparator "," contained -syntax match javaOdysseyType "\%(\<\u\w*\>\%(<\%(\w\|,\|\s\|<\|>\)\+>\)\=\%(\[\]\)\=\)\%(\s*\<\l\w*\>\)\@=" containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator -syntax match javaOdysseyConstructor "\%(\<\u\w*\>\)\%(<\%(\w\|,\|\s\|<\|>\)\+>\)\=\%((\|\[\)"me=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseySeparator +syntax match javaOdysseyType "\%(\<\u\w*\>\%(<\%(\w\|,\|\s\|<\|>\)*>\)\=\%(\[\]\)\=\)\%(\s*\<\l\w*\>\)\@=" containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator +syntax match javaOdysseyConstructor "\%(\<\u\w*\>\)\%(<\%(\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*\>\%(<\%(\w\|,\|\s\|<\|>\)\+>\)\=\%(\[\]\)\=)"hs=s+1,he=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator " }}}