Skip to content

Support bold markdown flavoring #751

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

Closed
thienlnam wants to merge 1 commit into from
Closed

Support bold markdown flavoring #751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 23 additions & 23 deletions src/__tests__/normalizeLines.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ describe('normalizeLines', () => {
it('should handle single line markdown with no multi-line ranges', () => {
const lines: Paragraph[] = [
{
text: '*Hello, world!*',
text: '**Hello, world!**',
start: 0,
length: 13,
length: 15,
markdownRanges: [],
},
];
Expand All @@ -17,42 +17,42 @@ describe('normalizeLines', () => {
{
type: 'syntax',
start: 0,
length: 1,
length: 2,
},
{
type: 'bold',
start: 1,
start: 2,
length: 11,
},
{
type: 'syntax',
start: 12,
length: 1,
start: 13,
length: 2,
},
];

const result = normalizeLines(lines, ranges);
const paragraph = result[0] as Paragraph;
expect(paragraph.markdownRanges).toEqual([
{length: 1, start: 0, type: 'syntax'},
{length: 11, start: 1, type: 'bold'},
{length: 1, start: 12, type: 'syntax'},
{length: 2, start: 0, type: 'syntax'},
{length: 11, start: 2, type: 'bold'},
{length: 2, start: 13, type: 'syntax'},
]);
expect(paragraph.text).toEqual('*Hello, world!*');
expect(paragraph.text).toEqual('**Hello, world!**');
});

it('should handle multiline line markdown with no multi-line ranges', () => {
const lines: Paragraph[] = [
{
text: '*Hello',
text: '**Hello',
start: 0,
length: 6,
length: 7,
markdownRanges: [],
},
{
text: 'world!*',
start: 7,
length: 7,
text: 'world!**',
start: 8,
length: 8,
markdownRanges: [],
},
];
Expand All @@ -61,28 +61,28 @@ describe('normalizeLines', () => {
{
type: 'syntax',
start: 0,
length: 1,
length: 2,
},
{
type: 'bold',
start: 0,
length: 13,
length: 14,
},
{
type: 'syntax',
start: 13,
length: 1,
start: 14,
length: 2,
},
];

const result = normalizeLines(lines, ranges);
expect(result.length).toBe(2);
const firstParagraph = result[0] as Paragraph;
const secondParagraph = result[1] as Paragraph;
expect(firstParagraph.text).toEqual('*Hello');
expect(secondParagraph.text).toEqual('world!*');
expect(firstParagraph.markdownRanges).toContainEqual({type: 'bold', start: 0, length: 6});
expect(secondParagraph.markdownRanges).toContainEqual({type: 'bold', start: 7, length: 6});
expect(firstParagraph.text).toEqual('**Hello');
expect(secondParagraph.text).toEqual('world!**');
expect(firstParagraph.markdownRanges).toContainEqual({type: 'bold', start: 0, length: 7});
expect(secondParagraph.markdownRanges).toContainEqual({type: 'bold', start: 8, length: 6});
});

it('should merge lines when handling multi-line markdown ranges', () => {
Expand Down
42 changes: 21 additions & 21 deletions src/__tests__/parseExpensiMark.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ describe('parsing error', () => {
});

test('bold', () => {
expect('Hello, *world*!').toBeParsedAs([
{type: 'syntax', start: 7, length: 1},
{type: 'bold', start: 8, length: 5},
{type: 'syntax', start: 13, length: 1},
expect('Hello, **world**!').toBeParsedAs([
{type: 'syntax', start: 7, length: 2},
{type: 'bold', start: 9, length: 5},
{type: 'syntax', start: 14, length: 2},
]);
});

Expand Down Expand Up @@ -281,19 +281,19 @@ test('h1', () => {
});

test('nested bold and italic', () => {
expect('*_Hello_*, _*world*_!').toBeParsedAs([
{type: 'syntax', start: 0, length: 1},
{type: 'bold', start: 1, length: 7},
{type: 'syntax', start: 1, length: 1},
{type: 'italic', start: 2, length: 5},
{type: 'syntax', start: 7, length: 1},
expect('**_Hello_**, _**world**_!').toBeParsedAs([
{type: 'syntax', start: 0, length: 2},
{type: 'bold', start: 2, length: 7},
{type: 'syntax', start: 2, length: 1},
{type: 'italic', start: 3, length: 5},
{type: 'syntax', start: 8, length: 1},
{type: 'syntax', start: 11, length: 1},
{type: 'italic', start: 12, length: 7},
{type: 'syntax', start: 12, length: 1},
{type: 'bold', start: 13, length: 5},
{type: 'syntax', start: 18, length: 1},
{type: 'syntax', start: 19, length: 1},
{type: 'syntax', start: 9, length: 2},
{type: 'syntax', start: 13, length: 1},
{type: 'italic', start: 14, length: 9},
{type: 'syntax', start: 14, length: 2},
{type: 'bold', start: 16, length: 5},
{type: 'syntax', start: 21, length: 2},
{type: 'syntax', start: 23, length: 1},
]);
});

Expand Down Expand Up @@ -412,13 +412,13 @@ describe('trailing whitespace', () => {
});

test('with another style inside', () => {
expect('>> Hello *world*').toBeParsedAs([
{type: 'blockquote', start: 0, length: 16, depth: 2},
expect('>> Hello **world**').toBeParsedAs([
{type: 'blockquote', start: 0, length: 18, depth: 2},
{type: 'syntax', start: 0, length: 1},
{type: 'syntax', start: 1, length: 1},
{type: 'syntax', start: 9, length: 1},
{type: 'bold', start: 10, length: 5},
{type: 'syntax', start: 15, length: 1},
{type: 'syntax', start: 9, length: 2},
{type: 'bold', start: 11, length: 5},
{type: 'syntax', start: 16, length: 2},
]);
});
});
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/singleLineInputFix.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('Single-line input fix validation', () => {
});

it('should not generate BR elements for single-line markdown (isMultiline=false)', () => {
const text = 'hello *world* test';
const text = 'hello **world** test';
const ranges = parseExpensiMark(text);

const result = parseRangesToHTMLNodes(text, ranges, false, {}, true);
Expand Down Expand Up @@ -100,7 +100,7 @@ describe('Single-line input fix validation', () => {

it('should work correctly with markdown in single-line context', () => {
// Test that our fix doesn't break markdown functionality
const markdownText = '*bold* normal `code`';
const markdownText = '**bold** normal `code`';
const ranges = parseExpensiMark(markdownText);

const result = parseRangesToHTMLNodes(markdownText, ranges, false, {}, true);
Expand Down
8 changes: 4 additions & 4 deletions src/__tests__/webParser.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ test('no formatting', () => {
});

test('bold', () => {
expect('Hello, *world*!').toBeParsedAsHTML(
'<p data-type="line" data-id="0"><span data-type="text" data-id="0,0">Hello, </span><span data-type="syntax" data-id="0,1"><span data-type="text" data-id="0,1,0">*</span></span><span data-type="bold" data-id="0,2"><span data-type="text" data-id="0,2,0">world</span></span><span data-type="syntax" data-id="0,3"><span data-type="text" data-id="0,3,0">*</span></span><span data-type="text" data-id="0,4">!</span></p>',
expect('Hello, **world**!').toBeParsedAsHTML(
'<p data-type="line" data-id="0"><span data-type="text" data-id="0,0">Hello, </span><span data-type="syntax" data-id="0,1"><span data-type="text" data-id="0,1,0">**</span></span><span data-type="bold" data-id="0,2"><span data-type="text" data-id="0,2,0">world</span></span><span data-type="syntax" data-id="0,3"><span data-type="text" data-id="0,3,0">**</span></span><span data-type="text" data-id="0,4">!</span></p>',
);
});

Expand Down Expand Up @@ -224,8 +224,8 @@ test('heading', () => {
});

test('nested bold and italic', () => {
expect('*_Hello_*, _*world*_!').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="bold" data-id="0,1"><span data-type="syntax" data-id="0,1,0"><span data-type="text" data-id="0,1,0,0">_</span></span><span data-type="italic" data-id="0,1,1"><span data-type="text" data-id="0,1,1,0">Hello</span></span><span data-type="syntax" data-id="0,1,2"><span data-type="text" data-id="0,1,2,0">_</span></span></span><span data-type="syntax" data-id="0,2"><span data-type="text" data-id="0,2,0">*</span></span><span data-type="text" data-id="0,3">, </span><span data-type="syntax" data-id="0,4"><span data-type="text" data-id="0,4,0">_</span></span><span data-type="italic" data-id="0,5"><span data-type="syntax" data-id="0,5,0"><span data-type="text" data-id="0,5,0,0">*</span></span><span data-type="bold" data-id="0,5,1"><span data-type="text" data-id="0,5,1,0">world</span></span><span data-type="syntax" data-id="0,5,2"><span data-type="text" data-id="0,5,2,0">*</span></span></span><span data-type="syntax" data-id="0,6"><span data-type="text" data-id="0,6,0">_</span></span><span data-type="text" data-id="0,7">!</span></p>',
expect('**_Hello_**, _**world**_!').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="bold" data-id="0,1"><span data-type="syntax" data-id="0,1,0"><span data-type="text" data-id="0,1,0,0">_</span></span><span data-type="italic" data-id="0,1,1"><span data-type="text" data-id="0,1,1,0">Hello</span></span><span data-type="syntax" data-id="0,1,2"><span data-type="text" data-id="0,1,2,0">_</span></span></span><span data-type="syntax" data-id="0,2"><span data-type="text" data-id="0,2,0">**</span></span><span data-type="text" data-id="0,3">, </span><span data-type="syntax" data-id="0,4"><span data-type="text" data-id="0,4,0">_</span></span><span data-type="italic" data-id="0,5"><span data-type="syntax" data-id="0,5,0"><span data-type="text" data-id="0,5,0,0">**</span></span><span data-type="bold" data-id="0,5,1"><span data-type="text" data-id="0,5,1,0">world</span></span><span data-type="syntax" data-id="0,5,2"><span data-type="text" data-id="0,5,2,0">**</span></span></span><span data-type="syntax" data-id="0,6"><span data-type="text" data-id="0,6,0">_</span></span><span data-type="text" data-id="0,7">!</span></p>',
);
});

Expand Down
4 changes: 2 additions & 2 deletions src/parseExpensiMark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ function parseTreeToTextAndRanges(tree: StackItem): [string, MarkdownRange[]] {
if (node.tag === '<>') {
processChildren(node);
} else if (node.tag === '<strong>') {
appendSyntax('*');
appendSyntax('**');
addChildrenWithStyle(node, 'bold');
appendSyntax('*');
appendSyntax('**');
} else if (node.tag === '<em>') {
appendSyntax('_');
addChildrenWithStyle(node, 'italic');
Expand Down
Loading