Merge pull request #3480 from nextcloud/backport/3330/stable25

[stable25] Combined code block backport

src/extensions/Markdown.js

@@ -1,9 +1,9 @@
-/*
+/**
  * @copyright Copyright (c) 2022 Max <[email protected]>
  *
  * @author Max <[email protected]>
  *
- * @license GNU AGPL version 3 or any later version
+ * @license AGPL-3.0-or-later
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as

src/extensions/RichText.js

@@ -29,7 +29,7 @@ import Blockquote from '@tiptap/extension-blockquote'
 import OrderedList from '@tiptap/extension-ordered-list'
 import ListItem from '@tiptap/extension-list-item'
 import Code from '@tiptap/extension-code'
-import CodeBlock from '@tiptap/extension-code-block'
+import CodeBlock from './../nodes/CodeBlock.js'
 import HorizontalRule from '@tiptap/extension-horizontal-rule'
 import Dropcursor from '@tiptap/extension-dropcursor'
 import FrontMatter from './../nodes/FrontMatter.js'

src/nodes/CodeBlock.js

@@ -0,0 +1,26 @@
+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
+		node.attrs.params = node.attrs.language
+		return defaultMarkdownSerializer.nodes.code_block(state, node, parent, index)
+	},
+
+})
+
+export default CodeBlock

src/tests/markdown.spec.js

@@ -130,6 +130,8 @@ describe('Markdown though editor', () => {
 	})
 	test('code block', () => {
 		expect(markdownThroughEditor('```\n<?php echo "Hello World";\n```')).toBe('```\n<?php echo "Hello World";\n```')
+		// Issue #3328
+		expect(markdownThroughEditor('```python\nprint("Hello World")\n```')).toBe('```python\nprint("Hello World")\n```')
 	})
 	test('markdown untouched', () => {
 		// Issue #2703