toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

MM-12880 Properly link the next sibling following a combined text node (#2307)

Browse source
This commit is contained in:
Harrison Healey 2018-11-05 10:23:27 -05:00 committed by GitHub
parent 73b8b49c81
commit a042cd043e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/components/markdown/transform.js
View file

@ -37,6 +37,10 @@ export function combineTextNodes(ast) {
node._parent._lastChild = node;
}
}
// Resume parsing after the current node since otherwise the walker would continue to parse any old text nodes
// that have been merged into this one
walker.resumeAt(node, false);
}
return ast;

47
app/components/markdown/transform.test.js
View file

@ -172,16 +172,57 @@ describe('Components.Markdown.transform', () => {
}],
}],
},
}, {
name: 'MM-12880 merging text followed by non-text',
input: 'test: *italics*',
expected: {
type: 'document',
children: [{
type: 'paragraph',
children: [{
type: 'text',
literal: 'test: ',
}, {
type: 'emph',
children: [{
type: 'text',
literal: 'italics',
}],
}],
}],
},
}, {
name: 'MM-12880 merging text followed by image',
input: 'test: ![image](https://example.com/image)',
expected: {
type: 'document',
children: [{
type: 'paragraph',
children: [{
type: 'text',
literal: 'test: ',
}, {
type: 'image',
destination: 'https://example.com/image',
title: '',
children: [{
type: 'text',
literal: 'image',
}],
}],
}],
},
}];
for (const test of tests) {
it(test.name, () => {
const input = makeAst(test.input);
const input = typeof test.input === 'string' ? parser.parse(test.input) : makeAst(test.input);
const expected = makeAst(test.expected);
const actual = combineTextNodes(input);
assert.ok(verifyAst(actual));
assert.deepStrictEqual(actual, expected);
assert.deepStrictEqual(astToString(actual), astToString(expected));
assert.deepStrictEqual(stripUnusedFields(actual), stripUnusedFields(expected));
});
}
});
@ -2862,7 +2903,7 @@ function verifyAst(node) {
}
if (node.next && node.next.prev !== node) {
console.error('node is not linked properly to prev');
console.error('node is not linked properly to next');
return false;
}