Browse files

Version 0.5

1, Provided the htmlJavaScript cluster to HTML syntax (syntax/html.vim).
2, Try the fold on JavaScript, I found it is really abnormal, and useless for JavaScript. So I just remove the fold from the TODO list.

And there is a syntax highlight problem in html.vim
If you want to make the JavaScript inside HTML highlight properly, please commented out the follows lines in html.vim.
<pre>
" HtmlHiLink javaScript		    Special
" HtmlHiLink javaScriptExpression   javaScript
</pre>
  • Loading branch information...
1 parent 15b5fd9 commit a8df50f2d2940fc20e05793847efdd02de2df630 Yi Zhao committed with vim-scripts Mar 20, 2006
Showing with 28 additions and 20 deletions.
  1. +28 −20 syntax/javascript.vim
View
48 syntax/javascript.vim
@@ -1,14 +1,13 @@
" Vim syntax file
" Language: JavaScript
" Maintainer: Yi Zhao <zzlinux AT hotmail DOT com>
-" Last Change: 2006 March 18
-" Version: 0.4.1
+" Last Change: 2006 March 20
+" Version: 0.5
" Based On: javascript.vim from Claudio Fleiner <claudio@fleiner.com>
-" Changes: Minor fix with jsLabel and jsRegexpString
+" Changes: export @htmlJavaScript to html.vim
"
" TODO
" - internal function hightlight
-" - code fold support
"
if !exists("main_syntax")
@@ -23,6 +22,8 @@ endif
" Drop fold if it set but vim doesn't support it.
if version < 600 && exists("javaScript_fold")
unlet javaScript_fold
+"else
+" let javaScript_fold = 'true'
endif
syntax case match
@@ -35,7 +36,7 @@ syntax match jsNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
syntax keyword jsCommentTodo TODO FIXME XXX TBD contained
syntax region jsLineComment start=+\/\/+ end=/$/ contains=jsCommentTodo oneline
-syntax region jsComment start="/\*" end="\*/" contains=jsCommentTodo,jsLineComment
+syntax region jsComment start="/\*" end="\*/" contains=jsCommentTodo,jsLineComment fold
syntax match jsLabel /\(?\s*\)\@<!\<\w\+\(\s*:\)\@=/
@@ -48,30 +49,17 @@ syntax keyword jsNull null
"" Statement Keywords
syntax keyword jsConditional if else
-syntax keyword jsRepeat while for
+syntax keyword jsRepeat do while for
syntax keyword jsBranch break continue switch case default return
syntax keyword jsStatement try catch throw with
syntax keyword jsGlobalObjects Array Boolean Date Error Function java JavaArray JavaClass JavaObject JavaPackage Math netscape Number Object Packages RegExp String sun
-if exists("javaScript_fold")
- syntax match jsFunction "\<function\>"
- syntax region jsFunctionFold start="\<function\>.*[^};]$" end="^\z1}.*$" transparent fold keepend
-
- syntax sync match jsSync grouphere jsFunctionFold "\<function\>"
- syntax sync match jsSync grouphere NONE "^}"
-
- setlocal foldmethod=syntax
- setlocal foldtext=getline(v:foldstart)
-else
- syntax keyword jsFunction function
-endif
-
syntax sync fromstart
syntax sync maxlines=100
" Code blocks
-syntax cluster jsAll contains=jsComment,jsLineComment,jsSpecial,jsStringD,jsStringS,jsNumber,jsRegexpString,jsBoolean,jsFunction,jsFunctionFold,jsConditional,jsRepeat,jsBranch,jsOperator,jsType,jsStatement,jsBoolean,jsGlobalObjects
+syntax cluster jsAll contains=jsComment,jsLineComment,jsSpecial,jsStringD,jsStringS,jsNumber,jsRegexpString,jsBoolean,jsFunction,jsConditional,jsRepeat,jsBranch,jsOperator,jsType,jsStatement,jsBoolean,jsGlobalObjects
syntax region jsBracket matchgroup=jsBracket transparent start="\[" end="\]" contains=@jsAll,jsBracket,jsParen,jsBlock
syntax region jsParen matchgroup=jsParen transparent start="(" end=")" contains=@jsAll,jsParen,jsBracket,jsBlock
syntax region jsBlock matchgroup=jsBlcok transparent start="{" end="}" contains=ALL
@@ -83,6 +71,21 @@ if main_syntax == "javascript"
syntax sync ccomment jsComment
endif
+if exists("javaScript_fold")
+ syntax match jsFunction /\<function\>/
+ syntax match jsFuncFoldStart /\([=:^]\s*\)\@<=\<function\>\(\s*\w*\s*\)\@=/ nextgroup=jsFuncFoldParen skipwhite fold
+ syntax region jsFuncFoldParen start="(" end=")" contained nextgroup=jsFuncBlock skipwhite contains=@jsAll,jsParen fold
+ syntax region jsFuncFoldBlock start="{" end="}\([\s;]*$\)\@=" skipwhite contains=ALL contained fold
+
+ syntax sync match jsSync grouphere jsFuncFoldBlock "\<function\>"
+ syntax sync match jsSync grouphere NONE "^}"
+
+ setlocal foldmethod=syntax
+ setlocal foldtext=getline(v:foldstart)
+else
+ syntax keyword jsFunction function
+endif
+
" Define the default highlighting.
" For version 5.7 and earlier: only when not done already
" For version 5.8 and later: only when an item doesn't have highlighting yet
@@ -120,6 +123,11 @@ if version >= 508 || !exists("did_javascript_syn_inits")
delcommand HiLink
endif
+" Define the htmlJavaScript for HTML syntax html.vim
+syntax cluster htmlJavaScript contains=@jsAll,jsBracket,jsParen,jsBlock,jsParenError
+" Removing javaScriptExpression, while it didn't work because we are loaded first.
+"syntax clear javaScriptExpression
+
let b:current_syntax = "javascript"
if main_syntax == 'javascript'
unlet main_syntax

0 comments on commit a8df50f

Please sign in to comment.