Merge pull request pangloss#127 from pangloss/feature/add-jsfunctionkey

goatslacker · goatslacker · commit e1c29c7fc86b · 2013-08-17T11:32:59.000-07:00
Adds jsFunctionKey highlight group

jsFunctionKey is used to target object keys that have functions as a value
Fixes jsObjectKey, removes dashes in Identifiers
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
@@ -94,7 +94,8 @@ syntax region  jsRegexpString    start=+\(\(\(return\|case\)\s\+\)\@<=\|\(\([)\]
 syntax match   jsNumber          /\<-\=\d\+L\=\>\|\<0[xX]\x\+\>/
 syntax keyword jsNumber          Infinity
 syntax match   jsFloat           /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
-syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$\-]*\(\s*:\)\@=/
+syntax match   jsObjectKey       /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\)\@=/ contains=jsFunctionKey
+syntax match   jsFunctionKey     /\<[a-zA-Z_$][0-9a-zA-Z_$]*\(\s*:\s*function\s*\)\@=/ contained
 
 "" JavaScript Prototype
 syntax keyword jsPrototype      prototype
