fix: fix del with escaped tilde (#3517)

* fix: fix del with escaped tilde * use rules to check for unescaped tilde * add tests with spaces
markedjs · Nov 7, 2024 · 0afe87d · 0afe87d
1 parent a612576
commit 0afe87d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 1 deletion.
diff --git a/src/rules.ts b/src/rules.ts
@@ -301,7 +301,7 @@ const inlineGfm: Record<InlineKeys, RegExp> = {
     .replace('email', /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/)
     .getRegex(),
   _backpedal: /(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,
-  del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
+  del: /^(~~?)(?=[^\s~])((?:\\.|[^\\])*?(?:\\.|[^\s~\\]))\1(?=[^~]|$)/,
   text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)|[\s\S]*?(?:(?=[\\<!\[`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-](?=[a-zA-Z0-9.!#$%&'*+\/=?_`{\|}~-]+@)))/,
 };
 

diff --git a/test/specs/new/escape_within_del.html b/test/specs/new/escape_within_del.html
@@ -0,0 +1,6 @@
+<p><del>\</del></p>
+<p>~\~</p>
+<p><del>~</del></p>
+<p>~\~~</p>
+<p>~~ ~</p>
+<p>~ ~~</p>
diff --git a/test/specs/new/escape_within_del.md b/test/specs/new/escape_within_del.md
@@ -0,0 +1,11 @@
+~\\~
+
+~\\\~
+
+~\~~
+
+~\\~~
+
+~\~ ~
+
+~ \~~
-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+    ~\\~
+    ~\\\~
+    ~\~~
+    ~\\~~
+    ~\~ ~
+    ~ \~~