@theia/core 1.72.0-next.2 → 1.72.0-next.21

package/src/common/markdown-rendering/markdown-string.spec.ts

@@ -0,0 +1,50 @@
+// *****************************************************************************
+// Copyright (C) 2026 EclipseSource and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { expect } from 'chai';
+import { MarkdownStringImpl } from './markdown-string';
+
+describe('MarkdownStringImpl#appendCodeblock', () => {
+
+    it('uses a triple-backtick fence for code without backticks', () => {
+        const md = new MarkdownStringImpl();
+        md.appendCodeblock('json', '{ "type": "adaptive" }');
+        expect(md.value).to.equal('\n```json\n{ "type": "adaptive" }\n```\n');
+    });
+
+    it('uses a longer fence when the code contains a triple-backtick run', () => {
+        const md = new MarkdownStringImpl();
+        const code = 'before\n```json\n{ "x": 1 }\n```\nafter';
+        md.appendCodeblock('', code);
+        // The fence must be at least 4 backticks so the inner ``` cannot close it.
+        expect(md.value).to.equal('\n````\n' + code + '\n````\n');
+    });
+
+    it('grows the fence to be longer than the longest backtick run inside the code', () => {
+        const md = new MarkdownStringImpl();
+        const code = 'a ```` b ``` c';
+        md.appendCodeblock('', code);
+        // Longest run is 4, so fence must be 5.
+        expect(md.value).to.equal('\n`````\n' + code + '\n`````\n');
+    });
+
+    it('still uses a triple-backtick fence when only single/double backticks appear', () => {
+        const md = new MarkdownStringImpl();
+        const code = 'inline `code` and ``double`` only';
+        md.appendCodeblock('', code);
+        expect(md.value).to.equal('\n```\n' + code + '\n```\n');
+    });
+});

package/src/common/markdown-rendering/markdown-string.ts

@@ -90,14 +90,36 @@ export class MarkdownStringImpl implements MarkdownString {
     }
 
     appendCodeblock(langId: string, code: string): MarkdownStringImpl {
-        this.value += '\n```';
+        // Use a fence longer than any run of backticks in the code so that triple-backtick
+        // sequences inside `code` cannot prematurely close the surrounding fenced block.
+        const fence = '`'.repeat(Math.max(3, MarkdownStringImpl.longestBacktickRun(code) + 1));
+        this.value += '\n';
+        this.value += fence;
         this.value += langId;
         this.value += '\n';
         this.value += code;
-        this.value += '\n```\n';
+        this.value += '\n';
+        this.value += fence;
+        this.value += '\n';
         return this;
     }
 
+    private static longestBacktickRun(value: string): number {
+        let longest = 0;
+        let current = 0;
+        for (let i = 0; i < value.length; i++) {
+            if (value.charCodeAt(i) === 96 /* ` */) {
+                current++;
+                if (current > longest) {
+                    longest = current;
+                }
+            } else {
+                current = 0;
+            }
+        }
+        return longest;
+    }
+
     appendLink(target: UriComponents | string, label: string, title?: string): MarkdownStringImpl {
         this.value += '[';
         this.value += this._escape(label, ']');