Merge branch 'suggestion-dashes' into 'master'

Fixes diff sugestions removing dashes from diff

Closes #55634

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

(cherry picked from commit 32f80629bdbd4d2fcd43b6220da373394ffd95b6)

e6f1209e Fixes diff sugestions removing dashes from diff

4 files changed, 9 insertions, 6 deletions

diff --git a/app/assets/javascripts/vue_shared/components/markdown/field.vue b/app/assets/javascripts/vue_shared/components/markdown/field.vue
index 2f7ed4a982c..937a2847a58 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/field.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/field.vue
@@ -89,7 +89,6 @@ export default {
       return this.referencedUsers.length >= referencedUsersThreshold;
     },
     lineContent() {
-      const FIRST_CHAR_REGEX = /^(\+|-)/;
       const [firstSuggestion] = this.suggestions;
       if (firstSuggestion) {
         return firstSuggestion.from_content;
@@ -99,7 +98,7 @@ export default {
         const { rich_text: richText, text } = this.line;
 
         if (text) {
-          return text.replace(FIRST_CHAR_REGEX, '');
+          return text;
         }
 
         return _.unescape(stripHtml(richText).replace(/\n/g, ''));
diff --git a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
index 7c6dbee3e19..721f0276ac8 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/suggestions.vue
@@ -82,13 +82,12 @@ export default {
       // extracts the suggested lines from the markdown
       // calculates a line number for each line
 
-      const FIRST_CHAR_REGEX = /^(\+|-)/;
       const newLines = suggestionEl.querySelectorAll('.line');
       const fromLine = this.suggestions.length ? this.suggestions[0].from_line : this.fromLine;
       const lines = [];
 
       newLines.forEach((line, i) => {
-        const content = `${line.innerText.replace(FIRST_CHAR_REGEX, '')}\n`;
+        const content = `${line.innerText}\n`;
         const lineNumber = fromLine + i;
         lines.push({ content, lineNumber });
       });
diff --git a/changelogs/unreleased/suggestion-dashes.yml b/changelogs/unreleased/suggestion-dashes.yml
new file mode 100644
index 00000000000..e99ab30b263
--- /dev/null
+++ b/changelogs/unreleased/suggestion-dashes.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed diff suggestions removing dashes
+merge_request:
+author:
+type: fixed
diff --git a/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js b/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js
index ab1b747c360..423cd6dee0f 100644
--- a/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js
+++ b/spec/javascripts/vue_shared/components/markdown/suggestions_spec.js
@@ -29,7 +29,7 @@ const generateLine = content => {
 const generateMockLines = () => {
   const line1 = generateLine('Line 1');
   const line2 = generateLine('Line 2');
-  const line3 = generateLine('Line 3');
+  const line3 = generateLine('- Line 3');
   const container = document.createElement('div');
 
   container.appendChild(line1);
@@ -80,7 +80,7 @@ describe('Suggestion component', () => {
       const expectedReturn = [
         { content: 'Line 1\n', lineNumber: 1 },
         { content: 'Line 2\n', lineNumber: 2 },
-        { content: 'Line 3\n', lineNumber: 3 },
+        { content: '- Line 3\n', lineNumber: 3 },
       ];
 
       expect(vm.extractNewLines(generateMockLines())).toEqual(expectedReturn);