Merge pull request #792 from zeitgeist87/BashString

Fix regression in Bash strings
PrismJS · Oct 5, 2015 · bd275c2 · bd275c2
2 parents 7c7ab4e + 256c3e1
commit bd275c2
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/components/prism-bash.js b/components/prism-bash.js
@@ -12,16 +12,14 @@
 			lookbehind: true
 		},
 		'string': [
+			//Support for Here-Documents https://en.wikipedia.org/wiki/Here_document
 			{
-				pattern: /"(?:\\?[\s\S])*?"/g,
+				pattern: /((?:^|[^<])<<\s*)(?:"|')?(\w+?)(?:"|')?\s*\r?\n(?:[\s\S])*?\r?\n\2/g,
+				lookbehind: true,
 				inside: bashVars
 			},
-			// Single quote strings cannot have variables inside
-			/'(?:\\?[\s\S])*?'/g,
-			// Support for Here-Documents https://en.wikipedia.org/wiki/Here_document
 			{
-				pattern: /(<<\s*)(\w+?)\s*\r?\n(?:[\s\S])*?\r?\n\2/g,
-				lookbehind: true,
+				pattern: /("|')(?:\\?[\s\S])*?\1/g,
 				inside: bashVars
 			}
 		],

diff --git a/components/prism-bash.min.js b/components/prism-bash.min.js
diff --git a/tests/languages/bash/string_feature.test b/tests/languages/bash/string_feature.test
@@ -6,6 +6,8 @@
 bar"
 'foo
 bar'
+"'foo'"
+'"bar"'
 "$@"
 "${foo}"
 << STRING_END
@@ -16,16 +18,26 @@ STRING_END
 foo $@
 bar
 EOF
+<< 'EOF'
+'single quoted string'
+"double quoted string"
+EOF
+<< "EOF"
+foo
+bar
+EOF
 
 ----------------------------------------------------
 
 [
 	["string", ["\"\""]],
-	["string", "''"],
+	["string", ["''"]],
 	["string", ["\"foo\""]],
-	["string", "'foo'"],
+	["string", ["'foo'"]],
 	["string", ["\"foo\r\nbar\""]],
-	["string", "'foo\r\nbar'"],
+	["string", ["'foo\r\nbar'"]],
+	["string", ["\"'foo'\""]],
+	["string", ["'\"bar\"'"]],
 	["string", [
 		"\"", ["variable", "$@"], "\""
 	]],
@@ -37,7 +49,13 @@ EOF
 	["string", ["STRING_END\r\nfoo\r\nbar\r\nSTRING_END"]],
 	["operator", "<"],
 	["operator", "<"],
-	["string", ["EOF\r\nfoo ", ["variable", "$@"], "\r\nbar\r\nEOF"]]
+	["string", ["EOF\r\nfoo ", ["variable", "$@"], "\r\nbar\r\nEOF"]],
+	["operator", "<"],
+	["operator", "<"],
+	["string", ["'EOF'\r\n'single quoted string'\r\n\"double quoted string\"\r\nEOF"]],
+	["operator", "<"],
+	["operator", "<"],
+	["string", ["\"EOF\"\r\nfoo\r\nbar\r\nEOF"]]
 ]
 
 ----------------------------------------------------