Bash: Added support for escaped quotes (#2256)

Single and double quotes can be escaped via backslashes. Prism now supports these escapes.
PrismJS · Mar 21, 2020 · 328d0e0 · 328d0e0
1 parent 8119e57
commit 328d0e0
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 31 deletions.
diff --git a/components/prism-bash.js b/components/prism-bash.js
@@ -121,7 +121,8 @@
 			},
 			// “Normal” string
 			{
-				pattern: /(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1/,
+				pattern: /(^|[^\\](?:\\\\)*)(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\2)[^\\])*\2/,
+				lookbehind: true,
 				greedy: true,
 				inside: insideString
 			}

diff --git a/components/prism-bash.min.js b/components/prism-bash.min.js
diff --git a/components/prism-shell-session.js b/components/prism-shell-session.js
@@ -21,7 +21,7 @@
 		'info': {
 			// foo@bar:~/files$ exit
 			// foo@bar$ exit
-			pattern: /^(?:[^\r\n$#*!]+)(?=[$#])/m,
+			pattern: /^[^\r\n$#*!]+(?=[$#])/m,
 			alias: 'punctuation',
 			inside: {
 				'path': {
@@ -33,7 +33,7 @@
 			}
 		},
 		'command': {
-			pattern: RegExp(/[$#](?:[^\r\n'"<]|<<str>>)+/.source.replace(/<<str>>/g, strings)),
+			pattern: RegExp(/[$#](?:[^\\\r\n'"<]|\\.|<<str>>)+/.source.replace(/<<str>>/g, strings)),
 			greedy: true,
 			inside: {
 				'bash': {

diff --git a/components/prism-shell-session.min.js b/components/prism-shell-session.min.js
diff --git a/tests/languages/bash/string_feature.test b/tests/languages/bash/string_feature.test
@@ -10,61 +10,124 @@ bar'
 '"bar"'
 "$@"
 "${foo}"
+\\"foo"
+\'a # ' not a string
+
 << STRING_END
 foo
 bar
 STRING_END
+
 <<- STRING_END
 foo
 bar
 STRING_END
+
 <<   EOF
 foo $@
 bar
 EOF
+
 << 'EOF'
 'single quoted string'
 "double quoted string"
 EOF
+
 << "EOF"
 foo
 $bar
 EOF
+
 << STRING_END
 # comment
 STRING_END
+
 "  # comment  "
 
 ----------------------------------------------------
 
 [
-	["string", ["\"\""]],
-	["string", ["''"]],
-	["string", ["\"foo\""]],
-	["string", ["'foo'"]],
-	["string", ["\"foo\r\nbar\""]],
-	["string", ["'foo\r\nbar'"]],
-	["string", ["\"'foo'\""]],
-	["string", ["'\"bar\"'"]],
-	["string", [
-		"\"", ["variable", "$@"], "\""
-	]],
-	["string", [
-		"\"", ["variable", ["${foo}"]], "\""
-	]],
-	["operator", ["<<"]],
-	["string", ["STRING_END\r\nfoo\r\nbar\r\nSTRING_END"]],
-	["operator", ["<<-"]],
-	["string", ["STRING_END\r\nfoo\r\nbar\r\nSTRING_END"]],
-	["operator", ["<<"]],
-	["string", ["EOF\r\nfoo ", ["variable", "$@"], "\r\nbar\r\nEOF"]],
-	["operator", ["<<"]],
+	["string", [
+		"\"\""
+	]],
+	["string", [
+		"''"
+	]],
+	["string", [
+		"\"foo\""
+	]],
+	["string", [
+		"'foo'"
+	]],
+	["string", [
+		"\"foo\r\nbar\""
+	]],
+	["string", [
+		"'foo\r\nbar'"
+	]],
+	["string", [
+		"\"'foo'\""
+	]],
+	["string", [
+		"'\"bar\"'"
+	]],
+	["string", [
+		"\"",
+		["variable", "$@"],
+		"\""
+	]],
+	["string", [
+		"\"",
+		["variable", [
+			"${foo}"
+		]],
+		"\""
+	]],
+	["punctuation", "\\"],
+	["punctuation", "\\"],
+	["string", [
+		"\"foo\""
+	]],
+	["punctuation", "\\"],
+	"'a ",
+	["comment", "# ' not a string"],
+	["operator", [
+		"<<"
+	]],
+	["string", [
+		"STRING_END\r\nfoo\r\nbar\r\nSTRING_END"
+	]],
+	["operator", [
+		"<<-"
+	]],
+	["string", [
+		"STRING_END\r\nfoo\r\nbar\r\nSTRING_END"
+	]],
+	["operator", [
+		"<<"
+	]],
+	["string", [
+		"EOF\r\nfoo ",
+		["variable", "$@"],
+		"\r\nbar\r\nEOF"
+	]],
+	["operator", [
+		"<<"
+	]],
 	["string", "'EOF'\r\n'single quoted string'\r\n\"double quoted string\"\r\nEOF"],
-	["operator", ["<<"]],
+	["operator", [
+		"<<"
+	]],
 	["string", "\"EOF\"\r\nfoo\r\n$bar\r\nEOF"],
-	["operator", ["<<"]],
-	["string", ["STRING_END\r\n# comment\r\nSTRING_END"]],
-	["string", ["\"  # comment  \""]]
+	["operator", [
+		"<<"
+	]],
+	["string", [
+		"STRING_END\r\n# comment\r\nSTRING_END"
+	]],
+	["string", [
+		"\"  # comment  \""
+	]]
 ]
 
 ----------------------------------------------------

diff --git a/tests/languages/shell-session/command_string_feature.test b/tests/languages/shell-session/command_string_feature.test
@@ -13,6 +13,8 @@ foo
 bar
 STRING_END
 
+$ echo \'a # '
+
 ----------------------------------------------------
 
 [
@@ -58,7 +60,18 @@ STRING_END
 			]],
 			["string", "\"STRING_END\"\r\nfoo\r\nbar\r\nSTRING_END"]
 		]]
-	]]
+	]],
+
+	["command", [
+		["shell-symbol", "$"],
+		["bash", [
+			["builtin", "echo"],
+			["punctuation", "\\"],
+			"'a ",
+			["comment", "# "]
+		]]
+	]],
+	["output", "'"]
 ]
 
 ----------------------------------------------------