AsciiDoc: Some regexes are too greedy (#3481)

PrismJS · Jun 25, 2022 · c4cbeea · ramusesan · Jun 28, 2022 · ramusesan
1 parent 5665930
commit c4cbeea
Show file tree

Hide file tree

Showing 3 changed files with 1,073 additions and 5 deletions.
diff --git a/components/prism-asciidoc.js b/components/prism-asciidoc.js
@@ -28,7 +28,7 @@
 
 	var asciidoc = Prism.languages.asciidoc = {
 		'comment-block': {
-			pattern: /^(\/{4,})(?:\r?\n|\r)(?:[\s\S]*(?:\r?\n|\r))??\1/m,
+			pattern: /^(\/{4,})$[\s\S]*?^\1/m,
 			alias: 'comment'
 		},
 		'table': {
@@ -47,23 +47,23 @@
 		},
 
 		'passthrough-block': {
-			pattern: /^(\+{4,})(?:\r?\n|\r)(?:[\s\S]*(?:\r?\n|\r))??\1$/m,
+			pattern: /^(\+{4,})$[\s\S]*?^\1$/m,
 			inside: {
 				'punctuation': /^\++|\++$/
 				// See rest below
 			}
 		},
 		// Literal blocks and listing blocks
 		'literal-block': {
-			pattern: /^(-{4,}|\.{4,})(?:\r?\n|\r)(?:[\s\S]*(?:\r?\n|\r))??\1$/m,
+			pattern: /^(-{4,}|\.{4,})$[\s\S]*?^\1$/m,
 			inside: {
 				'punctuation': /^(?:-+|\.+)|(?:-+|\.+)$/
 				// See rest below
 			}
 		},
 		// Sidebar blocks, quote blocks, example blocks and open blocks
 		'other-block': {
-			pattern: /^(--|\*{4,}|_{4,}|={4,})(?:\r?\n|\r)(?:[\s\S]*(?:\r?\n|\r))??\1$/m,
+			pattern: /^(--|\*{4,}|_{4,}|={4,})$[\s\S]*?^\1$/m,
 			inside: {
 				'punctuation': /^(?:-+|\*+|_+|=+)|(?:-+|\*+|_+|=+)$/
 				// See rest below

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