Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 2 deletions

diff --git a/app/assets/javascripts/vue_shared/components/source_viewer/plugins/wrap_comments.js b/app/assets/javascripts/vue_shared/components/source_viewer/plugins/wrap_comments.js
index 4a18733de94..5be92af5b55 100644
--- a/app/assets/javascripts/vue_shared/components/source_viewer/plugins/wrap_comments.js
+++ b/app/assets/javascripts/vue_shared/components/source_viewer/plugins/wrap_comments.js
@@ -24,12 +24,13 @@ export default (result) => {
   result.value = result.value // Highlight.js expects the result param to be mutated for plugins to work
     .split('\n')
     .map((lineContent) => {
-      if (lineContent.includes(HLJS_COMMENT_SELECTOR)) {
+      const includesClosingTag = lineContent.includes('</span>');
+      if (lineContent.includes(HLJS_COMMENT_SELECTOR) && !includesClosingTag) {
         wrapComment = true;
         return lineContent;
       }
       const line = wrapComment ? createWrapper(lineContent) : lineContent;
-      if (lineContent.includes('</span>')) {
+      if (includesClosingTag) {
         wrapComment = false;
       }
       return line;