Skip to content

Commit 6a66641

Browse files
committed
syntax: add str templates
1 parent bcfa8c9 commit 6a66641

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

es6.sample.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,11 @@ export default class SkinnedMesh extends THREE.Mesh {
1010
//...
1111
let $camera = camera;
1212
const $top = camera.map(c => c + 1);
13-
14-
function *name (arg) { yield arg; },
13+
14+
function *name (arg) {
15+
console.log(`Got args ${...arg}.`);
16+
yield arg;
17+
}
1518

1619
super.update();
1720
}

syntax/javascript.vim

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ syntax region javaScriptComment start="/\*" end="\*/" contains=@Spell
5353
syntax match javaScriptSpecial "\\\d\d\d\|\\."
5454
syntax region javaScriptString start=+"+ skip=+\\\\\|\\"+ end=+"\|$+ contains=javaScriptSpecial,@htmlPreproc
5555
syntax region javaScriptString start=+'+ skip=+\\\\\|\\'+ end=+'\|$+ contains=javaScriptSpecial,@htmlPreproc
56+
syntax region javascriptTemplateInternal start=/\${/ end=/}/ contains=javaScriptString
57+
syntax region javascriptTemplate start=/`/ skip=/\\\\\|\\`\|\n/ end=/`\|$/ contains=javaScriptSpecial,javascriptTemplateInternal nextgroup=@javascriptComments,@javascriptSymbols
5658
syntax match javaScriptSpecialCharacter "'\\.'"
5759
syntax match javaScriptNumber "-\=\<\d\+L\=\>\|0[xX][0-9a-fA-F]\+\>"
5860
syntax region javaScriptRegexpString start=+/[^/*]+me=e-1 skip=+\\\\\|\\/+ end=+/[gim]\{0,2\}\s*$+ end=+/[gim]\{0,2\}\s*[;.,)\]}]+me=e-1 contains=@htmlPreproc oneline
@@ -63,7 +65,7 @@ syntax match javascriptDollar "\$"
6365
" syntax keyword javaScriptGlobal self top parent
6466

6567
" Code blocks"
66-
syntax cluster javaScriptAll contains=javaScriptComment,javaScriptLineComment,javaScriptDocComment,javaScriptString,javaScriptRegexpString,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
68+
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
6769

6870
if main_syntax == "javascript"
6971
syntax sync clear
@@ -123,6 +125,8 @@ if version >= 508 || !exists("did_javascript_syn_inits")
123125
HiLink javaScriptDocParam Function
124126

125127
HiLink javaScriptString String
128+
HiLink javascriptTemplateInternal Label
129+
HiLink javascriptTemplate String
126130
HiLink javaScriptRegexpString String
127131

128132
HiLink javaScriptNumber Number

0 commit comments

Comments
 (0)