Bash: Fixed single-quoted strings (#2792)

components/prism-bash.js

@@ -133,10 +133,25 @@
 			},
 			// “Normal” string
 			{
-				pattern: /(^|[^\\](?:\\\\)*)(["'])(?:\\[\s\S]|\$\([^)]+\)|\$(?!\()|`[^`]+`|(?!\2)[^\\`$])*\2/,
+				// https://www.gnu.org/software/bash/manual/html_node/Double-Quotes.html
+				pattern: /(^|[^\\](?:\\\\)*)"(?:\\[\s\S]|\$\([^)]+\)|\$(?!\()|`[^`]+`|[^"\\`$])*"/,
 				lookbehind: true,
 				greedy: true,
 				inside: insideString
+			},
+			{
+				// https://www.gnu.org/software/bash/manual/html_node/Single-Quotes.html
+				pattern: /(^|[^$\\])'[^']*'/,
+				lookbehind: true,
+				greedy: true
+			},
+			{
+				// https://www.gnu.org/software/bash/manual/html_node/ANSI_002dC-Quoting.html
+				pattern: /\$'(?:[^'\\]|\\[\s\S])*'/,
+				greedy: true,
+				inside: {
+					'entity': insideString.entity
+				}
 			}
 		],
 		'environment': {

components/prism-shell-session.js

@@ -5,17 +5,18 @@
 
 	var strings = [
 		// normal string
-		// 1 capturing group
-		/(["'])(?:\\[\s\S]|\$\([^)]+\)|\$(?!\()|`[^`]+`|(?!\1)[^\\`$])*\1/.source,
+		/"(?:\\[\s\S]|\$\([^)]+\)|\$(?!\()|`[^`]+`|[^"\\`$])*"/.source,
+		/'[^']*'/.source,
+		/\$'(?:[^'\\]|\\[\s\S])*'/.source,
 
 		// here doc
 		// 2 capturing groups
-		/<<-?\s*(["']?)(\w+)\2\s[\s\S]*?[\r\n]\3/.source
+		/<<-?\s*(["']?)(\w+)\1\s[\s\S]*?[\r\n]\2/.source
 	].join('|');
 
 	Prism.languages['shell-session'] = {
 		'command': {
-			pattern: RegExp(/^(?:[^\s@:$#*!/\\]+@[^\s@:$#*!/\\]+(?::[^\0-\x1F$#*?"<>:;|]+)?|[^\0-\x1F$#*?"<>:;|]+)?[$#](?:[^\\\r\n'"<]|\\.|<<str>>)+/.source.replace(/<<str>>/g, function () { return strings; }), 'm'),
+			pattern: RegExp(/^(?:[^\s@:$#*!/\\]+@[^\s@:$#*!/\\]+(?::[^\0-\x1F$#*?"<>:;|]+)?|[^\0-\x1F$#*?"<>:;|]+)?[$#](?:[^\\\r\n'"<$]|\\.|\$(?!')|<<str>>)+/.source.replace(/<<str>>/g, function () { return strings; }), 'm'),
 			greedy: true,
 			inside: {
 				'info': {

tests/languages/bash/assign-left_feature.test

@@ -8,13 +8,15 @@ foo+=('xyz')
 	["assign-left", ["foo"]],
 	["operator", ["="]],
 	["number", "12"],
+
 	["assign-left", ["bar"]],
 	["operator", ["+="]],
-	["string", ["'xyz'"]],
+	["string", "'xyz'"],
+
 	["assign-left", ["foo"]],
 	["operator", ["+="]],
 	["punctuation", "("],
-	["string", ["'xyz'"]],
+	["string", "'xyz'"],
 	["punctuation", ")"]
 ]
 

tests/languages/bash/entities_in_strings_feature.test

@@ -1,24 +1,63 @@
-'1\a2\b3\c4\e5\f6\n7\r8\t9\v'
-'1234\056789'
-'abc\xdef'
-'123\456789'
-'\uABCDEFG'
+$'1\a2\b3\c4\e5\f6\n7\r8\t9\v'
+$'1234\056789'
+$'123\456789'
+"abc\xdef"
+"\uABCDEFG"
 "a\"b"
 
+'1\a2\b3\c4\e5\f6\n7\r8\t9\v'
+
 ----------------------------------------------------
 
 [
 	["string", [
-		"'1", ["entity", "\\a"], "2", ["entity", "\\b"], "3", ["entity", "\\c"],
-		"4", ["entity", "\\e"], "5", ["entity", "\\f"], "6", ["entity", "\\n"],
-		"7", ["entity", "\\r"], "8", ["entity", "\\t"], "9", ["entity", "\\v"],
+		"$'1",
+		["entity", "\\a"],
+		"2",
+		["entity", "\\b"],
+		"3",
+		["entity", "\\c"],
+		"4",
+		["entity", "\\e"],
+		"5",
+		["entity", "\\f"],
+		"6",
+		["entity", "\\n"],
+		"7",
+		["entity", "\\r"],
+		"8",
+		["entity", "\\t"],
+		"9",
+		["entity", "\\v"],
 		"'"
 	]],
-	["string", ["'1234", ["entity", "\\056"], "789'"]],
-	["string", ["'abc", ["entity", "\\xde"], "f'"]],
-	["string", ["'123", ["entity", "\\456"], "789'"]],
-	["string", ["'", ["entity", "\\uABCD"], "EFG'"]],
-	["string", ["\"a", ["entity", "\\\""], "b\""]]
+	["string", [
+		"$'1234",
+		["entity", "\\056"],
+		"789'"
+	]],
+	["string", [
+		"$'123",
+		["entity", "\\456"],
+		"789'"
+	]],
+	["string", [
+		"\"abc",
+		["entity", "\\xde"],
+		"f\""
+	]],
+	["string", [
+		"\"",
+		["entity", "\\uABCD"],
+		"EFG\""
+	]],
+	["string", [
+		"\"a",
+		["entity", "\\\""],
+		"b\""
+	]],
+
+	["string", "'1\\a2\\b3\\c4\\e5\\f6\\n7\\r8\\t9\\v'"]
 ]
 
 ----------------------------------------------------

tests/languages/bash/issue2436.test

@@ -0,0 +1,24 @@
+echo $'module.exports = {\n  extends: [\n    // add more generic rulesets here, such as:\n    // 'eslint:recommended',\n    "plugin:vue/vue3-recommended",\n    "prettier",\n    "prettier/vue",\n  ],\n  rules: {\n    // override/add rules settings here, such as:\n    // 'vue/no-unused-vars': 'error'\n  },\n};' > .eslintrc.js
+
+----------------------------------------------------
+
+[
+	["builtin", "echo"],
+	["string", [
+		"$'module.exports = {",
+		["entity", "\\n"],
+		"  extends: [",
+		["entity", "\\n"],
+		"    // add more generic rulesets here, such as:",
+		["entity", "\\n"],
+		"    // '"
+	]],
+	"eslint:recommended",
+	["string", "',\\n    \"plugin:vue/vue3-recommended\",\\n    \"prettier\",\\n    \"prettier/vue\",\\n  ],\\n  rules: {\\n    // override/add rules settings here, such as:\\n    // '"],
+	"vue/no-unused-vars",
+	["string", "': '"],
+	"error",
+	["string", "'\\n  },\\n};'"],
+	["operator", [">"]],
+	" .eslintrc.js"
+]