add template substitution

Author: isRuslan

es6.sample.js

@@ -12,7 +12,7 @@ export default class SkinnedMesh extends THREE.Mesh {
     const $top = camera.map(c => c + 1);
 
     function *name (arg) {
-      console.log(`Got args ${...arg}.`);
+      console.log(`${args.foo ? `first-${args.foo}` : null}`);
       yield arg;
     }
 

ftdetect/es6.vim

@@ -1,2 +1,2 @@
 " set all `es6` extensions to javascript
-au BufRead,BufNewFile *.{es6,es6.js} set filetype=javascript   
+au BufRead,BufNewFile *.{es6,es6.js} set filetype=javascript

syntax/javascript.vim

@@ -1,8 +1,8 @@
 " Vim syntax file
 "      Language: JavaScript
 "    Maintainer: Ruslan Ismagilov <https://github.com/isRuslan>
-"       Version: 1.0.2
-"       Credits: Kao Wei-Ko(othree), Zhao Yi, Claudio Fleiner, Scott Shattuck 
+"       Version: 2.0.3
+"       Credits: Kao Wei-Ko(othree), Zhao Yi, Claudio Fleiner, Scott Shattuck
 "                (This file is based on their hard work)
 
 if !exists("main_syntax")
@@ -25,7 +25,7 @@ syntax sync fromstart
 syntax match shebang "^#!.*"
 hi link shebang Comment
 
-" Statement Keywords 
+" Statement Keywords
 syntax keyword javaScriptSource         import export
 syntax keyword javaScriptIdentifier     arguments this let const var void yield
 syntax keyword javaScriptOperator       delete new instanceof typeof
@@ -43,28 +43,28 @@ syntax keyword javaScriptGlobalObjects  Array Boolean Date Function Math Number
 syntax keyword javaScriptExceptions     try catch throw finally Error EvalError RangeError ReferenceError SyntaxError TypeError URIError
 syntax keyword javaScriptReserved       abstract enum int short boolean export interface static byte extends long super char final native synchronized class float package throws goto private transient debugger implements protected volatile double import public
 
-" Comments 
+" Comments
 syntax keyword javaScriptCommentTodo      TODO FIXME XXX TBD contained
 syntax match   javaScriptLineComment      "\/\/.*" contains=@Spell,javaScriptCommentTodo
 syntax match   javaScriptCommentSkip      "^[ \t]*\*\($\|[ \t]\+\)"
 syntax region  javaScriptComment          start="/\*"  end="\*/" contains=@Spell,javaScriptCommentTodo
 
-" Strings, Numbers and Regex Highlight 
-syntax match   javaScriptSpecial          "\\\d\d\d\|\\."
-syntax region  javaScriptString	          start=+"+  skip=+\\\\\|\\"+  end=+"\|$+	contains=javaScriptSpecial,@htmlPreproc
-syntax region  javaScriptString	          start=+'+  skip=+\\\\\|\\'+  end=+'\|$+	contains=javaScriptSpecial,@htmlPreproc
-syntax region  javascriptTemplateInternal  start=/\${/ end=/}/ contains=javaScriptString
-syntax region  javascriptTemplate          start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/ contains=javaScriptSpecial,javascriptTemplateInternal nextgroup=@javascriptComments,@javascriptSymbols 
+" Strings, Numbers and Regex Highlight
+syntax match   javaScriptSpecial           "\\\d\d\d\|\\."
+syntax region  javaScriptString            start=+"+  skip=+\\\\\|\\"+  end=+"\|$+	contains=javaScriptSpecial,@htmlPreproc
+syntax region  javascriptTemplate          start=/`/  skip=/\\\\\|\\`\|\n/  end=/`\|$/ contains=javascriptTemplateSubstitution nextgroup=@javascriptComments,@javascriptSymbols skipwhite skipempty
+syntax region  javascriptTemplateSubstitution matchgroup=javascriptTemplateSB contained start=/\${/ end=/}/ contains=@javascriptExpression
+
 syntax match   javaScriptSpecialCharacter "'\\.'"
 syntax match   javaScriptNumber           "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
 syntax region  javaScriptRegexpString     start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gim]\{0,2\}\s*$+ end=+/[gim]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline
 syntax match   javaScriptFloat            /\<-\=\%(\d\+\.\d\+\|\d\+\.\|\.\d\+\)\%([eE][+-]\=\d\+\)\=\>/
 syntax match   javascriptDollar           "\$"
 
-" No need? 
+" No need?
 " syntax keyword javaScriptGlobal         self top parent
 
-" Code blocks"
+" Code blocks
 syntax cluster javaScriptAll       contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptString,javaScriptRegexpString,javascriptTemplate,javaScriptNumber,javaScriptFloat,javascriptDollar,javaScriptLabel,javaScriptSource,javaScriptWebAPI,javaScriptOperator,javaScriptBoolean,javaScriptNull,javaScriptFuncKeyword,javaScriptConditional,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"
@@ -73,7 +73,7 @@ if main_syntax == "javascript"
 	" syntax sync match javaScriptHighlight grouphere javaScriptBlock /{/
 endif
 
-" Function and arguments highlighting 
+" Function and arguments highlighting
 syntax keyword javaScriptFuncKeyword     function contained
 syntax region  javaScriptFuncExp         start=/\w\+\s\==\s\=function\>/ end="\([^)]*\)" contains=javaScriptFuncEq,javaScriptFuncKeyword,javaScriptFuncArg keepend
 syntax match   javaScriptFuncArg         "\(([^()]*)\)" contains=javaScriptParens,javaScriptFuncComma contained
@@ -98,7 +98,7 @@ function! JavaScriptFold()
 	syntax region foldBraces start=/{/ end=/}/ transparent fold keepend extend
 endfunction
 
-" Highlight links 
+" Highlight links
 " 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
@@ -125,9 +125,10 @@ if version >= 508 || !exists("did_javascript_syn_inits")
 	HiLink javaScriptDocParam               Function
 
 	HiLink javaScriptString                 String
-  HiLink javascriptTemplateInternal       Label
   HiLink javascriptTemplate               String
+  HiLink javascriptTemplateSubstitution   Label
 	HiLink javaScriptRegexpString           String
+  HiLink javascriptTemplateSB             javascriptTemplateSubstitution
 
 	HiLink javaScriptNumber                 Number
 	HiLink javaScriptFloat                  Number