From 0fd7c51522ba4ac0adfd8b4b5e8238e5b9688ca2 Mon Sep 17 00:00:00 2001 From: Ludovic Koenig Date: Sun, 5 May 2019 12:17:46 +0200 Subject: [PATCH] Add syntax for Java extends & implements keywords The names that followed the 'extends' and 'implements' keywords were not properly colored. Two new syntax have been added to deal with that case. Note: Only one could have done the job. --- after/syntax/java.vim | 2 ++ colors/odyssey.vim | 2 ++ 2 files changed, 4 insertions(+) diff --git a/after/syntax/java.vim b/after/syntax/java.vim index b0ff150..475f265 100644 --- a/after/syntax/java.vim +++ b/after/syntax/java.vim @@ -30,6 +30,8 @@ syntax match javaOdysseyConstructor "\%(\<\u\w*\>\)\%(<\%(\u\w*\|,\|\s\|<\|>\) 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 "\%(\\s\+\%(\l\+.\)\+\)\@<=\%(\u\w*\)\s*;" +syntax match javaOdysseyExtends "\%(\\s\+\)\@<=\%(\<\u\w*\>\)\%(<\%(\u\w*\|,\|\s\|<\|>\)*>\)\=" contains=javaOdysseyGeneric,javaOdysseySeparator +syntax match javaOdysseyImplements "\%(\\s\+\)\@<=\%(\<\u\w*\>\)\%(<\%(\u\w*\|,\|\s\|<\|>\)*>\)\=" contains=javaOdysseyGeneric,javaOdysseySeparator " }}} " vim: foldmethod=marker diff --git a/colors/odyssey.vim b/colors/odyssey.vim index 0f490fa..bda7dc6 100644 --- a/colors/odyssey.vim +++ b/colors/odyssey.vim @@ -266,6 +266,8 @@ call s:l( 'javaOdysseyInterface', 'Type') call s:l( 'javaOdysseyEnum', 'Type') call s:l( 'javaOdysseyCasting', 'Type') call s:l( 'javaOdysseyImport', 'Type') +call s:l( 'javaOdysseyExtends', 'Type') +call s:l( 'javaOdysseyImplements', 'Type') call s:l( 'javaOdysseyArray', 'Normal') call s:l( 'javaOdysseyGeneric', 'Normal') call s:l( 'javaOdysseyType', 'Type')