Merge branch 'master' into toml-comment

highlightjs · May 27, 2019 · d391717 · d391717
2 parents 30122a2 + d8808e9
commit d391717
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 1 deletion.
diff --git a/AUTHORS.en.txt b/AUTHORS.en.txt
@@ -276,3 +276,4 @@ Contributors:
 - Sean T. Allen <sean@monkeysnatchbanana.com>
 - Greg Cline <gregrcline@gmail.com>
 - Sejin Jeon <jinaidy93@gmail.com>
+- Taif Alimov <inzeppelin@gmail.com>
diff --git a/CHANGES.md b/CHANGES.md
@@ -5,6 +5,7 @@ New languages:
 New styles:
 
 Improvements:
+- Issue #1930 - fix markup for escaped quotes in Bash
 
 ## Version 9.15.6
 New languages:

diff --git a/src/languages/bash.js b/src/languages/bash.js
@@ -15,7 +15,7 @@ function(hljs) {
   };
   var QUOTE_STRING = {
     className: 'string',
-    begin: /"/, end: /"/,
+    begin: /(?<!\\)"/, end: /(?<!\\)"/,
     contains: [
       hljs.BACKSLASH_ESCAPE,
       VAR,

diff --git a/test/detect/bash/default.txt b/test/detect/bash/default.txt
@@ -13,3 +13,5 @@ fi
 genApacheConf(){
  echo -e "# Host ${HOME_DIR}$1/$2 :"
 }
+
+echo '"quoted"' | tr -d \" > text.txt
diff --git a/test/markup/bash/escaped-quote.expect.txt b/test/markup/bash/escaped-quote.expect.txt
@@ -0,0 +1,2 @@
+<span class="hljs-comment"># Escaped double-quote is not a string</span>
+<span class="hljs-built_in">echo</span> <span class="hljs-string">'"quoted"'</span> | tr -d \" &gt; text.txt
diff --git a/test/markup/bash/escaped-quote.txt b/test/markup/bash/escaped-quote.txt
@@ -0,0 +1,2 @@
+# Escaped double-quote is not a string
+echo '"quoted"' | tr -d \" > text.txt