mirror of
https://github.com/jelera/vim-javascript-syntax.git
synced 2025-12-11 23:22:02 +08:00
Merge pull request #12 from billychan/master
Highlight for function arguments
This commit is contained in:
@@ -171,7 +171,7 @@ endif "DOM/HTML/CSS
|
|||||||
|
|
||||||
|
|
||||||
"" Code blocks
|
"" Code blocks
|
||||||
syntax cluster javaScriptAll contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptStringD,javaScriptStringS,javaScriptRegexpString,javaScriptNumber,javaScriptFloat,javaScriptLabel,javaScriptSource,javaScriptType,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFunction,javaScriptConditional,javaScriptGlobal,javaScriptRepeat,javaScriptBranch,javaScriptStatement,javaScriptGlobalObjects,javaScriptMessage,javaScriptIdentifier,javaScriptExceptions,javaScriptReserved,javaScriptDeprecated,javaScriptDomErrNo,javaScriptDomNodeConsts,javaScriptHtmlEvents,javaScriptDotNotation,javaScriptBrowserObjects,javaScriptDOMObjects,javaScriptAjaxObjects,javaScriptPropietaryObjects,javaScriptDOMMethods,javaScriptHtmlElemProperties,javaScriptDOMProperties,javaScriptEventListenerKeywords,javaScriptEventListenerMethods,javaScriptAjaxProperties,javaScriptAjaxMethods
|
syntax cluster javaScriptAll contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptStringD,javaScriptStringS,javaScriptRegexpString,javaScriptNumber,javaScriptFloat,javaScriptLabel,javaScriptSource,javaScriptType,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFuncKeyword,javaScriptConditional,javaScriptGlobal,javaScriptRepeat,javaScriptBranch,javaScriptStatement,javaScriptGlobalObjects,javaScriptMessage,javaScriptIdentifier,javaScriptExceptions,javaScriptReserved,javaScriptDeprecated,javaScriptDomErrNo,javaScriptDomNodeConsts,javaScriptHtmlEvents,javaScriptDotNotation,javaScriptBrowserObjects,javaScriptDOMObjects,javaScriptAjaxObjects,javaScriptPropietaryObjects,javaScriptDOMMethods,javaScriptHtmlElemProperties,javaScriptDOMProperties,javaScriptEventListenerKeywords,javaScriptEventListenerMethods,javaScriptAjaxProperties,javaScriptAjaxMethods,javaScriptFuncArg
|
||||||
|
|
||||||
if main_syntax == "javascript"
|
if main_syntax == "javascript"
|
||||||
syntax sync clear
|
syntax sync clear
|
||||||
@@ -179,8 +179,10 @@ if main_syntax == "javascript"
|
|||||||
" syntax sync match javaScriptHighlight grouphere javaScriptBlock /{/
|
" syntax sync match javaScriptHighlight grouphere javaScriptBlock /{/
|
||||||
endif
|
endif
|
||||||
|
|
||||||
syntax match javaScriptFunction /\<function\>/ nextgroup=javaScriptFuncName skipwhite
|
syntax keyword javaScriptFuncKeyword function contained
|
||||||
syntax region javaScriptFuncName contained matchgroup=javaScriptFuncName start=/\%(\$\|\w\)*\s*(/ end=/)/ contains=javaScriptLineComment,javaScriptComment nextgroup=javaScriptFuncBlock skipwhite skipempty
|
syntax region javaScriptFuncDef start="function" end="\([^)]*\)" contains=javaScriptFuncKeyword,javaScriptFuncArg keepend
|
||||||
|
syntax match javaScriptFuncArg "\(([^()]*)\)" contains=javaScriptParens,javaScriptFuncComma contained
|
||||||
|
syntax match javaScriptFuncComma /,/ contained
|
||||||
" syntax region javaScriptFuncBlock contained matchgroup=javaScriptFuncBlock start="{" end="}" contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock fold
|
" syntax region javaScriptFuncBlock contained matchgroup=javaScriptFuncBlock start="{" end="}" contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock fold
|
||||||
|
|
||||||
syn match javaScriptBraces "[{}\[\]]"
|
syn match javaScriptBraces "[{}\[\]]"
|
||||||
@@ -199,6 +201,8 @@ function! JavaScriptFold()
|
|||||||
setl foldtext=FoldText()
|
setl foldtext=FoldText()
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
|
au FileType javascript call JavaScriptFold()
|
||||||
|
|
||||||
" }}}
|
" }}}
|
||||||
|
|
||||||
" Define the default highlighting.
|
" Define the default highlighting.
|
||||||
@@ -236,7 +240,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
|
|||||||
HiLink javaScriptIdentifier Identifier
|
HiLink javaScriptIdentifier Identifier
|
||||||
HiLink javaScriptRepeat Repeat
|
HiLink javaScriptRepeat Repeat
|
||||||
HiLink javaScriptStatement Statement
|
HiLink javaScriptStatement Statement
|
||||||
HiLink javaScriptFunction Function
|
HiLink javaScriptFuncKeyword Function
|
||||||
HiLink javaScriptMessage Keyword
|
HiLink javaScriptMessage Keyword
|
||||||
HiLink javaScriptDeprecated Exception
|
HiLink javaScriptDeprecated Exception
|
||||||
HiLink javaScriptError Error
|
HiLink javaScriptError Error
|
||||||
@@ -278,7 +282,9 @@ if version >= 508 || !exists("did_javascript_syn_inits")
|
|||||||
HiLink javaScriptAjaxMethods Exception
|
HiLink javaScriptAjaxMethods Exception
|
||||||
HiLink javaScriptAjaxProperties Type
|
HiLink javaScriptAjaxProperties Type
|
||||||
|
|
||||||
HiLink javaScriptFuncName Title
|
HiLink javaScriptFuncDef Title
|
||||||
|
HiLink javaScriptFuncArg Special
|
||||||
|
HiLink javaScriptFuncComma Operator
|
||||||
|
|
||||||
HiLink javaScriptHtmlEvents Special
|
HiLink javaScriptHtmlEvents Special
|
||||||
HiLink javaScriptHtmlElemProperties Type
|
HiLink javaScriptHtmlElemProperties Type
|
||||||
|
|||||||
Reference in New Issue
Block a user