Improvements to function, name and arguments

amadeus · amadeus · commit c8db23b12d96 · 2013-08-06T17:12:38.000-07:00
This commit is a first pass at adding a number of improvements to
functions and how they are detected.

Function declarations now have a higher granularity to expose the
function keyword, the name, the parenthesis, argument definitions, and
commas within the argument definitions.

I also added a new block type called jsFuncBlock which is unique from
jsBlock that defines a block region for function definitions.

This also ultimately differentiates function definitions from
jsFuncCall.
diff --git a/syntax/javascript.vim b/syntax/javascript.vim
@@ -34,7 +34,6 @@ syntax sync fromstart
 syntax match   jsNoise           /\%(:\|,\|\;\|\.\)/
 
 "" Program Keywords
-syntax keyword jsType           function
 syntax keyword jsStorageClass   const var let
 syntax keyword jsOperator       delete instanceof typeof void new in
 syntax match   jsOperator       /\(!\||\|&\|+\|-\|<\|>\|=\|%\|\/\|*\|\~\|\^\)/
@@ -185,9 +184,10 @@ endif "DOM/HTML/CSS
 "" Code blocks
 syntax cluster jsExpression contains=jsComment,jsLineComment,jsDocComment,jsStringD,jsStringS,jsRegexpString,jsNumber,jsFloat,jsThis,jsType,jsOperator,jsBoolean,jsNull,jsFunction,jsGlobalObjects,jsExceptions,jsFutureKeys,jsDomErrNo,jsDomNodeConsts,jsHtmlEvents,jsDotNotation,jsBracket,jsParen,jsBlock,jsParenError,jsFuncCall,jsUndefined,jsNan,jsKeyword,jsStorageClass,jsPrototype,jsBuiltins
 syntax cluster jsAll        contains=@jsExpression,jsLabel,jsConditional,jsRepeat,jsBranch,jsReturn,jsStatement,jsTernaryIf,jsNoise,jsException
-syntax region  jsBracket    matchgroup=jsBrackets start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
-syntax region  jsParen      matchgroup=jsParens   start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
-syntax region  jsBlock      matchgroup=jsBlocks   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBracket    matchgroup=jsBrackets     start="\[" end="\]" contains=@jsAll,jsParensErrB,jsParensErrC,jsBracket,jsParen,jsBlock,@htmlPreproc
+syntax region  jsParen      matchgroup=jsParens       start="("  end=")"  contains=@jsAll,jsParensErrA,jsParensErrC,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsBlock      matchgroup=jsBlocks       start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc
+syntax region  jsFuncBlock  matchgroup=jsFuncBlocks   start="{"  end="}"  contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock,@htmlPreproc contained
 syntax region  jsTernaryIf  matchgroup=jsTernaryIfOperator start=+?+  end=+:+  contains=@jsExpression
 
 "" catch errors caused by wrong parenthesis
@@ -203,18 +203,15 @@ if main_syntax == "javascript"
 endif
 
 if g:javascript_conceal == 1
-  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite conceal cchar=ƒ
+  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite conceal cchar=ƒ
 else
-  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName skipwhite
+  syntax match   jsFunction       /\<function\>/ nextgroup=jsFuncName,jsFuncArgs skipwhite
 endif
 
 syntax match   jsOpAssign       /=\@<!=/ nextgroup=jsFuncBlock skipwhite skipempty
-syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/
-
-"" Fold control
-if exists("b:javascript_fold")
-  syntax region  jsFuncBlock      contained matchgroup=jsFuncBlock start="{" end="}" contains=@jsAll,jsParensErrA,jsParensErrB,jsParen,jsBracket,jsBlock fold
-endif
+syntax match   jsFuncName       contained /\<[a-zA-Z_$][0-9a-zA-Z_$]*/ nextgroup=jsFuncArgs skipwhite
+syntax region  jsFuncArgs       contained matchgroup=jsFuncParens start='(' end=')' contains=jsFuncArgCommas nextgroup=jsFuncBlock keepend skipwhite
+syntax match   jsFuncArgCommas  contained ','
 
 " Define the default highlighting.
 " For version 5.7 and earlier: only when not done already
@@ -261,6 +258,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink jsFunction             Type
   HiLink jsFuncName             Function
   HiLink jsFuncCall             Function
+  HiLink jsFuncParens           Function
+  HiLink jsFuncArgCommas        Function
+  HiLink jsFuncArgs             Function
   HiLink jsError                Error
   HiLink jsParensError          Error
   HiLink jsParensErrA           Error
