Batch: Fix escaped double quote (#2485)

PrismJS · Jul 27, 2020 · f0f8210 · f0f8210
1 parent 649e51e
commit f0f8210
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/components/prism-batch.js b/components/prism-batch.js
@@ -7,7 +7,7 @@
 			'punctuation': /:/
 		}
 	};
-	var string = /"[^"]*"/;
+	var string = /"(?:[\\"]"|[^"])*"(?!")/;
 	var number = /(?:\b|-)\d+\b/;
 
 	Prism.languages.batch = {
@@ -76,7 +76,7 @@
 			},
 			{
 				// Other commands
-				pattern: /((?:^|[&(])[ \t]*@?)\w+\b(?:[^^&)\r\n]|\^(?:\r\n|[\s\S]))*/im,
+				pattern: /((?:^|[&(])[ \t]*@?)\w+\b(?:"(?:[\\"]"|[^"])*"(?!")|[^"^&)\r\n]|\^(?:\r\n|[\s\S]))*/im,
 				lookbehind: true,
 				inside: {
 					'keyword': /^\w+\b/i,
@@ -96,4 +96,4 @@
 		'operator': /[&@]/,
 		'punctuation': /[()']/
 	};
-}(Prism));
+}(Prism));
diff --git a/components/prism-batch.min.js b/components/prism-batch.min.js
diff --git a/tests/languages/batch/string_feature.test b/tests/languages/batch/string_feature.test
@@ -0,0 +1,29 @@
+cmd ""
+cmd "f\"oo"
+cmd "f\\"oo"
+cmd "print(""hello"")"
+
+----------------------------------------------------
+
+[
+	["command", [
+		["keyword", "cmd"],
+		["string", "\"\""]
+	]],
+	["command", [
+		["keyword", "cmd"],
+		["string", "\"f\\\"oo\""]
+	]],
+	["command", [
+		["keyword", "cmd"],
+		["string", "\"f\\\\\"oo\""]
+	]],
+	["command", [
+		["keyword", "cmd"],
+		["string", "\"print(\"\"hello\"\")\""]
+	]]
+]
+
+----------------------------------------------------
+
+Checks for strings.