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

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

@@ -2,18 +2,18 @@
 import { escape } from '@codingame/monaco-vscode-api/vscode/vs/base/common/strings';
 import { localize } from '@codingame/monaco-vscode-api/vscode/vs/nls';
 
-const sendSystemInfoLabel = escape(( localize(10668, "Include my system information")));
-const sendProcessInfoLabel = escape(( localize(10669, "Include my currently running processes")));
-const sendWorkspaceInfoLabel = escape(( localize(10670, "Include my workspace metadata")));
-const sendExtensionsLabel = escape(( localize(10671, "Include my enabled extensions")));
-const sendExperimentsLabel = escape(( localize(10672, "Include A/B experiment info")));
-const sendExtensionData = escape(( localize(10673, "Include additional extension info")));
+const sendSystemInfoLabel = escape(( localize(10837, "Include my system information")));
+const sendProcessInfoLabel = escape(( localize(10838, "Include my currently running processes")));
+const sendWorkspaceInfoLabel = escape(( localize(10839, "Include my workspace metadata")));
+const sendExtensionsLabel = escape(( localize(10840, "Include my enabled extensions")));
+const sendExperimentsLabel = escape(( localize(10841, "Include A/B experiment info")));
+const sendExtensionData = escape(( localize(10842, "Include additional extension info")));
 const acknowledgementsLabel = escape(( localize(
-    10674,
+    10843,
     "I acknowledge that my VS Code version is not updated and this issue may be closed."
 )));
 const reviewGuidanceLabel = ( localize(
-    10675,
+    10844,
     "Before you report an issue here please <a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">review the guidance we provide</a>. Please complete the form in English."
 ));
 var BaseHtml = () => `
@@ -23,40 +23,40 @@ var BaseHtml = () => `
     </span>
 </div>
 <div class="issue-reporter" id="issue-reporter">
-    <div id="english" class="input-group hidden">${escape(( localize(10676, "Please complete the form in English.")))}</div>
+    <div id="english" class="input-group hidden">${escape(( localize(10845, "Please complete the form in English.")))}</div>
 
     <div id="review-guidance-help-text" class="input-group">${reviewGuidanceLabel}</div>
 
     <div class="section">
         <div class="input-group">
-            <label class="inline-label" for="issue-type">${escape(( localize(10677, "This is a")))}</label>
+            <label class="inline-label" for="issue-type">${escape(( localize(10846, "This is a")))}</label>
             <select id="issue-type" class="inline-form-control">
                 <!-- To be dynamically filled -->
             </select>
         </div>
 
         <div class="input-group" id="problem-source">
-            <label class="inline-label" for="issue-source">${escape(( localize(10678, "For")))} <span class="required-input">*</span></label>
+            <label class="inline-label" for="issue-source">${escape(( localize(10847, "For")))} <span class="required-input">*</span></label>
             <select id="issue-source" class="inline-form-control" required>
                 <!-- To be dynamically filled -->
             </select>
-            <div id="issue-source-empty-error" class="validation-error hidden" role="alert">${escape(( localize(10679, "An issue source is required.")))}</div>
+            <div id="issue-source-empty-error" class="validation-error hidden" role="alert">${escape(( localize(10848, "An issue source is required.")))}</div>
             <div id="problem-source-help-text" class="instructions hidden">${escape(( localize(
-    10680,
+    10849,
     "Try to reproduce the problem after {0}. If the problem only reproduces when extensions are active, it is likely an issue with an extension."
 ))).replace(
     "{0}",
-    () => `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(( localize(10681, "disabling all extensions and reloading the window")))}</span>`
+    () => `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(( localize(10850, "disabling all extensions and reloading the window")))}</span>`
 )}
             </div>
 
             <div id="extension-selection">
-                <label class="inline-label" for="extension-selector">${escape(( localize(10682, "Extension")))} <span class="required-input">*</span></label>
+                <label class="inline-label" for="extension-selector">${escape(( localize(10851, "Extension")))} <span class="required-input">*</span></label>
                 <select id="extension-selector" class="inline-form-control">
                     <!-- To be dynamically filled -->
                 </select>
                 <div id="extension-selection-validation-error" class="validation-error hidden" role="alert">${escape(( localize(
-    10683,
+    10852,
     "The issue reporter is unable to create issues for this extension. Please visit {0} to report an issue."
 ))).replace(
     "{0}",
@@ -64,7 +64,7 @@ var BaseHtml = () => `
 )}</div>
                 <div id="extension-selection-validation-error-no-url" class="validation-error hidden" role="alert">
                     ${escape(( localize(
-    10684,
+    10853,
     "The issue reporter is unable to create issues for this extension, as it does not specify a URL for reporting issues. Please check the marketplace page of this extension to see if other instructions are available."
 )))}
                 </div>
@@ -72,10 +72,10 @@ var BaseHtml = () => `
         </div>
 
         <div id="issue-title-container" class="input-group">
-            <label class="inline-label" for="issue-title">${escape(( localize(10685, "Title")))} <span class="required-input">*</span></label>
-            <input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(( localize(10686, "Please enter a title.")))}" required>
-            <div id="issue-title-empty-error" class="validation-error hidden" role="alert">${escape(( localize(10687, "A title is required.")))}</div>
-            <div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(( localize(10688, "The title is too long.")))}</div>
+            <label class="inline-label" for="issue-title">${escape(( localize(10854, "Title")))} <span class="required-input">*</span></label>
+            <input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(( localize(10855, "Please enter a title.")))}" required>
+            <div id="issue-title-empty-error" class="validation-error hidden" role="alert">${escape(( localize(10856, "A title is required.")))}</div>
+            <div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(( localize(10857, "The title is too long.")))}</div>
             <small id="similar-issues">
                 <!-- To be dynamically filled -->
             </small>
@@ -91,10 +91,10 @@ var BaseHtml = () => `
             <!-- To be dynamically filled -->
         </div>
         <div class="block-info-text">
-            <textarea name="description" id="description" placeholder="${escape(( localize(10689, "Please enter details.")))}" required></textarea>
+            <textarea name="description" id="description" placeholder="${escape(( localize(10858, "Please enter details.")))}" required></textarea>
         </div>
-        <div id="description-empty-error" class="validation-error hidden" role="alert">${escape(( localize(10690, "A description is required.")))}</div>
-        <div id="description-short-error" class="validation-error hidden" role="alert">${escape(( localize(10691, "Please provide a longer description.")))}</div>
+        <div id="description-empty-error" class="validation-error hidden" role="alert">${escape(( localize(10859, "A description is required.")))}</div>
+        <div id="description-short-error" class="validation-error hidden" role="alert">${escape(( localize(10860, "Please provide a longer description.")))}</div>
     </div>
 
     <div class="system-info" id="block-container">
@@ -103,10 +103,10 @@ var BaseHtml = () => `
             <label class="extension-caption" id="extension-caption" for="includeExtensionData">
                 ${sendExtensionData}
                 <span id="ext-loading" hidden></span>
-                <span class="ext-parens" hidden>(</span><a href="#" class="showInfo" id="extension-id">${escape(( localize(10692, "show")))}</a><span class="ext-parens" hidden>)</span>
-                <a id="extension-data-download">${escape(( localize(10693, "Download Extension Data")))}</a>
+                <span class="ext-parens" hidden>(</span><a href="#" class="showInfo" id="extension-id">${escape(( localize(10861, "show")))}</a><span class="ext-parens" hidden>)</span>
+                <a id="extension-data-download">${escape(( localize(10862, "Download Extension Data")))}</a>
             </label>
-            <pre class="block-info" id="extension-data" placeholder="${escape(( localize(10694, "Extension does not have additional data to include.")))}" style="white-space: pre-wrap; user-select: text;">
+            <pre class="block-info" id="extension-data" placeholder="${escape(( localize(10863, "Extension does not have additional data to include.")))}" style="white-space: pre-wrap; user-select: text;">
                 <!-- To be dynamically filled -->
             </pre>
         </div>
@@ -115,7 +115,7 @@ var BaseHtml = () => `
             <input class="sendData" aria-label="${sendSystemInfoLabel}" type="checkbox" id="includeSystemInfo" checked/>
             <label class="caption" for="includeSystemInfo">
                 ${sendSystemInfoLabel}
-                (<a href="#" class="showInfo">${escape(( localize(10692, "show")))}</a>)
+                (<a href="#" class="showInfo">${escape(( localize(10861, "show")))}</a>)
             </label>
             <div class="block-info hidden" style="user-select: text;">
                 <!-- To be dynamically filled -->
@@ -125,7 +125,7 @@ var BaseHtml = () => `
             <input class="sendData" aria-label="${sendProcessInfoLabel}" type="checkbox" id="includeProcessInfo" checked/>
             <label class="caption" for="includeProcessInfo">
                 ${sendProcessInfoLabel}
-                (<a href="#" class="showInfo">${escape(( localize(10692, "show")))}</a>)
+                (<a href="#" class="showInfo">${escape(( localize(10861, "show")))}</a>)
             </label>
             <pre class="block-info hidden" style="user-select: text;">
                 <code>
@@ -137,7 +137,7 @@ var BaseHtml = () => `
             <input class="sendData" aria-label="${sendWorkspaceInfoLabel}" type="checkbox" id="includeWorkspaceInfo" checked/>
             <label class="caption" for="includeWorkspaceInfo">
                 ${sendWorkspaceInfoLabel}
-                (<a href="#" class="showInfo">${escape(( localize(10692, "show")))}</a>)
+                (<a href="#" class="showInfo">${escape(( localize(10861, "show")))}</a>)
             </label>
             <pre id="systemInfo" class="block-info hidden" style="user-select: text;">
                 <code>
@@ -149,7 +149,7 @@ var BaseHtml = () => `
             <input class="sendData" aria-label="${sendExtensionsLabel}" type="checkbox" id="includeExtensions" checked/>
             <label class="caption" for="includeExtensions">
                 ${sendExtensionsLabel}
-                (<a href="#" class="showInfo">${escape(( localize(10692, "show")))}</a>)
+                (<a href="#" class="showInfo">${escape(( localize(10861, "show")))}</a>)
             </label>
             <div id="systemInfo" class="block-info hidden" style="user-select: text;">
                 <!-- To be dynamically filled -->
@@ -159,7 +159,7 @@ var BaseHtml = () => `
             <input class="sendData" aria-label="${sendExperimentsLabel}" type="checkbox" id="includeExperiments" checked/>
             <label class="caption" for="includeExperiments">
                 ${sendExperimentsLabel}
-                (<a href="#" class="showInfo">${escape(( localize(10692, "show")))}</a>)
+                (<a href="#" class="showInfo">${escape(( localize(10861, "show")))}</a>)
             </label>
             <pre class="block-info hidden" style="user-select: text;">
                 <!-- To be dynamically filled -->

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

@@ -60,7 +60,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
             });
             const descriptionTextArea = this.getElementById("issue-title");
             if (descriptionTextArea) {
-                descriptionTextArea.placeholder = ( localize(10695, "Please enter a title"));
+                descriptionTextArea.placeholder = ( localize(10864, "Please enter a title"));
             }
             this.updateButtonStates();
             this.setSourceOptions();

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

@@ -94,9 +94,9 @@ let BrowserIssueService = class BrowserIssueService {
                 const potentialSessions = githubSessions.filter(session => session.scopes.includes("repo"));
                 githubAccessToken = potentialSessions[0]?.accessToken;
             } catch (e) {}
-            let isUnsupported = false;
+            let isInstallationPure = true;
             try {
-                isUnsupported = !(await this.integrityService.isPure()).isPure;
+                isInstallationPure = (await this.integrityService.isPure()).isPure;
             } catch (e) {}
             const extensionData = [];
             try {
@@ -146,7 +146,7 @@ let BrowserIssueService = class BrowserIssueService {
                 enabledExtensions: extensionData,
                 experiments: experiments?.join("\n"),
                 restrictedMode: !this.workspaceTrustManagementService.isWorkspaceTrusted(),
-                isUnsupported,
+                isInstallationPure,
                 isSessionsWindow: this.environmentService.isSessionsWindow,
                 githubAccessToken
             }, options);

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

@@ -102,13 +102,13 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             throw ( new Error("invalid state"));
         }
         const res = await this.dialogService.confirm({
-            message: ( localize(10696, "Troubleshoot Issue")),
+            message: ( localize(10865, "Troubleshoot Issue")),
             detail: ( localize(
-                10697,
+                10866,
                 "Issue troubleshooting is a process to help you identify the cause for an issue. The cause for an issue can be a misconfiguration, due to an extension, or be {0} itself.\n\nDuring the process the window reloads repeatedly. Each time you must confirm if you are still seeing the issue.",
                 this.productService.nameLong
             )),
-            primaryButton: ( localize(10698, "&&Troubleshoot Issue")),
+            primaryButton: ( localize(10867, "&&Troubleshoot Issue")),
             custom: true
         });
         if (!res.confirmed) {
@@ -152,7 +152,7 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             return;
         }
         const result = await this.askToReproduceIssue(( localize(
-            10699,
+            10868,
             "Issue troubleshooting is active and has temporarily disabled all installed extensions. Check if you can still reproduce the problem and proceed by selecting from these options."
         )));
         if (result === "good") {
@@ -170,7 +170,7 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         await this.userDataProfileManagementService.createAndEnterTransientProfile();
         this.updateState(this.state);
         const result = await this.askToReproduceIssue(( localize(
-            10700,
+            10869,
             "Issue troubleshooting is active and has temporarily reset your configurations to defaults. Check if you can still reproduce the problem and proceed by selecting from these options."
         )));
         if (result === "stop") {
@@ -178,13 +178,13 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         }
         if (result === "good") {
             await this.askToReportIssue(( localize(
-                10701,
+                10870,
                 "Issue troubleshooting has identified that the issue is caused by your configurations. Please report the issue by exporting your configurations using \"Export Profile\" command and share the file in the issue report."
             )));
         }
         if (result === "bad") {
             await this.askToReportIssue(( localize(
-                10702,
+                10871,
                 "Issue troubleshooting has identified that the issue is with {0}.",
                 this.productService.nameLong
             )));
@@ -199,15 +199,15 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     askToReproduceIssue(message) {
         return (new Promise((c, e) => {
             const goodPrompt = {
-                label: ( localize(10703, "I Can't Reproduce")),
+                label: ( localize(10872, "I Can't Reproduce")),
                 run: () => c("good")
             };
             const badPrompt = {
-                label: ( localize(10704, "I Can Reproduce")),
+                label: ( localize(10873, "I Can Reproduce")),
                 run: () => c("bad")
             };
             const stop = {
-                label: ( localize(10705, "Stop")),
+                label: ( localize(10874, "Stop")),
                 run: () => c("stop")
             };
             this.notificationHandle = this.notificationService.prompt(Severity.Info, message, [goodPrompt, badPrompt, stop], {
@@ -223,9 +223,9 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             if (res === "good") {
                 await this.dialogService.prompt({
                     type: Severity.Info,
-                    message: ( localize(10696, "Troubleshoot Issue")),
+                    message: ( localize(10865, "Troubleshoot Issue")),
                     detail: ( localize(
-                        10706,
+                        10875,
                         "This likely means that the issue has been addressed already and will be available in an upcoming release. You can safely use {0} insiders until the new stable version is available.",
                         this.productService.nameLong
                     )),
@@ -248,11 +248,11 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     async askToReproduceIssueWithInsiders() {
         const confirmRes = await this.dialogService.confirm({
             type: "info",
-            message: ( localize(10696, "Troubleshoot Issue")),
-            primaryButton: ( localize(10707, "Download {0} Insiders", this.productService.nameLong)),
-            cancelButton: ( localize(10708, "Report Issue Anyway")),
+            message: ( localize(10865, "Troubleshoot Issue")),
+            primaryButton: ( localize(10876, "Download {0} Insiders", this.productService.nameLong)),
+            cancelButton: ( localize(10877, "Report Issue Anyway")),
             detail: ( localize(
-                10709,
+                10878,
                 "Please try to download and reproduce the issue in {0} insiders.",
                 this.productService.nameLong
             )),
@@ -269,20 +269,20 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         }
         const res = await this.dialogService.prompt({
             type: "info",
-            message: ( localize(10696, "Troubleshoot Issue")),
+            message: ( localize(10865, "Troubleshoot Issue")),
             buttons: [{
-                label: ( localize(10710, "I can't reproduce")),
+                label: ( localize(10879, "I can't reproduce")),
                 run: () => "good"
             }, {
-                label: ( localize(10711, "I can reproduce")),
+                label: ( localize(10880, "I can reproduce")),
                 run: () => "bad"
             }],
             cancelButton: {
-                label: ( localize(10712, "Stop")),
+                label: ( localize(10881, "Stop")),
                 run: () => "stop"
             },
             detail: ( localize(
-                10713,
+                10882,
                 "Please try to reproduce the issue in {0} insiders and confirm if the issue exists there.",
                 this.productService.nameLong
             )),
@@ -348,7 +348,7 @@ registerAction2(class TroubleshootIssueAction extends Action2 {
     constructor() {
         super({
             id: "workbench.action.troubleshootIssue.start",
-            title: ( localize2(10714, "Troubleshoot Issue...")),
+            title: ( localize2(10883, "Troubleshoot Issue...")),
             category: Categories.Help,
             f1: true,
             precondition: ( ContextKeyExpr.and(( IssueTroubleshootUi.ctxIsTroubleshootActive.negate()), ( RemoteNameContext.isEqualTo("")), ( IsWebContext.negate())))
@@ -362,7 +362,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: "workbench.action.troubleshootIssue.stop",
-            title: ( localize2(10715, "Stop Troubleshoot Issue")),
+            title: ( localize2(10884, "Stop Troubleshoot Issue")),
             category: Categories.Help,
             f1: true,
             precondition: IssueTroubleshootUi.ctxIsTroubleshootActive

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

@@ -0,0 +1,9 @@
+import { IRectangle } from "@codingame/monaco-vscode-api/vscode/vs/platform/window/common/window";
+import { IScreenshotService } from "@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/issue/browser/screenshotService.service";
+/**
+ * Browser fallback — screenshot not available in web.
+ */
+export declare class BrowserScreenshotService implements IScreenshotService {
+    readonly _serviceBrand: undefined;
+    captureScreenshot(_rect?: IRectangle): Promise<string | undefined>;
+}

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

@@ -0,0 +1,9 @@
+
+
+class BrowserScreenshotService {
+    async captureScreenshot(_rect) {
+        return undefined;
+    }
+}
+
+export { BrowserScreenshotService };

package/vscode/src/vs/workbench/contrib/issue/common/issue.contribution.js

@@ -81,7 +81,7 @@ let BaseIssueContribution = class BaseIssueContribution extends Disposable {
         }));
         const reportIssue = {
             id: OpenIssueReporterActionId,
-            title: ( localize2(10716, "Report Issue...")),
+            title: ( localize2(10885, "Report Issue...")),
             category: Categories.Help
         };
         this._register(MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
@@ -91,7 +91,7 @@ let BaseIssueContribution = class BaseIssueContribution extends Disposable {
             group: "3_feedback",
             command: {
                 id: OpenIssueReporterActionId,
-                title: ( localize(10717, "Report &&Issue"))
+                title: ( localize(10886, "Report &&Issue"))
             },
             order: 3
         }));

package/vscode/src/vs/workbench/contrib/issue/common/issue.d.ts

@@ -15,7 +15,8 @@ export declare enum IssueType {
 export declare enum IssueSource {
     VSCode = "vscode",
     Extension = "extension",
-    Marketplace = "marketplace"
+    Marketplace = "marketplace",
+    Unknown = "unknown"
 }
 export interface IssueReporterStyles extends WindowStyles {
     textLinkColor?: string;
@@ -53,12 +54,24 @@ export interface IssueReporterExtensionData {
 export interface IssueReporterData extends WindowData {
     styles: IssueReporterStyles;
     enabledExtensions: IssueReporterExtensionData[];
+    /**
+     * Resolves once `enabledExtensions` has been populated (or failed to populate).
+     * Lets the wizard pane wait for the async extension enumeration in
+     * `NativeIssueService` to finish before rendering the extensions section.
+     */
+    whenExtensionsLoaded?: Promise<void>;
+    /**
+     * Resolves once all async data (extensions, token, integrity, experiments)
+     * has been populated. Lets the wizard pane forward late-arriving values
+     * like `isInstallationPure` and `githubAccessToken` into the overlay model.
+     */
+    whenDataComplete?: Promise<void>;
     issueType?: IssueType;
     issueSource?: IssueSource;
     extensionId?: string;
     experiments?: string;
     restrictedMode: boolean;
-    isUnsupported: boolean;
+    isInstallationPure: boolean;
     isSessionsWindow: boolean;
     githubAccessToken: string;
     issueTitle?: string;
@@ -72,3 +85,20 @@ export interface ISettingSearchResult {
     key: string;
     score: number;
 }
+/**
+ * Narrow surface of the issue reporter wizard that `IIssueFormService.submitIssue`
+ * relies on. Keeping this in `common/` (rather than depending on the browser-side
+ * `IssueReporterOverlay` class) lets the service interface be implemented and
+ * consumed cleanly across layers.
+ */
+export interface IIssueSubmissionHost {
+    getScreenshots(): readonly {
+        readonly dataUrl: string;
+        readonly annotatedDataUrl?: string;
+    }[];
+    getRecordings(): readonly {
+        readonly filePath: string;
+    }[];
+    setUploading(uploading: boolean): void;
+    setAttachmentUploadState(index: number, state: "pending" | "uploading" | "done"): void;
+}

package/vscode/src/vs/workbench/contrib/issue/common/issue.js

@@ -11,6 +11,7 @@ var IssueSource;
     IssueSource["VSCode"] = "vscode";
     IssueSource["Extension"] = "extension";
     IssueSource["Marketplace"] = "marketplace";
+    IssueSource["Unknown"] = "unknown";
 })(IssueSource || (IssueSource = {}));
 
 export { IssueSource, IssueType };