From 7f04baf7be518abd728c28c7aac73c7d7cbc9c29 Mon Sep 17 00:00:00 2001 From: Lorenzo Ruiz Date: Fri, 3 Jul 2015 14:00:00 +0200 Subject: [PATCH 1/3] Update javascript.vim --- syntax/javascript.vim | 1 + 1 file changed, 1 insertion(+) diff --git a/syntax/javascript.vim b/syntax/javascript.vim index d4f6a9c..712eec5 100644 --- a/syntax/javascript.vim +++ b/syntax/javascript.vim @@ -174,6 +174,7 @@ syntax match javaScriptFuncArg "\(([^()]*)\)" contains=javaScriptParen syntax match javaScriptFuncComma /,/ contained syntax match javaScriptFuncEq /=/ contained syntax region javaScriptFuncDef start="\" end="\([^)]*\)" contains=javaScriptFuncKeyword,javaScriptFuncArg keepend +syntax match jsFunctionKey /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained "}}} " Braces, Parens, symbols, colons {{{ syntax match javaScriptBraces "[{}\[\]]" From ed6a363cd7bcbb774a72cd99876b4fcc397930e2 Mon Sep 17 00:00:00 2001 From: Lorenzo Ruiz Date: Fri, 3 Jul 2015 14:08:42 +0200 Subject: [PATCH 2/3] Added support for object keys --- syntax/javascript.vim | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/syntax/javascript.vim b/syntax/javascript.vim index 712eec5..b2db9ef 100644 --- a/syntax/javascript.vim +++ b/syntax/javascript.vim @@ -174,7 +174,8 @@ syntax match javaScriptFuncArg "\(([^()]*)\)" contains=javaScriptParen syntax match javaScriptFuncComma /,/ contained syntax match javaScriptFuncEq /=/ contained syntax region javaScriptFuncDef start="\" end="\([^)]*\)" contains=javaScriptFuncKeyword,javaScriptFuncArg keepend -syntax match jsFunctionKey /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained +syntax match javaScriptObjectKey /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey +syntax match javaScriptFunctionKey /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained "}}} " Braces, Parens, symbols, colons {{{ syntax match javaScriptBraces "[{}\[\]]" From 539dd143786559f26e8fb03bc7221e366d8d6336 Mon Sep 17 00:00:00 2001 From: Lorenzo Ruiz Date: Fri, 3 Jul 2015 14:15:01 +0200 Subject: [PATCH 3/3] Fixed typo --- syntax/javascript.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syntax/javascript.vim b/syntax/javascript.vim index b2db9ef..1d4beca 100644 --- a/syntax/javascript.vim +++ b/syntax/javascript.vim @@ -174,7 +174,7 @@ syntax match javaScriptFuncArg "\(([^()]*)\)" contains=javaScriptParen syntax match javaScriptFuncComma /,/ contained syntax match javaScriptFuncEq /=/ contained syntax region javaScriptFuncDef start="\" end="\([^)]*\)" contains=javaScriptFuncKeyword,javaScriptFuncArg keepend -syntax match javaScriptObjectKey /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=jsFunctionKey +syntax match javaScriptObjectKey /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\)\@=/ contains=javaScriptFunctionKey syntax match javaScriptFunctionKey /\<[a-zA-Z_$][0-9a-zA-Z_$]*\>\(\s*:\s*function\s*\)\@=/ contained "}}} " Braces, Parens, symbols, colons {{{