@codingame/monaco-vscode-issue-service-override 33.0.7 → 34.0.0

package/vscode/src/vs/workbench/contrib/issue/browser/issueFormService.js

@@ -5,27 +5,41 @@ import { createElement } from '@codingame/monaco-vscode-api/vscode/vs/base/brows
 import { safeSetInnerHtml } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domSanitize';
 import { createStyleSheet } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/domStylesheets';
 import { Menu, getMenuWidgetCSS, unthemedMenuStyles } from '@codingame/monaco-vscode-api/vscode/vs/base/browser/ui/menu/menu';
-import { DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
+import { Disposable, DisposableStore } from '@codingame/monaco-vscode-api/vscode/vs/base/common/lifecycle';
 import { isWindows, isLinux } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severity';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 import { MenuId } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from '@codingame/monaco-vscode-api/vscode/vs/platform/actions/common/actions.service';
+import { IClipboardService } from '@codingame/monaco-vscode-api/vscode/vs/platform/clipboard/common/clipboardService.service';
 import { IContextKeyService } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey.service';
 import { IDialogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ExtensionIdentifierSet, ExtensionIdentifier } from '@codingame/monaco-vscode-api/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/instantiation/common/instantiation';
 import { ILogService } from '@codingame/monaco-vscode-api/vscode/vs/platform/log/common/log.service';
+import { IOpenerService } from '@codingame/monaco-vscode-api/vscode/vs/platform/opener/common/opener.service';
 import product from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/product';
 import { AuxiliaryWindowMode } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
 import { IAuxiliaryWindowService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
 import { IHostService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/host/browser/host.service';
+import { IssueSource } from '../common/issue.js';
+import { normalizeGitHubUrl } from '../common/issueReporterUtil.js';
 import BaseHtml from './issueReporterPage.js';
 import { IssueWebReporter } from './issueReporterService.js';
+import { IGitHubUploadService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/issue/browser/githubUploadService.service';
+import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
+import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
+import { URI } from '@codingame/monaco-vscode-api/vscode/vs/base/common/uri';
+import { LRUCache } from '@codingame/monaco-vscode-api/vscode/vs/base/common/map';
+import { hash } from '@codingame/monaco-vscode-api/vscode/vs/base/common/hash';
+import { decodeBase64 } from '@codingame/monaco-vscode-api/vscode/vs/base/common/buffer';
 import * as issueReporter from './media/issueReporter.css';
 
 registerCss(issueReporter);
-let IssueFormService = class IssueFormService {
+const MAX_URL_LENGTH = 7500;
+const GENERATED_BY_ISSUE_REPORTER_MARKER = "<!-- generated by issue reporter -->";
+const ISSUE_DATA_ATTACHMENT_NAME = "issue-data.md";
+let IssueFormService = class IssueFormService extends Disposable {
     constructor(
         instantiationService,
         auxiliaryWindowService,
@@ -33,8 +47,14 @@ let IssueFormService = class IssueFormService {
         contextKeyService,
         logService,
         dialogService,
-        hostService
+        hostService,
+        openerService,
+        fileService,
+        githubUploadService,
+        editorService,
+        clipboardService
     ) {
+        super();
         this.instantiationService = instantiationService;
         this.auxiliaryWindowService = auxiliaryWindowService;
         this.menuService = menuService;
@@ -42,16 +62,333 @@ let IssueFormService = class IssueFormService {
         this.logService = logService;
         this.dialogService = dialogService;
         this.hostService = hostService;
+        this.openerService = openerService;
+        this.fileService = fileService;
+        this.githubUploadService = githubUploadService;
+        this.editorService = editorService;
+        this.clipboardService = clipboardService;
         this.issueReporterWindow = null;
         this.extensionIdentifierSet = ( new ExtensionIdentifierSet());
         this.arch = "";
         this.release = "";
         this.type = "";
+        this.uploadCache = ( new LRUCache(32));
     }
     async openReporter(data) {
         if (this.hasToReload(data)) {
             return;
         }
+        return this.openAuxIssueReporterLegacy(data);
+    }
+    async submitIssue(host, data, title, body) {
+        const screenshots = host.getScreenshots();
+        const recordings = host.getRecordings();
+        const issueTarget = this.getIssueTarget(data);
+        if (!issueTarget?.url) {
+            return false;
+        }
+        if (issueTarget.external) {
+            return this.openerService.open(issueTarget.url, {
+                openExternal: true
+            });
+        }
+        const gitHubDetails = this.parseGitHubUrl(issueTarget.url);
+        let repoId;
+        const resolveRepoId = async () => {
+            if (!gitHubDetails) {
+                return undefined;
+            }
+            repoId ??= await this.githubUploadService.resolveRepositoryId(gitHubDetails.owner, gitHubDetails.repositoryName, data.githubAccessToken);
+            return repoId;
+        };
+        let mediaMarkdown = "";
+        const hasAttachments = screenshots.length > 0 || recordings.length > 0;
+        if (hasAttachments && data.githubAccessToken && gitHubDetails) {
+            host.setUploading(true);
+            try {
+                const filesToProcess = [];
+                for (let i = 0; i < screenshots.length; i++) {
+                    const dataUrl = screenshots[i].annotatedDataUrl ?? screenshots[i].dataUrl;
+                    const bytes = this.dataUrlToBytes(dataUrl);
+                    if (bytes) {
+                        const isJpeg = dataUrl.startsWith("data:image/jpeg");
+                        const extension = isJpeg ? "jpg" : "png";
+                        const contentType = isJpeg ? "image/jpeg" : "image/png";
+                        filesToProcess.push({
+                            key: `screenshot:${hash(dataUrl)}`,
+                            name: `screenshot-${i + 1}.${extension}`,
+                            bytes,
+                            contentType
+                        });
+                    }
+                }
+                for (let i = 0; i < recordings.length; i++) {
+                    const rec = recordings[i];
+                    const fileContent = await this.fileService.readFile(URI.file(rec.filePath));
+                    const ext = rec.filePath.endsWith(".mp4") ? "mp4" : "webm";
+                    const contentType = ext === "mp4" ? "video/mp4" : "video/webm";
+                    filesToProcess.push({
+                        key: `recording:${rec.filePath}`,
+                        name: `recording-${i + 1}.${ext}`,
+                        bytes: fileContent.value.buffer,
+                        contentType
+                    });
+                }
+                if (filesToProcess.length > 0) {
+                    for (let i = 0; i < filesToProcess.length; i++) {
+                        host.setAttachmentUploadState(i, "pending");
+                    }
+                    const uploadResults = [];
+                    for (let i = 0; i < filesToProcess.length; i++) {
+                        const file = filesToProcess[i];
+                        const cached = this.uploadCache.get(file.key);
+                        if (cached) {
+                            uploadResults.push(cached);
+                            host.setAttachmentUploadState(i, "done");
+                            continue;
+                        }
+                        const resolvedRepoId = await resolveRepoId();
+                        if (!resolvedRepoId) {
+                            throw ( new Error("No GitHub repository resolved for attachment upload."));
+                        }
+                        host.setAttachmentUploadState(i, "uploading");
+                        const [result] = await this.githubUploadService.uploadViaMobileApi(data.githubAccessToken, resolvedRepoId, [file]);
+                        if (!result) {
+                            throw ( new Error(`Upload returned no result for ${file.name}.`));
+                        }
+                        this.uploadCache.set(file.key, result);
+                        uploadResults.push(result);
+                        host.setAttachmentUploadState(i, "done");
+                    }
+                    mediaMarkdown = `\n\n### ${( localize(10827, "Attachments"))}\n\n`;
+                    for (const r of uploadResults) {
+                        mediaMarkdown += r.contentType.startsWith("video/") ? `${r.assetUrl}\n\n` : `![${r.fileName}](${r.assetUrl})\n\n`;
+                    }
+                }
+            } catch (err) {
+                this.logService.error("[IssueFormService] Upload failed:", err);
+                mediaMarkdown = `\n\n### ${( localize(10827, "Attachments"))}\n\n> ${( localize(10828, "Upload failed. Please drag and drop attachments manually."))}\n\n`;
+            } finally {
+                host.setUploading(false);
+            }
+        }
+        const issueBody = body + mediaMarkdown;
+        const baseUrl = this.getIssueUrlWithTitle(title, issueTarget.url);
+        let previewBody = issueBody;
+        let url = this.createIssuePreviewUrl(baseUrl, previewBody, gitHubDetails, data.issueSource);
+        if (url.length > MAX_URL_LENGTH && data.githubAccessToken && gitHubDetails) {
+            const shortenedBody = await this.tryCreateBodyWithIssueDataAttachment(
+                host,
+                issueBody,
+                baseUrl,
+                gitHubDetails,
+                data.issueSource,
+                data.githubAccessToken,
+                resolveRepoId
+            );
+            if (shortenedBody) {
+                previewBody = shortenedBody;
+                url = this.createIssuePreviewUrl(baseUrl, previewBody, gitHubDetails, data.issueSource);
+            }
+        }
+        if (url.length > MAX_URL_LENGTH) {
+            const shouldWrite = await this.showClipboardDialog();
+            if (!shouldWrite) {
+                return false;
+            }
+            try {
+                await this.clipboardService.writeText(issueBody);
+            } catch (error) {
+                this.logService.error("Writing issue data to clipboard failed", error);
+                return false;
+            }
+            url = this.createIssuePreviewUrl(baseUrl, ( localize(
+                10829,
+                "We have written the needed data into your clipboard because it was too large to send. Please paste."
+            )), gitHubDetails, data.issueSource);
+        }
+        const uri = ( URI.parse(url));
+        const skipValidation = uri.scheme === "https" && uri.authority === "github.com";
+        return this.openerService.open(url, {
+            openExternal: true,
+            skipValidation
+        });
+    }
+    async tryCreateBodyWithIssueDataAttachment(
+        host,
+        issueBody,
+        baseUrl,
+        gitHubDetails,
+        issueSource,
+        githubAccessToken,
+        resolveRepoId
+    ) {
+        const extracted = this.extractIssueData(issueBody);
+        if (!extracted) {
+            return undefined;
+        }
+        host.setUploading(true);
+        try {
+            const repoId = await resolveRepoId();
+            if (!repoId) {
+                return undefined;
+            }
+            const result = await this.uploadIssueDataFile(githubAccessToken, repoId, extracted.fileContent);
+            const bodyWithLink = this.createBodyWithIssueDataLink(extracted.body, result.assetUrl);
+            if (this.createIssuePreviewUrl(baseUrl, bodyWithLink, gitHubDetails, issueSource).length > MAX_URL_LENGTH) {
+                return undefined;
+            }
+            return bodyWithLink;
+        } catch (error) {
+            this.logService.error("Uploading issue data attachment failed", error);
+            return undefined;
+        } finally {
+            host.setUploading(false);
+        }
+    }
+    async uploadIssueDataFile(githubAccessToken, repoId, fileContent) {
+        const key = `${ISSUE_DATA_ATTACHMENT_NAME}:${hash(fileContent)}`;
+        const cached = this.uploadCache.get(key);
+        if (cached) {
+            return cached;
+        }
+        const file = {
+            key,
+            name: ISSUE_DATA_ATTACHMENT_NAME,
+            bytes: ( new TextEncoder()).encode(fileContent),
+            contentType: "text/plain"
+        };
+        const [result] = await this.githubUploadService.uploadViaMobileApi(githubAccessToken, repoId, [file]);
+        if (!result) {
+            throw ( new Error("Issue data upload did not return a result."));
+        }
+        this.uploadCache.set(key, result);
+        return result;
+    }
+    extractIssueData(issueBody) {
+        const detailsBlocks = [];
+        const body = issueBody.replace(/\n*<details\b[\s\S]*?<\/details>\n*/gi, match => {
+            detailsBlocks.push(match.trim());
+            return "\n\n";
+        }).replace(/\n{3,}/g, "\n\n").trimEnd();
+        if (!detailsBlocks.length) {
+            return undefined;
+        }
+        return {
+            body,
+            fileContent: `# ${( localize(10830, "Issue Data"))}\n\n${detailsBlocks.join("\n\n")}\n`
+        };
+    }
+    createBodyWithIssueDataLink(body, issueDataUrl) {
+        const attachmentMarkdown = `\n\n### ${( localize(10831, "Additional Issue Data"))}\n\n[${ISSUE_DATA_ATTACHMENT_NAME}](${issueDataUrl})`;
+        const markerIndex = body.indexOf(GENERATED_BY_ISSUE_REPORTER_MARKER);
+        if (markerIndex === -1) {
+            return `${body.trimEnd()}${attachmentMarkdown}\n`;
+        }
+        return `${body.slice(0, markerIndex).trimEnd()}${attachmentMarkdown}\n\n${body.slice(markerIndex).trimStart()}`;
+    }
+    createIssuePreviewUrl(baseUrl, body, gitHubDetails, issueSource) {
+        const url = `${baseUrl}&body=${encodeURIComponent(body)}`;
+        return this.addTemplateToUrl(url, gitHubDetails?.owner, gitHubDetails?.repositoryName, issueSource);
+    }
+    getIssueTarget(data) {
+        const selectedExtension = this.getSelectedExtension(data);
+        if (data.issueSource === IssueSource.Extension && selectedExtension) {
+            const extensionUrl = this.getExtensionIssueUrl(selectedExtension);
+            if (!extensionUrl) {
+                return undefined;
+            }
+            return {
+                url: extensionUrl,
+                external: !this.isGitHubUrl(extensionUrl)
+            };
+        }
+        if (data.issueSource === IssueSource.Marketplace) {
+            const marketplaceIssueUrl = product.reportMarketplaceIssueUrl ?? product.reportIssueUrl;
+            return marketplaceIssueUrl ? {
+                url: marketplaceIssueUrl,
+                external: false
+            } : undefined;
+        }
+        if (data.uri) {
+            const url = ( URI.revive(data.uri).toString());
+            return {
+                url,
+                external: !this.isGitHubUrl(url)
+            };
+        }
+        if (data.privateUri) {
+            const url = ( URI.revive(data.privateUri).toString());
+            return {
+                url,
+                external: !this.isGitHubUrl(url)
+            };
+        }
+        return product.reportIssueUrl ? {
+            url: product.reportIssueUrl,
+            external: false
+        } : undefined;
+    }
+    getSelectedExtension(data) {
+        return data.extensionId ? data.enabledExtensions.find(ext => ext.id.toLowerCase() === data.extensionId?.toLowerCase()) : undefined;
+    }
+    getExtensionIssueUrl(extension) {
+        if (extension.uri) {
+            return ( URI.revive(extension.uri).toString());
+        }
+        if (extension.bugsUrl && /^https?:\/\/github\.com\/([^\/]*)\/([^\/]*)\/?(\/issues)?\/?$/.test(extension.bugsUrl)) {
+            return `${normalizeGitHubUrl(extension.bugsUrl)}/issues/new`;
+        }
+        if (extension.repositoryUrl && /^https?:\/\/github\.com\/([^\/]*)\/([^\/]*)\/?$/.test(extension.repositoryUrl)) {
+            return `${normalizeGitHubUrl(extension.repositoryUrl)}/issues/new`;
+        }
+        return extension.bugsUrl || extension.repositoryUrl;
+    }
+    isGitHubUrl(url) {
+        return /^https?:\/\/github\.com\//i.test(url);
+    }
+    parseGitHubUrl(url) {
+        const match = /^https?:\/\/github\.com\/([^\/?#]+)\/([^\/?#]+).*/i.exec(url);
+        if (!match) {
+            return undefined;
+        }
+        return {
+            owner: match[1],
+            repositoryName: match[2]
+        };
+    }
+    getIssueUrlWithTitle(issueTitle, issueUrl) {
+        if (this.isGitHubUrl(issueUrl) && !/\/issues\/new(?:[?#].*)?$/i.test(issueUrl)) {
+            issueUrl = `${normalizeGitHubUrl(issueUrl)}/issues/new`;
+        }
+        const queryStringPrefix = issueUrl.indexOf("?") === -1 ? "?" : "&";
+        return `${issueUrl}${queryStringPrefix}title=${encodeURIComponent(issueTitle)}`;
+    }
+    addTemplateToUrl(baseUrl, owner, repositoryName, issueSource) {
+        const needsTemplate = issueSource === IssueSource.VSCode || (owner?.toLowerCase() === "microsoft" && repositoryName?.toLowerCase() === "vscode");
+        if (!needsTemplate) {
+            return baseUrl;
+        }
+        try {
+            const url = ( new URL(baseUrl));
+            url.searchParams.set("template", "bug_report.md");
+            return ( url.toString());
+        } catch {
+            return `${baseUrl}&template=bug_report.md`;
+        }
+    }
+    dataUrlToBytes(dataUrl) {
+        const commaIndex = dataUrl.indexOf(",");
+        if (commaIndex === -1) {
+            return undefined;
+        }
+        try {
+            return decodeBase64(dataUrl.substring(commaIndex + 1)).buffer;
+        } catch {
+            return undefined;
+        }
+    }
+    async openAuxIssueReporterLegacy(data) {
         await this.openAuxIssueReporter(data);
         if (this.issueReporterWindow) {
             const issueReporter = this.instantiationService.createInstance(IssueWebReporter, false, data, {
@@ -67,7 +404,7 @@ let IssueFormService = class IssueFormService {
             width: 700,
             height: 800
         };
-        if (bounds && bounds.x && bounds.y) {
+        if (bounds && typeof bounds.x === "number" && typeof bounds.y === "number") {
             const centerX = bounds.x + bounds.width / 2;
             const centerY = bounds.y + bounds.height / 2;
             issueReporterBounds = {
@@ -157,17 +494,17 @@ let IssueFormService = class IssueFormService {
         await this.dialogService.prompt({
             type: Severity.Warning,
             message: ( localize(
-                10663,
+                10832,
                 "Your input will not be saved. Are you sure you want to close this window?"
             )),
             buttons: [{
-                label: ( localize(10664, "&&Yes")),
+                label: ( localize(10833, "&&Yes")),
                 run: () => {
                     this.closeReporter();
                     this.issueReporterWindow = null;
                 }
             }, {
-                label: ( localize(10665, "Cancel")),
+                label: ( localize(10834, "Cancel")),
                 run: () => {}
             }]
         });
@@ -177,16 +514,16 @@ let IssueFormService = class IssueFormService {
         await this.dialogService.prompt({
             type: Severity.Warning,
             message: ( localize(
-                10666,
+                10835,
                 "There is too much data to send to GitHub directly. The data will be copied to the clipboard, please paste it into the GitHub issue page that is opened."
             )),
             buttons: [{
-                label: ( localize(10667, "&&OK")),
+                label: ( localize(10836, "&&OK")),
                 run: () => {
                     result = true;
                 }
             }, {
-                label: ( localize(10665, "Cancel")),
+                label: ( localize(10834, "Cancel")),
                 run: () => {
                     result = false;
                 }
@@ -207,6 +544,6 @@ let IssueFormService = class IssueFormService {
         return false;
     }
 };
-IssueFormService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IAuxiliaryWindowService)), ( __param(2, IMenuService)), ( __param(3, IContextKeyService)), ( __param(4, ILogService)), ( __param(5, IDialogService)), ( __param(6, IHostService))], IssueFormService));
+IssueFormService = ( __decorate([( __param(0, IInstantiationService)), ( __param(1, IAuxiliaryWindowService)), ( __param(2, IMenuService)), ( __param(3, IContextKeyService)), ( __param(4, ILogService)), ( __param(5, IDialogService)), ( __param(6, IHostService)), ( __param(7, IOpenerService)), ( __param(8, IFileService)), ( __param(9, IGitHubUploadService)), ( __param(10, IEditorService)), ( __param(11, IClipboardService))], IssueFormService));
 
 export { IssueFormService };

package/vscode/src/vs/workbench/contrib/issue/browser/issueReporterModel.d.ts

@@ -1,11 +1,12 @@
 import { SystemInfo } from "@codingame/monaco-vscode-api/vscode/vs/platform/diagnostics/common/diagnostics";
-import { ISettingSearchResult, IssueReporterExtensionData, IssueType } from "../common/issue.js";
+import { ISettingSearchResult, IssueReporterExtensionData, IssueSource, IssueType } from "../common/issue.js";
 interface VersionInfo {
     vscodeVersion: string;
     os: string;
 }
 export interface IssueReporterData {
     issueType: IssueType;
+    issueSource?: IssueSource;
     issueDescription?: string;
     issueTitle?: string;
     extensionData?: string;
@@ -33,7 +34,7 @@ export interface IssueReporterData {
     filterResultCount?: number;
     experimentInfo?: string;
     restrictedMode?: boolean;
-    isUnsupported?: boolean;
+    isInstallationPure?: boolean;
     isSessionsWindow?: boolean;
 }
 export declare class IssueReporterModel {

package/vscode/src/vs/workbench/contrib/issue/browser/issueReporterModel.js

@@ -39,7 +39,7 @@ class IssueReporterModel {
         if (this._data.restrictedMode) {
             modes.push("Restricted");
         }
-        if (this._data.isUnsupported) {
+        if (this._data.isInstallationPure === false) {
             modes.push("Unsupported");
         }
         return `
@@ -87,17 +87,11 @@ ${this.getInfos()}
         if (this._data.fileOnMarketplace) {
             return info;
         }
-        const isBugOrPerformanceIssue = this._data.issueType === IssueType.Bug || this._data.issueType === IssueType.PerformanceIssue;
-        if (isBugOrPerformanceIssue) {
-            if (this._data.includeExtensionData && this._data.extensionData) {
-                info += this.getExtensionData();
-            }
-            if (this._data.includeSystemInfo && this._data.systemInfo) {
-                info += this.generateSystemInfoMd();
-            }
-            if (this._data.includeSystemInfo && this._data.systemInfoWeb) {
-                info += "System Info: " + this._data.systemInfoWeb;
-            }
+        if (this._data.includeExtensionData && this._data.extensionData) {
+            info += this.getExtensionData();
+        }
+        if (this._data.includeSystemInfo && this._data.systemInfo) {
+            info += this.generateSystemInfoMd();
         }
         if (this._data.issueType === IssueType.PerformanceIssue) {
             if (this._data.includeProcessInfo) {
@@ -107,13 +101,11 @@ ${this.getInfos()}
                 info += this.generateWorkspaceInfoMd();
             }
         }
-        if (isBugOrPerformanceIssue) {
-            if (!this._data.fileOnExtension && this._data.includeExtensions) {
-                info += this.generateExtensionsMd();
-            }
-            if (this._data.includeExperiments && this._data.experimentInfo) {
-                info += this.generateExperimentsInfoMd();
-            }
+        if (!this._data.fileOnExtension && this._data.includeExtensions) {
+            info += this.generateExtensionsMd();
+        }
+        if (this._data.includeExperiments && this._data.experimentInfo) {
+            info += this.generateExperimentsInfoMd();
         }
         return info;
     }
@@ -135,6 +127,9 @@ ${this.getInfos()}
 |Process Argv|${this._data.systemInfo.processArgs.replace(/\\/g, "\\\\")}|
 |Screen Reader|${this._data.systemInfo.screenReader}|
 |VM|${this._data.systemInfo.vmHint}|`;
+            if (this._data.systemInfoWeb) {
+                md += `\n|User Agent|${this._data.systemInfoWeb}|`;
+            }
             if (this._data.systemInfo.linuxEnv) {
                 md += `\n|DESKTOP_SESSION|${this._data.systemInfo.linuxEnv.desktopSession}|
 |XDG_CURRENT_DESKTOP|${this._data.systemInfo.linuxEnv.xdgCurrentDesktop}|
@@ -197,22 +192,26 @@ ${this._data.experimentInfo}
         if (this._data.extensionsDisabled) {
             return "Extensions disabled";
         }
-        const themeExclusionStr = this._data.numberOfThemeExtesions ? `\n(${this._data.numberOfThemeExtesions} theme extensions excluded)` : "";
-        if (!this._data.enabledNonThemeExtesions) {
-            return "Extensions: none" + themeExclusionStr;
+        if (!this._data.enabledNonThemeExtesions || this._data.enabledNonThemeExtesions.length === 0) {
+            if (!this._data.numberOfThemeExtesions) {
+                return "Extensions: none";
+            }
         }
-        const tableHeader = `Extension|Author (truncated)|Version
----|---|---`;
-        const table = ( this._data.enabledNonThemeExtesions.map(e => {
-            return `${e.name}|${e.publisher?.substr(0, 3) ?? "N/A"}|${e.version}`;
-        })).join("\n");
-        return `<details><summary>Extensions (${this._data.enabledNonThemeExtesions.length})</summary>
+        let md = "";
+        const tableHeader = `Name|Identifier|Author|Version
+---|---|---|---`;
+        if (this._data.enabledNonThemeExtesions && this._data.enabledNonThemeExtesions.length > 0) {
+            const table = ( this._data.enabledNonThemeExtesions.map(e => {
+                return `${e.displayName || e.name}|${e.id}|${e.publisher ?? "N/A"}|${e.version}`;
+            })).join("\n");
+            md += `<details><summary>Extensions (${this._data.enabledNonThemeExtesions.length})</summary>
 
 ${tableHeader}
 ${table}
-${themeExclusionStr}
 
 </details>`;
+        }
+        return md;
     }
 }