fixup: make only "else" in {{else}} the keywords, not "{{else}}" as w…

…hole
highlightjs · Apr 10, 2020 · a9ebc7b · a9ebc7b
1 parent 6a40323
commit a9ebc7b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/languages/handlebars.js b/src/languages/handlebars.js
@@ -160,8 +160,10 @@ export default function (hljs) {
         contains: [OPENING_BLOCK_MUSTACHE_CONTENTS],
       },
       {
-        className: 'keyword',
-        begin: /\{\{else\}\}/
+        className: 'template-tag',
+        begin: /\{\{(?=else\}\})/,
+        end: /\}\}/,
+        keywords: 'else'
       },
       {
         // closing block statement

diff --git a/test/markup/handlebars/else-variants.expect.txt b/test/markup/handlebars/else-variants.expect.txt
@@ -1,8 +1,8 @@
 <span class="xml">Multiple possibilities of using "else":
 
-</span><span class="hljs-template-tag">{{#<span class="hljs-name">helper</span>}}</span><span class="hljs-keyword">{{else}}</span><span class="xml">else-block</span><span class="hljs-template-tag">{{/<span class="hljs-name">helper</span>}}</span><span class="xml">
+</span><span class="hljs-template-tag">{{#<span class="hljs-name">helper</span>}}</span><span class="hljs-template-tag">{{<span class="hljs-keyword">else</span>}}</span><span class="xml">else-block</span><span class="hljs-template-tag">{{/<span class="hljs-name">helper</span>}}</span><span class="xml">
 ...
-</span><span class="hljs-template-tag">{{#<span class="hljs-name">helper</span>}}</span><span class="xml">block</span><span class="hljs-keyword">{{else}}</span><span class="xml">else-block</span><span class="hljs-template-tag">{{/<span class="hljs-name">helper</span>}}</span><span class="xml">
+</span><span class="hljs-template-tag">{{#<span class="hljs-name">helper</span>}}</span><span class="xml">block</span><span class="hljs-template-tag">{{<span class="hljs-keyword">else</span>}}</span><span class="xml">else-block</span><span class="hljs-template-tag">{{/<span class="hljs-name">helper</span>}}</span><span class="xml">
 ...
 </span><span class="hljs-template-variable">{{<span class="hljs-name">[else]</span>}}</span><span class="xml"> in brackets is a helper, not a keyword
 ...