From e533fbad6dbce4cbb24fddf3648e09ff880050ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Thu, 25 Apr 2019 22:07:00 +0200
Subject: [PATCH] Bugfix: inline diff for replaced text at end of paragraph

---
 .../src/app/core/ui-services/diff.service.spec.ts | 15 +++++++++++++++
 client/src/app/core/ui-services/diff.service.ts   |  8 ++++++++
 2 files changed, 23 insertions(+)

diff --git a/client/src/app/core/ui-services/diff.service.spec.ts b/client/src/app/core/ui-services/diff.service.spec.ts
index 23ecdabcb..48a0e4bcc 100644
--- a/client/src/app/core/ui-services/diff.service.spec.ts
+++ b/client/src/app/core/ui-services/diff.service.spec.ts
@@ -857,6 +857,21 @@ describe('DiffService', () => {
             );
         }));
 
+        it('does handle insertions at the end of a paragraph correctly', inject(
+            [DiffService],
+            (service: DiffService) => {
+                const before =
+                        '<p>Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.</p>\n<p>Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc,</p>',
+                    after =
+                        '<p>Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.</p>\n<p>Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, NEU NEU NEU.</p>';
+                const diff = service.diff(before, after);
+
+                expect(diff).toBe(
+                    '<p>Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.</p>\n<p>Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, <del>augue velit cursus nunc,</del><ins>NEU NEU NEU.</ins></p>'
+                );
+            }
+        ));
+
         it('does not break when an insertion followes a beginning tag occuring twice', inject(
             [DiffService],
             (service: DiffService) => {
diff --git a/client/src/app/core/ui-services/diff.service.ts b/client/src/app/core/ui-services/diff.service.ts
index 30b39a29b..f565fd2f7 100644
--- a/client/src/app/core/ui-services/diff.service.ts
+++ b/client/src/app/core/ui-services/diff.service.ts
@@ -2001,6 +2001,14 @@ export class DiffService {
             }
         );
 
+        // <del>deleted text</P></del><ins>inserted.</P></ins> => <del>deleted tet</del><ins>inserted.</ins></P>
+        diffUnnormalized = diffUnnormalized.replace(
+            /<del>([^<]*)<\/(p|div|blockquote|li)><\/del><ins>([^<]*)<\/\2><\/ins>\s*$/gi,
+            (whole: string, deleted: string, tag: string, inserted: string): string => {
+                return '<del>' + deleted + '</del><ins>' + inserted + '</ins></' + tag + '>';
+            }
+        );
+
         // If larger inserted HTML text contains block elements, we separate the inserted text into
         // inline <ins> elements and "insert"-class-based block elements.
         // <ins>...<div>...</div>...</ins> => <ins>...</ins><div class="insert">...</div><ins>...</ins>