@codingame/monaco-vscode-issue-service-override 25.1.1 → 26.0.0

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

@@ -33,7 +33,7 @@ import Severity from '@codingame/monaco-vscode-api/vscode/vs/base/common/severit
 
 var TroubleshootIssueService_1, IssueTroubleshootUi_1;
 var TroubleshootStage;
-(function (TroubleshootStage) {
+(function(TroubleshootStage) {
     TroubleshootStage[TroubleshootStage["EXTENSIONS"] = 1] = "EXTENSIONS";
     TroubleshootStage[TroubleshootStage["WORKBENCH"] = 2] = "WORKBENCH";
 })(TroubleshootStage || (TroubleshootStage = {}));
@@ -44,12 +44,10 @@ class TroubleShootState {
         }
         try {
             const data = JSON.parse(raw);
-            if ((data.stage === TroubleshootStage.EXTENSIONS || data.stage === TroubleshootStage.WORKBENCH)
-                && typeof data.profile === 'string') {
+            if ((data.stage === TroubleshootStage.EXTENSIONS || data.stage === TroubleshootStage.WORKBENCH) && typeof data.profile === "string") {
                 return ( new TroubleShootState(data.stage, data.profile));
             }
-        }
-        catch {  }
+        } catch {}
         return undefined;
     }
     constructor(stage, profile) {
@@ -58,9 +56,28 @@ class TroubleShootState {
     }
 }
 let TroubleshootIssueService = class TroubleshootIssueService extends Disposable {
-    static { TroubleshootIssueService_1 = this; }
-    static { this.storageKey = 'issueTroubleshootState'; }
-    constructor(userDataProfileService, userDataProfilesService, userDataProfileManagementService, userDataProfileImportExportService, dialogService, extensionBisectService, notificationService, extensionManagementService, extensionEnablementService, issueService, productService, hostService, storageService, openerService) {
+    static {
+        TroubleshootIssueService_1 = this;
+    }
+    static {
+        this.storageKey = "issueTroubleshootState";
+    }
+    constructor(
+        userDataProfileService,
+        userDataProfilesService,
+        userDataProfileManagementService,
+        userDataProfileImportExportService,
+        dialogService,
+        extensionBisectService,
+        notificationService,
+        extensionManagementService,
+        extensionEnablementService,
+        issueService,
+        productService,
+        hostService,
+        storageService,
+        openerService
+    ) {
         super();
         this.userDataProfileService = userDataProfileService;
         this.userDataProfilesService = userDataProfilesService;
@@ -82,16 +99,16 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     }
     async start() {
         if (this.isActive()) {
-            throw ( new Error('invalid state'));
+            throw ( new Error("invalid state"));
         }
         const res = await this.dialogService.confirm({
-            message: ( localize(8480, "Troubleshoot Issue")),
+            message: ( localize(8787, "Troubleshoot Issue")),
             detail: ( localize(
-                8481,
+                8788,
                 "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(8482, "&&Troubleshoot Issue")),
+            primaryButton: ( localize(8789, "&&Troubleshoot Issue")),
             custom: true
         });
         if (!res.confirmed) {
@@ -135,17 +152,17 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             return;
         }
         const result = await this.askToReproduceIssue(( localize(
-            8483,
+            8790,
             "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') {
+        if (result === "good") {
             const profile = this.userDataProfilesService.profiles.find(p => p.id === this.state.profile) ?? this.userDataProfilesService.defaultProfile;
             await this.reproduceIssueWithExtensionsBisect(profile);
         }
-        if (result === 'bad') {
+        if (result === "bad") {
             this.state = ( new TroubleShootState(TroubleshootStage.WORKBENCH, this.state.profile));
         }
-        if (result === 'stop') {
+        if (result === "stop") {
             await this.stop();
         }
     }
@@ -153,21 +170,21 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         await this.userDataProfileManagementService.createAndEnterTransientProfile();
         this.updateState(this.state);
         const result = await this.askToReproduceIssue(( localize(
-            8484,
+            8791,
             "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') {
+        if (result === "stop") {
             await this.stop();
         }
-        if (result === 'good') {
+        if (result === "good") {
             await this.askToReportIssue(( localize(
-                8485,
+                8792,
                 "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') {
+        if (result === "bad") {
             await this.askToReportIssue(( localize(
-                8486,
+                8793,
                 "Issue troubleshooting has identified that the issue is with {0}.",
                 this.productService.nameLong
             )));
@@ -182,30 +199,33 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     askToReproduceIssue(message) {
         return (new Promise((c, e) => {
             const goodPrompt = {
-                label: ( localize(8487, "I Can't Reproduce")),
-                run: () => c('good')
+                label: ( localize(8794, "I Can't Reproduce")),
+                run: () => c("good")
             };
             const badPrompt = {
-                label: ( localize(8488, "I Can Reproduce")),
-                run: () => c('bad')
+                label: ( localize(8795, "I Can Reproduce")),
+                run: () => c("bad")
             };
             const stop = {
-                label: ( localize(8489, "Stop")),
-                run: () => c('stop')
+                label: ( localize(8796, "Stop")),
+                run: () => c("stop")
             };
-            this.notificationHandle = this.notificationService.prompt(Severity.Info, message, [goodPrompt, badPrompt, stop], { sticky: true, priority: NotificationPriority.URGENT });
+            this.notificationHandle = this.notificationService.prompt(Severity.Info, message, [goodPrompt, badPrompt, stop], {
+                sticky: true,
+                priority: NotificationPriority.URGENT
+            });
         }));
     }
     async askToReportIssue(message) {
         let isCheckedInInsiders = false;
-        if (this.productService.quality === 'stable') {
+        if (this.productService.quality === "stable") {
             const res = await this.askToReproduceIssueWithInsiders();
-            if (res === 'good') {
+            if (res === "good") {
                 await this.dialogService.prompt({
                     type: Severity.Info,
-                    message: ( localize(8480, "Troubleshoot Issue")),
+                    message: ( localize(8787, "Troubleshoot Issue")),
                     detail: ( localize(
-                        8490,
+                        8797,
                         "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
                     )),
@@ -213,61 +233,61 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
                 });
                 return;
             }
-            if (res === 'stop') {
+            if (res === "stop") {
                 await this.stop();
                 return;
             }
-            if (res === 'bad') {
+            if (res === "bad") {
                 isCheckedInInsiders = true;
             }
         }
         await this.issueService.openReporter({
-            issueBody: `> ${message} ${isCheckedInInsiders ? `It is confirmed that the issue exists in ${this.productService.nameLong} Insiders` : ''}`,
+            issueBody: `> ${message} ${isCheckedInInsiders ? `It is confirmed that the issue exists in ${this.productService.nameLong} Insiders` : ""}`
         });
     }
     async askToReproduceIssueWithInsiders() {
         const confirmRes = await this.dialogService.confirm({
-            type: 'info',
-            message: ( localize(8480, "Troubleshoot Issue")),
-            primaryButton: ( localize(8491, "Download {0} Insiders", this.productService.nameLong)),
-            cancelButton: ( localize(8492, "Report Issue Anyway")),
+            type: "info",
+            message: ( localize(8787, "Troubleshoot Issue")),
+            primaryButton: ( localize(8798, "Download {0} Insiders", this.productService.nameLong)),
+            cancelButton: ( localize(8799, "Report Issue Anyway")),
             detail: ( localize(
-                8493,
+                8800,
                 "Please try to download and reproduce the issue in {0} insiders.",
                 this.productService.nameLong
             )),
             custom: {
-                disableCloseAction: true,
+                disableCloseAction: true
             }
         });
         if (!confirmRes.confirmed) {
             return undefined;
         }
-        const opened = await this.openerService.open(( URI.parse('https://aka.ms/vscode-insiders')));
+        const opened = await this.openerService.open(( URI.parse("https://aka.ms/vscode-insiders")));
         if (!opened) {
             return undefined;
         }
         const res = await this.dialogService.prompt({
-            type: 'info',
-            message: ( localize(8480, "Troubleshoot Issue")),
+            type: "info",
+            message: ( localize(8787, "Troubleshoot Issue")),
             buttons: [{
-                    label: ( localize(8494, "I can't reproduce")),
-                    run: () => 'good'
-                }, {
-                    label: ( localize(8495, "I can reproduce")),
-                    run: () => 'bad'
-                }],
+                label: ( localize(8801, "I can't reproduce")),
+                run: () => "good"
+            }, {
+                label: ( localize(8802, "I can reproduce")),
+                run: () => "bad"
+            }],
             cancelButton: {
-                label: ( localize(8496, "Stop")),
-                run: () => 'stop'
+                label: ( localize(8803, "Stop")),
+                run: () => "stop"
             },
             detail: ( localize(
-                8497,
+                8804,
                 "Please try to reproduce the issue in {0} insiders and confirm if the issue exists there.",
                 this.productService.nameLong
             )),
             custom: {
-                disableCloseAction: true,
+                disableCloseAction: true
             }
         });
         return res.result;
@@ -285,32 +305,25 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     }
     updateState(state) {
         if (state) {
-            this.storageService.store(TroubleshootIssueService_1.storageKey, JSON.stringify(state), StorageScope.PROFILE, StorageTarget.MACHINE);
-        }
-        else {
+            this.storageService.store(
+                TroubleshootIssueService_1.storageKey,
+                JSON.stringify(state),
+                StorageScope.PROFILE,
+                StorageTarget.MACHINE
+            );
+        } else {
             this.storageService.remove(TroubleshootIssueService_1.storageKey, StorageScope.PROFILE);
         }
     }
 };
-TroubleshootIssueService = TroubleshootIssueService_1 = ( __decorate([
-    ( __param(0, IUserDataProfileService)),
-    ( __param(1, IUserDataProfilesService)),
-    ( __param(2, IUserDataProfileManagementService)),
-    ( __param(3, IUserDataProfileImportExportService)),
-    ( __param(4, IDialogService)),
-    ( __param(5, IExtensionBisectService)),
-    ( __param(6, INotificationService)),
-    ( __param(7, IExtensionManagementService)),
-    ( __param(8, IWorkbenchExtensionEnablementService)),
-    ( __param(9, IWorkbenchIssueService)),
-    ( __param(10, IProductService)),
-    ( __param(11, IHostService)),
-    ( __param(12, IStorageService)),
-    ( __param(13, IOpenerService))
-], TroubleshootIssueService));
+TroubleshootIssueService = TroubleshootIssueService_1 = ( __decorate([( __param(0, IUserDataProfileService)), ( __param(1, IUserDataProfilesService)), ( __param(2, IUserDataProfileManagementService)), ( __param(3, IUserDataProfileImportExportService)), ( __param(4, IDialogService)), ( __param(5, IExtensionBisectService)), ( __param(6, INotificationService)), ( __param(7, IExtensionManagementService)), ( __param(8, IWorkbenchExtensionEnablementService)), ( __param(9, IWorkbenchIssueService)), ( __param(10, IProductService)), ( __param(11, IHostService)), ( __param(12, IStorageService)), ( __param(13, IOpenerService))], TroubleshootIssueService));
 let IssueTroubleshootUi = class IssueTroubleshootUi extends Disposable {
-    static { IssueTroubleshootUi_1 = this; }
-    static { this.ctxIsTroubleshootActive = ( new RawContextKey('isIssueTroubleshootActive', false)); }
+    static {
+        IssueTroubleshootUi_1 = this;
+    }
+    static {
+        this.ctxIsTroubleshootActive = ( new RawContextKey("isIssueTroubleshootActive", false));
+    }
     constructor(contextKeyService, troubleshootIssueService, storageService) {
         super();
         this.contextKeyService = contextKeyService;
@@ -319,28 +332,26 @@ let IssueTroubleshootUi = class IssueTroubleshootUi extends Disposable {
         if (troubleshootIssueService.isActive()) {
             troubleshootIssueService.resume();
         }
-        this._register(storageService.onDidChangeValue(StorageScope.PROFILE, TroubleshootIssueService.storageKey, this._store)(() => {
-            this.updateContext();
-        }));
+        this._register(
+            storageService.onDidChangeValue(StorageScope.PROFILE, TroubleshootIssueService.storageKey, this._store)(() => {
+                this.updateContext();
+            })
+        );
     }
     updateContext() {
         IssueTroubleshootUi_1.ctxIsTroubleshootActive.bindTo(this.contextKeyService).set(this.troubleshootIssueService.isActive());
     }
 };
-IssueTroubleshootUi = IssueTroubleshootUi_1 = ( __decorate([
-    ( __param(0, IContextKeyService)),
-    ( __param(1, ITroubleshootIssueService)),
-    ( __param(2, IStorageService))
-], IssueTroubleshootUi));
+IssueTroubleshootUi = IssueTroubleshootUi_1 = ( __decorate([( __param(0, IContextKeyService)), ( __param(1, ITroubleshootIssueService)), ( __param(2, IStorageService))], IssueTroubleshootUi));
 ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(IssueTroubleshootUi, LifecyclePhase.Restored);
 registerAction2(class TroubleshootIssueAction extends Action2 {
     constructor() {
         super({
-            id: 'workbench.action.troubleshootIssue.start',
-            title: ( localize2(8498, 'Troubleshoot Issue...')),
+            id: "workbench.action.troubleshootIssue.start",
+            title: ( localize2(8805, "Troubleshoot Issue...")),
             category: Categories.Help,
             f1: true,
-            precondition: ( ContextKeyExpr.and(( IssueTroubleshootUi.ctxIsTroubleshootActive.negate()), ( RemoteNameContext.isEqualTo('')), ( IsWebContext.negate()))),
+            precondition: ( ContextKeyExpr.and(( IssueTroubleshootUi.ctxIsTroubleshootActive.negate()), ( RemoteNameContext.isEqualTo("")), ( IsWebContext.negate())))
         });
     }
     run(accessor) {
@@ -350,8 +361,8 @@ registerAction2(class TroubleshootIssueAction extends Action2 {
 registerAction2(class extends Action2 {
     constructor() {
         super({
-            id: 'workbench.action.troubleshootIssue.stop',
-            title: ( localize2(8499, 'Stop Troubleshoot Issue')),
+            id: "workbench.action.troubleshootIssue.stop",
+            title: ( localize2(8806, "Stop Troubleshoot Issue")),
             category: Categories.Help,
             f1: true,
             precondition: IssueTroubleshootUi.ctxIsTroubleshootActive

package/vscode/src/vs/workbench/contrib/issue/browser/media/issueReporter.css

@@ -80,9 +80,7 @@
 .issue-reporter-body .monaco-text-button {
 	display: block;
 	width: auto;
-	padding: 4px 10px;
 	align-self: flex-end;
-	font-size: 13px;
 }
 
 .issue-reporter-body .monaco-button-dropdown {
@@ -603,10 +601,6 @@ body.issue-reporter-body  {
 	line-height: 15px; /* approximate button height for vertical centering */
 }
 
-.issue-reporter-body .internal-elements .monaco-text-button {
-	font-size: 10px;
-	padding: 2px 8px;
-}
 
 .issue-reporter-body .internal-elements #show-private-repo-name {
 	align-self: flex-end;

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

@@ -10,50 +10,45 @@ import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/pla
 import { IProductService } from '@codingame/monaco-vscode-api/vscode/vs/platform/product/common/productService.service';
 import { IWorkbenchIssueService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/issue/common/issue.service';
 
-const OpenIssueReporterActionId = 'workbench.action.openIssueReporter';
-const OpenIssueReporterApiId = 'vscode.openIssueReporter';
+const OpenIssueReporterActionId = "workbench.action.openIssueReporter";
+const OpenIssueReporterApiId = "vscode.openIssueReporter";
 const OpenIssueReporterCommandMetadata = {
-    description: 'Open the issue reporter and optionally prefill part of the form.',
-    args: [
-        {
-            name: 'options',
-            description: 'Data to use to prefill the issue reporter with.',
-            isOptional: true,
-            schema: {
-                oneOf: [
-                    {
-                        type: 'string',
-                        description: 'The extension id to preselect.'
+    description: "Open the issue reporter and optionally prefill part of the form.",
+    args: [{
+        name: "options",
+        description: "Data to use to prefill the issue reporter with.",
+        isOptional: true,
+        schema: {
+            oneOf: [{
+                type: "string",
+                description: "The extension id to preselect."
+            }, {
+                type: "object",
+                properties: {
+                    extensionId: {
+                        type: "string"
                     },
-                    {
-                        type: 'object',
-                        properties: {
-                            extensionId: {
-                                type: 'string'
-                            },
-                            issueTitle: {
-                                type: 'string'
-                            },
-                            issueBody: {
-                                type: 'string'
-                            }
-                        }
+                    issueTitle: {
+                        type: "string"
+                    },
+                    issueBody: {
+                        type: "string"
                     }
-                ]
-            }
-        },
-    ]
+                }
+            }]
+        }
+    }]
 };
 let BaseIssueContribution = class BaseIssueContribution extends Disposable {
     constructor(productService, configurationService) {
         super();
-        if (!configurationService.getValue('telemetry.feedback.enabled')) {
+        if (!configurationService.getValue("telemetry.feedback.enabled")) {
             this._register(CommandsRegistry.registerCommand({
-                id: 'workbench.action.openIssueReporter',
-                handler: function (accessor) {
+                id: "workbench.action.openIssueReporter",
+                handler: function(accessor) {
                     const data = accessor.get(INotificationService);
-                    data.info('Feedback is disabled.');
-                },
+                    data.info("Feedback is disabled.");
+                }
             }));
             return;
         }
@@ -62,47 +57,46 @@ let BaseIssueContribution = class BaseIssueContribution extends Disposable {
         }
         this._register(CommandsRegistry.registerCommand({
             id: OpenIssueReporterActionId,
-            handler: function (accessor, args) {
-                const data = typeof args === 'string'
-                    ? { extensionId: args }
-                    : Array.isArray(args)
-                        ? { extensionId: args[0] }
-                        : args ?? {};
+            handler: function(accessor, args) {
+                const data = typeof args === "string" ? {
+                    extensionId: args
+                } : Array.isArray(args) ? {
+                    extensionId: args[0]
+                } : args ?? {};
                 return accessor.get(IWorkbenchIssueService).openReporter(data);
             },
             metadata: OpenIssueReporterCommandMetadata
         }));
         this._register(CommandsRegistry.registerCommand({
             id: OpenIssueReporterApiId,
-            handler: function (accessor, args) {
-                const data = typeof args === 'string'
-                    ? { extensionId: args }
-                    : Array.isArray(args)
-                        ? { extensionId: args[0] }
-                        : args ?? {};
+            handler: function(accessor, args) {
+                const data = typeof args === "string" ? {
+                    extensionId: args
+                } : Array.isArray(args) ? {
+                    extensionId: args[0]
+                } : args ?? {};
                 return accessor.get(IWorkbenchIssueService).openReporter(data);
             },
             metadata: OpenIssueReporterCommandMetadata
         }));
         const reportIssue = {
             id: OpenIssueReporterActionId,
-            title: ( localize2(8500, "Report Issue...")),
+            title: ( localize2(8807, "Report Issue...")),
             category: Categories.Help
         };
-        this._register(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: reportIssue }));
+        this._register(MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
+            command: reportIssue
+        }));
         this._register(MenuRegistry.appendMenuItem(MenuId.MenubarHelpMenu, {
-            group: '3_feedback',
+            group: "3_feedback",
             command: {
                 id: OpenIssueReporterActionId,
-                title: ( localize(8501, "Report &&Issue"))
+                title: ( localize(8808, "Report &&Issue"))
             },
             order: 3
         }));
     }
 };
-BaseIssueContribution = ( __decorate([
-    ( __param(0, IProductService)),
-    ( __param(1, IConfigurationService))
-], BaseIssueContribution));
+BaseIssueContribution = ( __decorate([( __param(0, IProductService)), ( __param(1, IConfigurationService))], BaseIssueContribution));
 
 export { BaseIssueContribution };