From 440d24805262b76483dcc671926d1c7a1421faa0 Mon Sep 17 00:00:00 2001 From: Ludovic Koenig Date: Mon, 30 Sep 2019 13:17:46 +0200 Subject: [PATCH 1/2] Modify the highlight used by enum values Enum values are now highlighted with the `Type` color. In order to achieve it, the some enum syntax groups have been deleted to make the process easier. Now all uppercase words are considered to be enum values. --- after/syntax/java.vim | 3 +-- colors/odyssey.vim | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/after/syntax/java.vim b/after/syntax/java.vim index d10f112..c19ec2b 100644 --- a/after/syntax/java.vim +++ b/after/syntax/java.vim @@ -36,8 +36,6 @@ 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 javaOdysseyDotOperator "\<\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 syntax match javaOdysseyCasting "(\<\u\w*\>\%(<\%(\u\w*\|,\|\s\|<\|>\)\+>\)\=\%(\[\]\)\=)"hs=s+1,he=e-1 containedin=javaParenT,javaParenT1,javaParenT2 contains=javaOdysseyGeneric,javaOdysseyArray,javaOdysseySeparator syntax match javaOdysseyGetClass "\%(\\s\+\%(\w\+\.\)\+\)\@<=\%(\u\w*\)\%(\s*;\)\@=" syntax match javaOdysseyGetStaticMethod "\%(\\s\+\\s\+\%(\w\+\.\)\+\)\@<=\%(\l\w*\)\%(\s*;\)\@=" @@ -46,6 +44,7 @@ syntax match javaOdysseyExtends "\%(\\s\+\)\@<=\%(\<\u\w*\>\ syntax match javaOdysseyImplements "\%(\\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 match javaOdysseyEnumValue "\<\u\u*\>" 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 diff --git a/colors/odyssey.vim b/colors/odyssey.vim index 9be438d..2e71b92 100644 --- a/colors/odyssey.vim +++ b/colors/odyssey.vim @@ -286,8 +286,7 @@ call s:l( 'javaOdysseyMethod', 'Function') call s:l( 'javaOdysseyThis', 'Special') call s:l( 'javaOdysseyArrow', 'Operator') call s:l( 'javaOdysseyLombok', 'Statement') -call s:l( 'javaOdysseyEnumValue', 'Constant') -call s:l('javaOdysseyEnumConstructor', 'Constant') +call s:l( 'javaOdysseyEnumValue', 'Type') call s:l( 'javaOdysseyMethodRef', 'Function') call s:l( 'javaOdysseyClassMethodRef', 'Type') From 7349154ab76abd1b04fc4bb0564d6ea136064ca1 Mon Sep 17 00:00:00 2001 From: Ludovic Koenig Date: Mon, 30 Sep 2019 13:21:24 +0200 Subject: [PATCH 2/2] Update the CHANGELOG with the last changes --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4be792d..0cb60c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,13 @@ project adheres to [Semantic Versioning]. ### Changed +- Changed the syntax groups used to match Java enum values: + + + `javaOdysseyEnumConstructor` has been removed. + + + `javaOdysseyEnumValue` does now match all uppercase words and it is linked + to the `Type` highlight group. + - Changed the color scheme for Ruby files: + Ruby booleans, 'nil', numbers and string delimitiers are using the `Normal`