BBj: fix strings regex does not match single quotes

PrismJS · Jul 30, 2022 · f069d10 · f069d10
1 parent ca5e6a8
commit f069d10
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/components/prism-bbj.js b/components/prism-bbj.js
@@ -6,7 +6,7 @@
 			greedy: true
 		},
 		'string': {
-			pattern: /"(?:""|[!#$%&'()*,\/:;<=>?^\w +\-.])*"/,
+			pattern: /(['"])(?:(?!\1|\\).|\\.)*\1/,
 			greedy: true
 		},
 		'number': /(?:\b\d+(?:\.\d*)?|\B\.\d+)(?:E[+-]?\d+)?/i,

diff --git a/components/prism-bbj.min.js b/components/prism-bbj.min.js
diff --git a/tests/languages/bbj/string_feature.test b/tests/languages/bbj/string_feature.test
@@ -1,13 +1,27 @@
 ""
-"fo""obar"
+''
+"f\"oo"
+'b\'ar'
+
+"foo rem comment bar"
+"foo ""rem"" comment bar"
+"foo rem /* *rem comment bar"
 
 ----------------------------------------------------
 
 [
 	["string", "\"\""],
-	["string", "\"fo\"\"obar\""]
+	["string", "''"],
+	["string", "\"f\\\"oo\""],
+	["string", "'b\\'ar'"],
+
+	["string", "\"foo rem comment bar\""],
+	["string", "\"foo \""],
+	["string", "\"rem\""],
+	["string", "\" comment bar\""],
+	["string", "\"foo rem /* *rem comment bar\""]
 ]
 
 ----------------------------------------------------
 
-Checks for strings.
+Checks for strings.