From 4e8c85fae3c655cc78f89262b23569400ca200b3 Mon Sep 17 00:00:00 2001 From: Ludovic Koenig Date: Tue, 30 Apr 2019 22:19:36 +0200 Subject: [PATCH] Fix some highlight overflows In some case, the highlight of some generic types was overflowing: public void method(List strings, List integers) {} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ overflow of the first parameter It corrects this behavior by restraining the type highlight before the parameter name. --- after/syntax/java.vim | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/after/syntax/java.vim b/after/syntax/java.vim index 912d353..c80c859 100644 --- a/after/syntax/java.vim +++ b/after/syntax/java.vim @@ -22,9 +22,9 @@ 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*\>\%(<\%(\u\w*\|,\|\s\|<\|>\)*>\)\=\%(\[\]\)\=\)\%(\s*\<\l\w*\>\)\@=" containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator +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*\>\%(<\%(\w\|,\|\s\|<\|>\)\+>\)\=\%(\[\]\)\=)"hs=s+1,he=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator +syntax match javaOdysseyCasting "(\<\u\w*\>\%(<\%(\u\w*\|,\|\s\|<\|>\)\+>\)\=\%(\[\]\)\=)"hs=s+1,he=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator " }}} " vim: foldmethod=marker