Merge branch '382449-fix-sublanguage-highlighting' into 'master'

Fix sub-language rendering

See merge request !103873



Merged-by: Jannik Lehmann <jlehmann@gitlab.com>
Approved-by: Nataliia Radina <nradina@gitlab.com>
Approved-by: Jannik Lehmann <jlehmann@gitlab.com>
Co-authored-by: Jacques <jerasmus@gitlab.com>

app/assets/javascripts/vue_shared/components/source_viewer/plugins/wrap_child_nodes.js

@@ -22,7 +22,7 @@ const format = (node, kind = '') => {
       .split(newlineRegex)
       .map((newline) => generateHLJSTag(kind, newline, true))
       .join('\n');
-  } else if (node.kind) {
+  } else if (node.kind || node.sublanguage) {
     const { children } = node;
     if (children.length && children.length === 1) {
       buffer += format(children[0], node.kind);

spec/frontend/vue_shared/components/source_viewer/plugins/wrap_child_nodes_spec.js

@@ -8,13 +8,14 @@ describe('Highlight.js plugin for wrapping _emitter nodes', () => {
           children: [
             { kind: 'string', children: ['Text 1'] },
             { kind: 'string', children: ['Text 2', { kind: 'comment', children: ['Text 3'] }] },
+            { kind: undefined, sublanguage: true, children: ['Text 3 (sublanguage)'] },
             'Text4\nText5',
           ],
         },
       },
     };
 
-    const outputValue = `<span class="hljs-string">Text 1</span><span class="hljs-string"><span class="hljs-string">Text 2</span><span class="hljs-comment">Text 3</span></span><span class="">Text4</span>\n<span class="">Text5</span>`;
+    const outputValue = `<span class="hljs-string">Text 1</span><span class="hljs-string"><span class="hljs-string">Text 2</span><span class="hljs-comment">Text 3</span></span><span class="">Text 3 (sublanguage)</span><span class="">Text4</span>\n<span class="">Text5</span>`;
 
     wrapChildNodes(hljsResultMock);
     expect(hljsResultMock.value).toBe(outputValue);