Bash: Add support for quoted command substitution. Fix #1287

PrismJS · Mar 3, 2018 · 63fc215 · 63fc215
1 parent de8ebe2
commit 63fc215
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 8 deletions.
diff --git a/components/prism-bash.js b/components/prism-bash.js
@@ -22,6 +22,7 @@
 			// Command Substitution
 			{
 				pattern: /\$\([^)]+\)|`[^`]+`/,
+				greedy: true,
 				inside: {
 					variable: /^\$\(|^`|\)$|`$/
 				}
@@ -48,7 +49,7 @@
 				inside: insideString
 			},
 			{
-				pattern: /(["'])(?:\\[\s\S]|(?!\1)[^\\])*\1/,
+				pattern: /(["'])(?:\\[\s\S]|\$\([^)]+\)|`[^`]+`|(?!\1)[^\\])*\1/,
 				greedy: true,
 				inside: insideString
 			}
@@ -72,6 +73,7 @@
 	};
 
 	var inside = insideString.variable[1].inside;
+	inside.string = Prism.languages.bash.string;
 	inside['function'] = Prism.languages.bash['function'];
 	inside.keyword = Prism.languages.bash.keyword;
 	inside.boolean = Prism.languages.bash.boolean;

diff --git a/components/prism-bash.min.js b/components/prism-bash.min.js
diff --git a/tests/languages/bash/command_substitution_feature.test b/tests/languages/bash/command_substitution_feature.test
@@ -1,31 +1,42 @@
-$(echo foo)
-`echo foo`
-"$(echo foo) bar"
+$(echo "foo")
+`echo "foo"`
+"$(echo "foo") bar"
+"`echo "foo"` bar"
 
 ----------------------------------------------------
 
 [
 	["variable", [
 		["variable", "$("],
 		["keyword", "echo"], 
-		" foo",
+		["string", ["\"foo\""]],
 		["variable", ")"]
 	]],
 	["variable", [
 		["variable", "`"],
 		["keyword", "echo"], 
-		" foo",
+		["string", ["\"foo\""]],
 		["variable", "`"]
 	]],
 	["string", [
 		"\"",
 		["variable", [
 			["variable", "$("],
 			["keyword", "echo"], 
-			" foo",
+			["string", ["\"foo\""]],
 			["variable", ")"]
 		]],
 		" bar\""
+	]],
+	["string", [
+		"\"",
+		["variable", [
+			["variable", "`"],
+			["keyword", "echo"],
+			["string", ["\"foo\""]],
+			["variable", "`"]
+		]],
+		" bar\""
 	]]
 ]