update dotfiles

[~madcoder/dotfiles.git] / vim / syntax / javascript.vim

diff --git a/vim/syntax/javascript.vim b/vim/syntax/javascript.vim
index 944ce9f..dacf406 100644 (file)
--- a/vim/syntax/javascript.vim
+++ b/vim/syntax/javascript.vim
@@ -7,7 +7,7 @@
 "              (ss) repaired several quoting and grouping glitches
 "              (ss) fixed regex parsing issue with multiple qualifiers [gi]
 "              (ss) additional factoring of keywords, globals, and members
 "              (ss) repaired several quoting and grouping glitches
 "              (ss) fixed regex parsing issue with multiple qualifiers [gi]
 "              (ss) additional factoring of keywords, globals, and members

-" Last Change: 2006 Jun 19
+" Last Change: 2010 Mar 25

 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded


@@ -28,16 +28,15 @@ if version < 600 && exists("javaScript_fold")
   unlet javaScript_fold
 endif
 
   unlet javaScript_fold
 endif
 

-syn case ignore
-
-
+syn region  javaScriptTpl              start=+<@+ms=b end=+@>+me=e contains=javaScriptCommentTodo,javaScriptLineComment,javaScriptCommentSkip,javaScriptComment,javaScriptSpecial,javaScriptStringD,javaScriptStringS,,javaScriptSpecialCharacter,javaScriptNumber,javaScriptRegexpString,javaScriptConditional,javaScriptRepeat,javaScriptBranch,javaScriptOperator,javaScriptType,javaScriptStatement,javaScriptBoolean,javaScriptNull,javaScriptIdentifier,javaScriptLabel,javaScriptException,javaScriptMessage,javaScriptGlobal,javaScriptMember,javaScriptDeprecated,javaScriptReserved,javaScriptTplMark keepend
+syn match   javaScriptTplMark          "\(<@[=#]\?\|@>\)" contained

 syn keyword javaScriptCommentTodo      TODO FIXME XXX TBD contained
 syn match   javaScriptLineComment      "\/\/.*" contains=@Spell,javaScriptCommentTodo
 syn match   javaScriptCommentSkip      "^[ \t]*\*\($\|[ \t]\+\)"
 syn region  javaScriptComment         start="/\*"  end="\*/" contains=@Spell,javaScriptCommentTodo
 syn match   javaScriptSpecial         "\\\d\d\d\|\\."
 syn keyword javaScriptCommentTodo      TODO FIXME XXX TBD contained
 syn match   javaScriptLineComment      "\/\/.*" contains=@Spell,javaScriptCommentTodo
 syn match   javaScriptCommentSkip      "^[ \t]*\*\($\|[ \t]\+\)"
 syn region  javaScriptComment         start="/\*"  end="\*/" contains=@Spell,javaScriptCommentTodo
 syn match   javaScriptSpecial         "\\\d\d\d\|\\."

-syn region  javaScriptStringD         start=+"+  skip=+\\\\\|\\"+  end=+"\|$+  contains=javaScriptSpecial,@htmlPreproc
-syn region  javaScriptStringS         start=+'+  skip=+\\\\\|\\'+  end=+'\|$+  contains=javaScriptSpecial,@htmlPreproc
+syn region  javaScriptStringD         start=+"+  skip=+\\\\\|\\"+  end=+"\|$+  contains=javaScriptSpecial,@htmlPreproc,javaScriptTplMark
+syn region  javaScriptStringS         start=+'+  skip=+\\\\\|\\'+  end=+'\|$+  contains=javaScriptSpecial,@htmlPreproc,javaScriptTplMark

 
 syn match   javaScriptSpecialCharacter "'\\.'"
 syn match   javaScriptNumber          "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
 
 syn match   javaScriptSpecialCharacter "'\\.'"
 syn match   javaScriptNumber          "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"


@@ -51,7 +50,7 @@ syn keyword javaScriptType            Array Boolean Date Function Number Object String Reg
 syn keyword javaScriptStatement        return with
 syn keyword javaScriptBoolean          true false
 syn keyword javaScriptNull             null undefined
 syn keyword javaScriptStatement        return with
 syn keyword javaScriptBoolean          true false
 syn keyword javaScriptNull             null undefined

-syn keyword javaScriptIdentifier       arguments this var
+syn keyword javaScriptIdentifier       arguments this var let const

 syn keyword javaScriptLabel            case default
 syn keyword javaScriptException                try catch finally throw
 syn keyword javaScriptMessage          alert confirm prompt status
 syn keyword javaScriptLabel            case default
 syn keyword javaScriptException                try catch finally throw
 syn keyword javaScriptMessage          alert confirm prompt status


@@ -105,7 +104,6 @@ if version >= 508 || !exists("did_javascript_syn_inits")
   HiLink javaScriptRepeat           Repeat
   HiLink javaScriptBranch           Conditional
   HiLink javaScriptOperator         Operator
   HiLink javaScriptRepeat           Repeat
   HiLink javaScriptBranch           Conditional
   HiLink javaScriptOperator         Operator

-  HiLink javaScriptType                     Type

   HiLink javaScriptStatement        Statement
   HiLink javaScriptFunction         Function
   HiLink javaScriptBraces           Function
   HiLink javaScriptStatement        Statement
   HiLink javaScriptFunction         Function
   HiLink javaScriptBraces           Function