Merge pull request #3119 from nextcloud/backport/3112/stable25

nextcloud · Oct 3, 2022 · 2a81c9f · 2a81c9f
2 parents 2334b1d + 247e43e
commit 2a81c9f
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 15 deletions.
diff --git a/js/editor.js b/js/editor.js
diff --git a/js/editor.js.map b/js/editor.js.map
diff --git a/js/text-files.js b/js/text-files.js
diff --git a/js/text-files.js.map b/js/text-files.js.map
diff --git a/js/text-public.js b/js/text-public.js
diff --git a/js/text-public.js.map b/js/text-public.js.map
diff --git a/js/text-text.js b/js/text-text.js
diff --git a/js/text-text.js.map b/js/text-text.js.map
diff --git a/js/text-viewer.js b/js/text-viewer.js
diff --git a/js/text-viewer.js.map b/js/text-viewer.js.map
diff --git a/src/nodes/Table/TableCell.js b/src/nodes/Table/TableCell.js
@@ -5,7 +5,10 @@ export default TableCell.extend({
 
 	toMarkdown(state, node) {
 		state.write(' ')
+		const backup = state.options?.escapeExtraCharacters
+		state.options.escapeExtraCharacters = /\|/
 		state.renderInline(node)
+		state.options.escapeExtraCharacters = backup
 		state.write(' |')
 	},
 

diff --git a/src/tests/markdown.spec.js b/src/tests/markdown.spec.js
@@ -193,6 +193,11 @@ describe('Markdown serializer from html', () => {
 		)).toBe(`::: warn\n!warning!\n\n:::`)
 	})
 
+	test('table cell escaping', () => {
+		// while '|' has no special meaning in commonmark is has to be escaped for GFM tables
+		expect(markdownThroughEditorHtml('<table><tr><th>greetings</th></tr><tr><td>hello | hallo</td></tr></table>')).toBe('| greetings |\n|-----------|\n| hello \\| hallo |\n')
+	})
+
 	test('front matter', () => {
 		expect(markdownThroughEditorHtml('<pre id="frontmatter"><code>some: value</code></pre><h1>Heading</h1>')).toBe('---\nsome: value\n---\n\n# Heading')
 		// Test --- within front matter is allowed