@codingame/monaco-vscode-xterm-addons-common 34.1.3 → 35.0.0

package/vscode/src/vs/workbench/contrib/terminal/browser/xterm/xtermTerminal.js

@@ -355,13 +355,10 @@ let XtermTerminal = class XtermTerminal extends Disposable {
     getContentsAsText(startMarker, endMarker) {
         const lines = [];
         const buffer = this.raw.buffer.active;
-        if (startMarker?.line === -1) {
-            throw ( new Error("Cannot get contents of a disposed startMarker"));
-        }
         if (endMarker?.line === -1) {
             throw ( new Error("Cannot get contents of a disposed endMarker"));
         }
-        const startLine = startMarker?.line ?? 0;
+        const startLine = (startMarker === undefined || startMarker.line === -1) ? 0 : startMarker.line;
         const endLine = endMarker?.line ?? buffer.length - 1;
         for (let y = startLine; y <= endLine; y++) {
             lines.push(buffer.getLine(y)?.translateToString(true) ?? "");
@@ -755,7 +752,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                 await this._clipboardService.writeText(this.raw.getSelection());
             }
         } else {
-            this._notificationService.warn(( localize(14314, "The terminal has no selection to copy")));
+            this._notificationService.warn(( localize(14958, "The terminal has no selection to copy")));
         }
     }
     _setCursorBlink(blink) {
@@ -821,18 +818,21 @@ let XtermTerminal = class XtermTerminal extends Disposable {
         const ligaturesConfig = this._terminalConfigurationService.config.fontLigatures;
         let shouldRecreateWebglRenderer = false;
         if (ligaturesConfig?.enabled) {
-            if (this._ligaturesAddon.value && !equals(ligaturesConfig, this._ligaturesAddonConfig)) {
+            const ligatureOptions = {
+                fontFeatureSettings: ligaturesConfig.featureSettings,
+                fallbackLigatures: ligaturesConfig.fallbackLigatures
+            };
+            if (this._ligaturesAddon.value && !equals(ligatureOptions, this._ligaturesAddonConfig)) {
                 this._ligaturesAddon.clear();
+                this._ligaturesAddonConfig = undefined;
             }
             if (!this._ligaturesAddon.value) {
                 const LigaturesAddon = await this._xtermAddonLoader.importAddon("ligatures");
                 if (this._store.isDisposed) {
                     return;
                 }
-                this._ligaturesAddon.value = this._instantiationService.createInstance(LigaturesAddon, {
-                    fontFeatureSettings: ligaturesConfig.featureSettings,
-                    fallbackLigatures: ligaturesConfig.fallbackLigatures
-                });
+                this._ligaturesAddon.value = this._instantiationService.createInstance(LigaturesAddon, ligatureOptions);
+                this._ligaturesAddonConfig = ligatureOptions;
                 this.raw.loadAddon(this._ligaturesAddon.value);
                 shouldRecreateWebglRenderer = true;
             }
@@ -841,6 +841,7 @@ let XtermTerminal = class XtermTerminal extends Disposable {
                 return;
             }
             this._ligaturesAddon.clear();
+            this._ligaturesAddonConfig = undefined;
             shouldRecreateWebglRenderer = true;
         }
         if (shouldRecreateWebglRenderer && this._webglAddon) {

package/vscode/src/vs/base/common/htmlToMarkdown.js

@@ -1,151 +0,0 @@
-
-
-const maxInputLength = 200_000;
-function convertHtmlToMarkdown(html) {
-    if (html.length > maxInputLength) {
-        return html.replace(/<[^>]+>/g, "");
-    }
-    let md = html;
-    md = md.replace(/\r\n?/g, "\n");
-    md = md.replace(
-        /<h1[^>]*>([\s\S]*?)<\/h1>/gi,
-        (_m, inner) => `\n# ${inlineClean(inner)}\n`
-    );
-    md = md.replace(
-        /<h2[^>]*>([\s\S]*?)<\/h2>/gi,
-        (_m, inner) => `\n## ${inlineClean(inner)}\n`
-    );
-    md = md.replace(
-        /<h3[^>]*>([\s\S]*?)<\/h3>/gi,
-        (_m, inner) => `\n### ${inlineClean(inner)}\n`
-    );
-    md = md.replace(
-        /<h4[^>]*>([\s\S]*?)<\/h4>/gi,
-        (_m, inner) => `\n#### ${inlineClean(inner)}\n`
-    );
-    md = md.replace(
-        /<h5[^>]*>([\s\S]*?)<\/h5>/gi,
-        (_m, inner) => `\n##### ${inlineClean(inner)}\n`
-    );
-    md = md.replace(
-        /<h6[^>]*>([\s\S]*?)<\/h6>/gi,
-        (_m, inner) => `\n###### ${inlineClean(inner)}\n`
-    );
-    md = md.replace(
-        /<pre[^>]*>\s*<code[^>]*>([\s\S]*?)<\/code>\s*<\/pre>/gi,
-        (_m, inner) => `\n\`\`\`\n${cleanCodeBlock(inner)}\n\`\`\`\n`
-    );
-    md = md.replace(
-        /<pre[^>]*>([\s\S]*?)<\/pre>/gi,
-        (_m, inner) => `\n\`\`\`\n${cleanCodeBlock(inner)}\n\`\`\`\n`
-    );
-    md = md.replace(/<blockquote[^>]*>([\s\S]*?)<\/blockquote>/gi, (_m, inner) => {
-        const lines = ( inlineClean(inner).split("\n").map(l => `> ${l.trim()}`));
-        return `\n${lines.join("\n")}\n`;
-    });
-    md = md.replace(/<ol[^>]*>([\s\S]*?)<\/ol>/gi, (_m, inner) => {
-        let index = 0;
-        const numbered = inner.replace(/<li[^>]*>([\s\S]*?)<\/li>/gi, (_liM, liInner) => {
-            index++;
-            return `${index}. ${inlineClean(liInner).trim()}\n`;
-        });
-        return `\n${numbered.replace(/<[^>]+>/g, "")}\n`;
-    });
-    md = md.replace(
-        /<li[^>]*>([\s\S]*?)<\/li>/gi,
-        (_m, inner) => `- ${inlineClean(inner).trim()}\n`
-    );
-    md = md.replace(/<\/?ul[^>]*>/gi, "\n");
-    md = md.replace(/<\/p>/gi, "\n\n");
-    md = md.replace(/<p[^>]*>/gi, "");
-    md = md.replace(/<\/div>/gi, "\n");
-    md = md.replace(/<div[^>]*>/gi, "");
-    md = md.replace(/<br\s*\/?>/gi, "\n");
-    md = md.replace(/<hr[^>]*\/?>/gi, "\n---\n");
-    md = md.replace(
-        /<a\s[^>]*href="([^"]*)"[^>]*>([\s\S]*?)<\/a>/gi,
-        (_m, href, text) => sanitizeLink(href, inlineClean(text).trim())
-    );
-    md = md.replace(/<img\s[^>]*alt="([^"]*)"[^>]*src="([^"]*)"[^>]*\/?>/gi, "![$1]($2)");
-    md = md.replace(/<img\s[^>]*src="([^"]*)"[^>]*alt="([^"]*)"[^>]*\/?>/gi, "![$2]($1)");
-    md = md.replace(/<img\s[^>]*src="([^"]*)"[^>]*\/?>/gi, "![]($1)");
-    md = md.replace(
-        /<(strong|b)(\s[^>]*)?>([\s\S]*?)<\/\1>/gi,
-        (_m, _tag, _attrs, inner) => `**${inlineClean(inner)}**`
-    );
-    md = md.replace(
-        /<(em|i)(\s[^>]*)?>([\s\S]*?)<\/\1>/gi,
-        (_m, _tag, _attrs, inner) => `*${inlineClean(inner)}*`
-    );
-    md = md.replace(
-        /<code(\s[^>]*)?>([\s\S]*?)<\/code>/gi,
-        (_m, _attrs, inner) => `\`${decodeEntities(inner)}\``
-    );
-    md = md.replace(
-        /<(del|s|strike)(\s[^>]*)?>([\s\S]*?)<\/\1>/gi,
-        (_m, _tag, _attrs, inner) => `~~${inlineClean(inner)}~~`
-    );
-    md = md.replace(/<[^>]+>/g, "");
-    md = decodeEntities(md);
-    md = md.replace(/\n{3,}/g, "\n\n");
-    return md.trim();
-}
-function inlineClean(html) {
-    let result = html;
-    result = result.replace(
-        /<a\s[^>]*href="([^"]*)"[^>]*>([\s\S]*?)<\/a>/gi,
-        (_m, href, text) => sanitizeLink(href, inlineClean(text).trim())
-    );
-    result = result.replace(
-        /<(strong|b)(\s[^>]*)?>([\s\S]*?)<\/\1>/gi,
-        (_m, _tag, _attrs, inner) => `**${inlineClean(inner)}**`
-    );
-    result = result.replace(
-        /<(em|i)(\s[^>]*)?>([\s\S]*?)<\/\1>/gi,
-        (_m, _tag, _attrs, inner) => `*${inlineClean(inner)}*`
-    );
-    result = result.replace(
-        /<code(\s[^>]*)?>([\s\S]*?)<\/code>/gi,
-        (_m, _attrs, inner) => `\`${decodeEntities(inner)}\``
-    );
-    result = result.replace(
-        /<(del|s|strike)(\s[^>]*)?>([\s\S]*?)<\/\1>/gi,
-        (_m, _tag, _attrs, inner) => `~~${inlineClean(inner)}~~`
-    );
-    result = result.replace(/<br\s*\/?>/gi, "\n");
-    result = result.replace(/<[^>]+>/g, "");
-    return decodeEntities(result);
-}
-function cleanCodeBlock(html) {
-    let result = html;
-    result = result.replace(/<br\s*\/?>/gi, "\n");
-    result = result.replace(/<[^>]+>/g, "");
-    result = decodeEntities(result);
-    result = result.replace(/^\n+|\n+$/g, "");
-    return result;
-}
-function sanitizeLink(href, text) {
-    if (/^(javascript|vbscript|data):/i.test(href.trim())) {
-        return text;
-    }
-    return `[${text}](${href})`;
-}
-function decodeEntities(text) {
-    return text.replace(/&amp;/g, "&").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&quot;/g, "\"").replace(/&#39;/g, "'").replace(/&nbsp;/g, " ").replace(
-        /&#x(?<hex>[0-9a-fA-F]+);/g,
-        (...args) => safeFromCodePoint(parseInt(args.at(-1).hex, 16))
-    ).replace(
-        /&#(?<dec>\d+);/g,
-        (...args) => safeFromCodePoint(parseInt(args.at(-1).dec, 10))
-    );
-}
-function safeFromCodePoint(code) {
-    if (code >= 0 && code <= 0x10FFFF) {
-        try {
-            return String.fromCodePoint(code);
-        } catch {}
-    }
-    return "";
-}
-
-export { convertHtmlToMarkdown };