Skip to content

Commit c2facac

Browse files
authored
fix: match html block start conditions when ending a list item (#4072)
1 parent ef394f7 commit c2facac

7 files changed

Lines changed: 38 additions & 1 deletion

‎src/rules.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,9 @@ export const other = {
9696
hrRegex: cachedIndentRegex((indent: number) => new RegExp(`^ {0,${indent}}((?:-[ \t]*){3,}|(?:_[ \t]*){3,}|(?:\\*[ \t]*){3,})(?:\\n+|$)`)),
9797
fencesBeginRegex: cachedIndentRegex((indent: number) => new RegExp(`^ {0,${indent}}(?:\`\`\`|~~~)`)),
9898
headingBeginRegex: cachedIndentRegex((indent: number) => new RegExp(`^ {0,${indent}}#`)),
99-
htmlBeginRegex: cachedIndentRegex((indent: number) => new RegExp(`^ {0,${indent}}<(?:[a-z].*>|!--)`, 'i')),
99+
// a list item ends where a paragraph would be interrupted, so this mirrors the
100+
// html start conditions in the paragraph rule below; type 7 is excluded there
101+
htmlBeginRegex: cachedIndentRegex((indent: number) => new RegExp(`^ {0,${indent}}(?:</?(?:${_tag})(?: +|$|/?>)|<(?:script|pre|style|textarea|!--))`, 'i')),
100102
blockquoteBeginRegex: cachedIndentRegex((indent: number) => new RegExp(`^ {0,${indent}}>`)),
101103
};
102104

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<div class="some-class">
2+
<ul>
3+
<li>list item 1</li>
4+
<li>list item 2</li>
5+
</ul>
6+
</div>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div class="some-class">
2+
3+
- list item 1
4+
- list item 2
5+
</div>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<ul>
2+
<li>list item 1
3+
<b>bold</b></li>
4+
<li>list item 2
5+
<span>span</span></li>
6+
</ul>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
- list item 1
2+
<b>bold</b>
3+
- list item 2
4+
<span>span</span>
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<ul>
2+
<li>list item 1</li>
3+
<li>list item 2</li>
4+
</ul>
5+
<div
6+
class="some-class">
7+
Content
8+
</div>
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
- list item 1
2+
- list item 2
3+
<div
4+
class="some-class">
5+
Content
6+
</div>

0 commit comments

Comments
 (0)