@@ -167,16 +167,18 @@ endif "DOM/HTML/CSS
167
167
168
168
169
169
" " Code blocks
170
- 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
170
+ 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
171
171
172
172
if main_syntax == " javascript"
173
173
syntax sync clear
174
174
syntax sync ccomment javaScriptComment minlines =200
175
175
" syntax sync match javaScriptHighlight grouphere javaScriptBlock /{/
176
176
endif
177
177
178
- syntax match javaScriptFunction / \< function\> / nextgroup =javaScriptFuncName skipwhite
179
- syntax region javaScriptFuncName contained matchgroup =javaScriptFuncName start =/ \% (\$\|\w\) *\s *(/ end =/ )/ contains =javaScriptLineComment,javaScriptComment nextgroup =javaScriptFuncBlock skipwhite skipempty
178
+ syntax keyword javaScriptFuncKeyword function contained
179
+ syntax region javaScriptFuncDef start =" function" end =" \( [^)]*\) " contains =javaScriptFuncKeyword,javaScriptFuncArg keepend
180
+ syntax match javaScriptFuncArg " \( ([^()]*)\) " contains =javaScriptParens,javaScriptFuncComma contained
181
+ syntax match javaScriptFuncComma / ,/ contained
180
182
" syntax region javaScriptFuncBlock contained matchgroup=javaScriptFuncBlock start="{" end="}" contains=@javaScriptAll,javaScriptParensErrA,javaScriptParensErrB,javaScriptParen,javaScriptBracket,javaScriptBlock fold
181
183
182
184
syn match javaScriptBraces " [{}\[\] ]"
@@ -195,6 +197,8 @@ function! JavaScriptFold()
195
197
setl foldtext = FoldText ()
196
198
endfunction
197
199
200
+ au FileType javascript call JavaScriptFold ()
201
+
198
202
" }}}
199
203
200
204
" Define the default highlighting.
@@ -232,7 +236,7 @@ if version >= 508 || !exists("did_javascript_syn_inits")
232
236
HiLink javaScriptIdentifier Identifier
233
237
HiLink javaScriptRepeat Repeat
234
238
HiLink javaScriptStatement Statement
235
- HiLink javaScriptFunction Function
239
+ HiLink javaScriptFuncKeyword Function
236
240
HiLink javaScriptMessage Keyword
237
241
HiLink javaScriptDeprecated Exception
238
242
HiLink javaScriptError Error
@@ -274,10 +278,12 @@ if version >= 508 || !exists("did_javascript_syn_inits")
274
278
HiLink javaScriptAjaxMethods Exception
275
279
HiLink javaScriptAjaxProperties Type
276
280
277
- HiLink javaScriptFuncName Title
281
+ HiLink javaScriptFuncDef Title
282
+ HiLink javaScriptFuncArg Special
283
+ HiLink javaScriptFuncComma Operator
278
284
279
285
HiLink javaScriptHtmlEvents Special
280
- HiLink javaScriptHtmlElemProperties Type
286
+ HiLink javaScriptHtmlElemProperties Type
281
287
282
288
HiLink javaScriptEventListenerKeywords Keyword
283
289
0 commit comments