Skip to content

Fix/68518 - Strike through is not applied for quote markdown text #721

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmusial merged 3 commits into from
Aug 20, 2025
Merged

Fix/68518 - Strike through is not applied for quote markdown text #721

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5d7332
Fix - Strike through is not applied for quote markdown text
dmkt9 Aug 18, 2025
4a19129
revert changes
dmkt9 Aug 19, 2025
a4b2554
Fix - Strike through is not applied for quote markdown text
dmkt9 Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions src/__tests__/webParser.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,3 +296,41 @@ describe('trailing whitespace', () => {
});
});
});

describe('strikethrough with blockquote combinations', () => {
test('strikethrough spanning over blockquote text', () => {
expect('~test\n> test\ntest~').toBeParsedAsHTML(
'<p data-type="line" data-id="0"><span data-type="syntax" data-id="0,0"><span data-type="text" data-id="0,0,0">~</span></span><span data-type="strikethrough" data-id="0,1"><span data-type="text" data-id="0,1,0">test</span></span></p><p data-type="line" data-id="1"><span data-type="strikethrough" data-id="1,0"><span data-type="blockquote" style="text-decoration: line-through;" data-id="1,0,0"><span data-type="syntax" data-id="1,0,0,0"><span data-type="text" data-id="1,0,0,0,0">&gt;</span></span><span data-type="text" data-id="1,0,0,1"> test</span></span></span></p><p data-type="line" data-id="2"><span data-type="strikethrough" data-id="2,0"><span data-type="text" data-id="2,0,0">test</span><span data-type="syntax" data-id="2,0,1"><span data-type="text" data-id="2,0,1,0">~</span></span></span></p>',
);
});

test('single line strikethrough with blockquote inside', () => {
expect('~> test content~').toBeParsedAsHTML(
'<p data-type="line" data-id="0"><span data-type="syntax" data-id="0,0"><span data-type="text" data-id="0,0,0">~</span></span><span data-type="strikethrough" data-id="0,1"><span data-type="text" data-id="0,1,0">&gt; test content</span></span><span data-type="syntax" data-id="0,2"><span data-type="text" data-id="0,2,0">~</span></span></p>',
);
});

test('multiple blockquotes within strikethrough - not valid strikethrough', () => {
expect('~> first quote\n> second quote~').toBeParsedAsHTML(
'<p data-type="line" data-id="0"><span data-type="text" data-id="0,0">~&gt; first quote</span></p><p data-type="line" data-id="1"><span data-type="blockquote" data-id="1,0"><span data-type="syntax" data-id="1,0,0"><span data-type="text" data-id="1,0,0,0">&gt;</span></span><span data-type="text" data-id="1,0,1"> second quote~</span></span></p>',
);
});

test('strikethrough not fully encompassing blockquote - not valid strikethrough', () => {
expect('~test\n> not struck~ more').toBeParsedAsHTML(
'<p data-type="line" data-id="0"><span data-type="text" data-id="0,0">~test</span></p><p data-type="line" data-id="1"><span data-type="blockquote" data-id="1,0"><span data-type="syntax" data-id="1,0,0"><span data-type="text" data-id="1,0,0,0">&gt;</span></span><span data-type="text" data-id="1,0,1"> not struck~ more</span></span></p>',
);
});

test('nested blockquotes within strikethrough', () => {
expect('~>> nested quote~').toBeParsedAsHTML(
'<p data-type="line" data-id="0"><span data-type="syntax" data-id="0,0"><span data-type="text" data-id="0,0,0">~</span></span><span data-type="strikethrough" data-id="0,1"><span data-type="text" data-id="0,1,0">&gt;&gt; nested quote</span></span><span data-type="syntax" data-id="0,2"><span data-type="text" data-id="0,2,0">~</span></span></p>',
);
});

test('blockquote with other formatting inside strikethrough', () => {
expect('~> *bold* and _italic_~').toBeParsedAsHTML(
'<p data-type="line" data-id="0"><span data-type="syntax" data-id="0,0"><span data-type="text" data-id="0,0,0">~</span></span><span data-type="strikethrough" data-id="0,1"><span data-type="text" data-id="0,1,0">&gt; </span><span data-type="syntax" data-id="0,1,1"><span data-type="text" data-id="0,1,1,0">*</span></span><span data-type="bold" data-id="0,1,2"><span data-type="text" data-id="0,1,2,0">bold</span></span><span data-type="syntax" data-id="0,1,3"><span data-type="text" data-id="0,1,3,0">*</span></span><span data-type="text" data-id="0,1,4"> and </span><span data-type="syntax" data-id="0,1,5"><span data-type="text" data-id="0,1,5,0">_</span></span><span data-type="italic" data-id="0,1,6"><span data-type="text" data-id="0,1,6,0">italic</span></span><span data-type="syntax" data-id="0,1,7"><span data-type="text" data-id="0,1,7,0">_</span></span></span><span data-type="syntax" data-id="0,2"><span data-type="text" data-id="0,2,0">~</span></span></p>',
);
});
});
8 changes: 8 additions & 0 deletions src/web/utils/parserUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ function parseRangesToHTMLNodes(

lastRangeEndIndex = line.start;
const lineMarkdownRanges = line.markdownRanges;
const parsedLineMarkdownRanges = [] as MarkdownRange[];
// go through all markdown ranges in the line
while (lineMarkdownRanges.length > 0) {
const range = lineMarkdownRanges.shift();
Expand Down Expand Up @@ -265,6 +266,12 @@ function parseRangesToHTMLNodes(
if (!disableInlineStyles) {
addStyleToBlock(span, range.type, markdownStyle, isMultiline);
}
if (
range.type === 'blockquote' &&
parsedLineMarkdownRanges.some((prevLine) => prevLine.type === 'strikethrough' && prevLine.start <= range.start && prevLine.length + prevLine.start >= range.start + range.length)
) {
addStyleToBlock(span, 'strikethrough', markdownStyle, isMultiline);
}

const spanNode = appendNode(span, currentParentNode, range.type, range.length);

Expand Down Expand Up @@ -297,6 +304,7 @@ function parseRangesToHTMLNodes(
currentParentNode = currentParentNode.parentNode || rootNode;
}
}
parsedLineMarkdownRanges.push(range);
}
}

Expand Down