Merge branch '59028-fix-extra-plus-in-diffs' into 'master'

Add back trimChar method to remove trailing +/-

Closes #59028

See merge request gitlab-org/gitlab-ce!29518

app/assets/javascripts/notes/components/diff_with_note.vue

@@ -7,6 +7,8 @@ import { GlSkeletonLoading } from '@gitlab/ui';
 import { getDiffMode } from '~/diffs/store/utils';
 import { diffViewerModes } from '~/ide/constants';
 
+const FIRST_CHAR_REGEX = /^(\+|-| )/;
+
 export default {
   components: {
     DiffFileHeader,
@@ -59,6 +61,9 @@ export default {
           this.error = true;
         });
     },
+    trimChar(line) {
+      return line.replace(FIRST_CHAR_REGEX, '');
+    },
   },
   userColorSchemeClass: window.gon.user_color_scheme,
 };
@@ -83,7 +88,7 @@ export default {
           >
             <td :class="line.type" class="diff-line-num old_line">{{ line.old_line }}</td>
             <td :class="line.type" class="diff-line-num new_line">{{ line.new_line }}</td>
-            <td :class="line.type" class="line_content" v-html="line.rich_text"></td>
+            <td :class="line.type" class="line_content" v-html="trimChar(line.rich_text)"></td>
           </tr>
         </template>
         <tr v-if="!hasTruncatedDiffLines" class="line_holder line-holder-placeholder">

changelogs/unreleased/59028-fix-extra-plus-in-diffs.yml

+---
+title: Remove duplicate trailing +/- char in merge request discussions
+merge_request: 29518
+author:
+type: fixed

spec/javascripts/notes/components/diff_with_note_spec.js

@@ -47,6 +47,19 @@ describe('diff_with_note', () => {
       vm = mountComponentWithStore(Component, { props, store });
     });
 
+    it('removes trailing "+" char', () => {
+      const richText = vm.$el.querySelectorAll('.line_holder')[4].querySelector('.line_content')
+        .textContent[0];
+
+      expect(richText).not.toEqual('+');
+    });
+
+    it('removes trailing "-" char', () => {
+      const richText = vm.$el.querySelector('#LC13').parentNode.textContent[0];
+
+      expect(richText).not.toEqual('-');
+    });
+
     it('shows text diff', () => {
       expect(selectors.container).toHaveClass('text-file');
       expect(selectors.diffTable).toExist();