From 22eeccd3cfe715f50ac9d80dae914a69ebad6a7b Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sun, 11 Nov 2018 17:32:18 +0100 Subject: syntax/dome_key.vim: Generalise `domeKeyDefinitionTrigger` This matcher should be able to work in `map`, `cmd`, and `mode`. --- syntax/dome_key.vim | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'syntax') diff --git a/syntax/dome_key.vim b/syntax/dome_key.vim index 374e364..9c1646a 100644 --- a/syntax/dome_key.vim +++ b/syntax/dome_key.vim @@ -5,12 +5,10 @@ endif syntax region domeKeyComment display start="#" end="$" contains=@Spell syntax region domeKeySpecialKey display start="<" end=">" contained contains=domeKeySpecialKeyKeyword -" syntax match domeKeyMapDefinition "map\s+" contains=domeKeyMapDefinitionStart,domeKeyMapDefinitionTrigger,domeKeyMapDefinitionAction -" syntax match domeKeyMapDefinitionStart contained "map" contains=domeKeyType -" syntax region domeKeyMapDefinition start="^" end="$" contains=domeKeyMapDefinitionStart,domeKeyDefinitionTrigger,domeKeyMapDefinitionAction -syntax match domeKeyMapDefinitionStart "^\s*map" contains=domeKeyType nextgroup=domeKeyDefinitionTrigger skipwhite -syntax match domeKeyDefinitionTrigger "\c\(<\(Up\|Play\|Down\)>\)\+" contained contains=domeKeySpecialKey nextgroup=domeKeyMapDefinitionAction skipwhite -" syntax match domeKeyMapDefinitionAction "[^\n]" contained contains=domeKeySpecialKey +syntax match domeKeyDefinitionTrigger "\c\(<\(Up\|Play\|Down\)>\)\+" contained contains=domeKeySpecialKey + +syntax match domeKeyMapDefinitionStart "^\s*map" contains=domeKeyType nextgroup=domeKeyMapDefinitionTrigger skipwhite +syntax match domeKeyMapDefinitionTrigger "" contained contains=domeKeyDefinitionTrigger nextgroup=domeKeyMapDefinitionAction skipwhite syntax match domeKeyMapDefinitionAction ".*$" contained contains=domeKeySpecialKey syntax keyword domeKeyType contained containedin=domeKeyMapDefinitionStart map cmd mode -- cgit v1.2.3