heredoc delimiters are counted as part of the string

highlightjs · Oct 6, 2020 · 4a7629b · 4a7629b
1 parent 9cbbce8
commit 4a7629b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/languages/bash.js b/src/languages/bash.js
@@ -30,11 +30,15 @@ export default function(hljs) {
   };
   const HERE_DOC = {
     begin: /<<-?\s*(?=\w+)/,
-    starts: hljs.END_SAME_AS_BEGIN({
-      begin: /(\w+)/,
-      end: /(\w+)/,
-      className: 'string'
-    })
+    starts: {
+      contains: [
+        hljs.END_SAME_AS_BEGIN({
+          begin: /(\w+)/,
+          end: /(\w+)/,
+          className: 'string'
+        })
+      ]
+    }
   };
   const QUOTE_STRING = {
     className: 'string',

diff --git a/test/markup/bash/strings.expect.txt b/test/markup/bash/strings.expect.txt
@@ -2,9 +2,9 @@ SCRIPT_DIR=<span class="hljs-string">&quot;<span class="hljs-subst">$( cd <span
 TLS_DIR=<span class="hljs-string">&quot;<span class="hljs-variable">$SCRIPT_DIR</span>/../src/main/resources/tls&quot;</span>
 ROOT_DIR=<span class="hljs-string">&quot;<span class="hljs-variable">$SCRIPT_DIR</span>/..&quot;</span>
 
-jshell -s - &lt;&lt; EOF<span class="hljs-string">
+jshell -s - &lt;&lt; <span class="hljs-string">EOF
 System.out.printf(&quot;Procs: %s%n&quot;, getdata())
-</span>EOF
+EOF</span>
 
 jshell -s - &lt;&lt;&lt;<span class="hljs-string">&#x27;System.out.printf(&quot;Procs: %s%n&quot;, getdata())&#x27;</span>