Merge pull request #3321 from nextcloud/fix/markdownit_fence_trailing…

…_newline Remove trailing newline from code blocks
nextcloud · Nov 2, 2022 · 5b086d5 · 5b086d5
2 parents ded6b61 + fe6962b
commit 5b086d5
Show file tree

Hide file tree

Showing 11 changed files with 27 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/CodeBlock.js b/src/nodes/CodeBlock.js
@@ -2,6 +2,18 @@ import TiptapCodeBlock from '@tiptap/extension-code-block'
 import { defaultMarkdownSerializer } from 'prosemirror-markdown'
 
 const CodeBlock = TiptapCodeBlock.extend({
+	parseHTML() {
+		return [
+			{
+				tag: 'pre',
+				preserveWhitespace: 'full',
+				// Remove trailing newline from code blocks (Github issue #2344)
+				getContent: (node, schema) => {
+					return schema.nodes.codeBlock.create(null, [schema.text(node.textContent.replace(/\n$/, ''))])
+				},
+			},
+		]
+	},
 
 	toMarkdown(state, node, parent, index) {
 		// prosemirror-markdown uses `params` instead of `language` attribute