D: Regexp optimisation

PrismJS · Oct 22, 2017 · 16b338f · 16b338f
1 parent 438926c
commit 16b338f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/components/prism-d.js b/components/prism-d.js
@@ -1,7 +1,7 @@
 Prism.languages.d = Prism.languages.extend('clike', {
 	'string': [
 		// r"", x""
-		/\b[rx]"(\\.|[^\\"])*"[cwd]?/,
+		/\b[rx]"(?:\\[\s\S]|[^\\"])*"[cwd]?/,
 		// q"[]", q"()", q"<>", q"{}"
 		/\bq"(?:\[[\s\S]*?\]|\([\s\S]*?\)|<[\s\S]*?>|\{[\s\S]*?\})"/,
 		// q"IDENT
@@ -13,7 +13,7 @@ Prism.languages.d = Prism.languages.extend('clike', {
 		// Characters
 		/'(?:\\'|\\?[^']+)'/,
 
-		/(["`])(\\.|(?!\1)[^\\])*\1[cwd]?/
+		/(["`])(?:\\[\s\S]|(?!\1)[^\\])*\1[cwd]?/
 	],
 
 	'number': [
@@ -46,7 +46,7 @@ Prism.languages.d.comment = [
 Prism.languages.insertBefore('d', 'comment', {
 	'token-string': {
 		// Allow one level of nesting
-		pattern: /\bq\{(?:|\{[^}]*\}|[^}])*\}/,
+		pattern: /\bq\{(?:\{[^}]*\}|[^}])*\}/,
 		alias: 'string'
 	}
 });

diff --git a/components/prism-d.min.js b/components/prism-d.min.js