From 5ecdcf4a46ae6c62fbecb4542ab947e90e7b245f Mon Sep 17 00:00:00 2001
From: Max <max@nextcloud.com>
Date: Thu, 25 May 2023 11:50:40 +0200
Subject: [PATCH] fix: handle non markdown files in conflicts

Do not parse non markdown files when resetting the content.

Fixes #4205.

Signed-off-by: Max <max@nextcloud.com>
---
 src/components/CollisionResolveDialog.vue | 14 +++++---
 src/components/Editor.vue                 | 25 ++++----------
 src/extensions/PlainText.js               |  2 ++
 src/mixins/setContent.js                  | 42 +++++++++++++++++++++++
 4 files changed, 60 insertions(+), 23 deletions(-)
 create mode 100644 src/mixins/setContent.js

diff --git a/src/components/CollisionResolveDialog.vue b/src/components/CollisionResolveDialog.vue
index 2beee8fb1a1..6b4daecb8e7 100644
--- a/src/components/CollisionResolveDialog.vue
+++ b/src/components/CollisionResolveDialog.vue
@@ -32,9 +32,13 @@
 </template>
 
 <script>
-import { useEditorMixin, useSyncServiceMixin } from './Editor.provider.js'
+import {
+	useEditorMixin,
+	useIsRichEditorMixin,
+	useSyncServiceMixin
+} from './Editor.provider.js'
 import { NcButton } from '@nextcloud/vue'
-import markdownit from './../markdownit/index.js'
+import setContent from './../mixins/setContent.js'
 export default {
 	name: 'CollisionResolveDialog',
 	components: {
@@ -42,6 +46,8 @@ export default {
 	},
 	mixins: [
 		useEditorMixin,
+		useIsRichEditorMixin,
+		setContent,
 		useSyncServiceMixin,
 	],
 	props: {
@@ -62,10 +68,10 @@ export default {
 			this.$editor.setOptions({ editable: !this.readOnly })
 		},
 		resolveServerVersion() {
+			const { outsideChange } = this.syncError.data
 			this.clicked = true
-			const markdownItHtml = markdownit.render(this.syncError.data.outsideChange)
 			this.$editor.setOptions({ editable: !this.readOnly })
-			this.$editor.commands.setContent(markdownItHtml)
+			this.setContent(outsideChange, { isRich: this.$isRichEditor })
 			this.$syncService.forceSave().then(() => this.$syncService.syncUp())
 		},
 	},
diff --git a/src/components/Editor.vue b/src/components/Editor.vue
index c9bdee3b49c..c08cca38460 100644
--- a/src/components/Editor.vue
+++ b/src/components/Editor.vue
@@ -78,7 +78,6 @@
 <script>
 import Vue, { set } from 'vue'
 import { mapActions, mapState } from 'vuex'
-import escapeHtml from 'escape-html'
 import { getCurrentUser } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
 import { emit, subscribe, unsubscribe } from '@nextcloud/event-bus'
@@ -111,6 +110,7 @@ import markdownit from './../markdownit/index.js'
 import { Keymap } from './../extensions/index.js'
 import DocumentStatus from './Editor/DocumentStatus.vue'
 import isMobile from './../mixins/isMobile.js'
+import setContent from './../mixins/setContent.js'
 import store from './../mixins/store.js'
 import MenuBar from './Menu/MenuBar.vue'
 import ContentContainer from './Editor/ContentContainer.vue'
@@ -132,6 +132,7 @@ export default {
 	},
 	mixins: [
 		isMobile,
+		setContent,
 		store,
 	],
 	provide() {
@@ -339,23 +340,6 @@ export default {
 			'setCurrentSession',
 		]),
 
-		setContent(content, { addToHistory = true } = {}) {
-			this.$editor.chain()
-				.setContent(this.parseContent(content), addToHistory)
-				.command(({ tr }) => {
-					tr.setMeta('addToHistory', addToHistory)
-					return true
-				})
-				.run()
-
-		},
-
-		parseContent(documentSource) {
-			return !this.isRichEditor
-				? `<pre>${escapeHtml(documentSource)}</pre>`
-				: markdownit.render(documentSource) + '<p/>'
-		},
-
 		initSession() {
 			if (!this.hasDocumentParameters) {
 				this.emit('error', 'No valid file provided')
@@ -536,7 +520,10 @@ export default {
 						})
 						this.hasEditor = true
 						if (!documentState && documentSource) {
-							this.setContent(documentSource, { addToHistory: false })
+							this.setContent(documentSource, {
+								isRich: this.isRichEditor,
+								addToHistory: false
+							})
 						}
 						this.listenEditorEvents()
 					} else {
diff --git a/src/extensions/PlainText.js b/src/extensions/PlainText.js
index 305f24016b9..3cdd35d3b68 100644
--- a/src/extensions/PlainText.js
+++ b/src/extensions/PlainText.js
@@ -23,6 +23,7 @@
 import { Extension } from '@tiptap/core'
 
 /* eslint-disable import/no-named-as-default */
+import CodeBlock from '@tiptap/extension-code-block'
 import Text from '@tiptap/extension-text'
 import PlainTextDocument from './../nodes/PlainTextDocument.js'
 
@@ -33,6 +34,7 @@ export default Extension.create({
 		return [
 			PlainTextDocument,
 			Text,
+			CodeBlock,
 		]
 	},
 
diff --git a/src/mixins/setContent.js b/src/mixins/setContent.js
new file mode 100644
index 00000000000..1ecc28535e0
--- /dev/null
+++ b/src/mixins/setContent.js
@@ -0,0 +1,42 @@
+/*
+ * @copyright Copyright (c) 2023 Max <max@nextcloud.com>
+ *
+ * @author Max <max@nextcloud.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import escapeHtml from 'escape-html'
+import markdownit from './../markdownit/index.js'
+
+export default {
+	methods: {
+		setContent(content, { isRich, addToHistory = true } = {}) {
+			const html = isRich
+				? markdownit.render(content) + '<p/>'
+				: `<pre>${escapeHtml(content)}</pre>`
+			this.$editor.chain()
+				.setContent(html, addToHistory)
+				.command(({ tr }) => {
+					tr.setMeta('addToHistory', addToHistory)
+					return true
+				})
+				.run()
+		},
+
+	},
+}