@codingame/monaco-vscode-issue-service-override 4.4.1 → 4.5.0-improve-code-splitting.1

package/issue.js

@@ -1,7 +1,8 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/services/issue/common/issue';
+import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/services/issue/common/issue.service';
 import { WebIssueService } from './vscode/src/vs/workbench/services/issue/browser/issueService.js';
-import { ITroubleshootIssueService, TroubleshootIssueService } from 'vscode/vscode/vs/workbench/services/issue/browser/issueTroubleshoot';
+import { TroubleshootIssueService } from './vscode/src/vs/workbench/services/issue/browser/issueTroubleshoot.js';
+import { ITroubleshootIssueService } from 'vscode/vscode/vs/workbench/services/issue/browser/issueTroubleshoot.service';
 import './vscode/src/vs/workbench/contrib/issue/browser/issue.contribution.js';
 
 function getServiceOverride() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-issue-service-override",
-  "version": "4.4.1",
+  "version": "4.5.0-improve-code-splitting.1",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -17,7 +17,15 @@
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
+  "exports": {
+    ".": {
+      "default": "./index.js"
+    },
+    "./vscode/*": {
+      "default": "./vscode/src/*.js"
+    }
+  },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@4.4.1"
+    "vscode": "npm:@codingame/monaco-vscode-api@4.5.0-improve-code-splitting.1"
   }
 }

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

@@ -1,13 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localizeWithPath } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
 import '../../../services/issue/browser/issueService.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { BaseIssueContribution } from '../common/issue.contribution.js';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 
 let WebIssueContribution = class WebIssueContribution extends BaseIssueContribution {
     constructor(productService, configurationService) {

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

@@ -3,9 +3,9 @@ import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
 import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
 import { MenuRegistry, MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/services/issue/common/issue';
-import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/services/issue/common/issue.service';
+import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 
 const OpenIssueReporterActionId = 'workbench.action.openIssueReporter';

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

@@ -4,9 +4,9 @@ import { CancellationToken } from 'vscode/vscode/vs/base/common/cancellation';
 import { toDisposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { userAgent } from 'vscode/vscode/vs/base/common/platform';
 import { normalizeGitHubUrl } from '../../../../platform/issue/common/issueReporterUtil.js';
-import { ILogService } from 'vscode/vscode/vs/platform/log/common/log';
-import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService';
-import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
 
 let WebIssueService = class WebIssueService {
     constructor(extensionService, productService, logService) {

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

@@ -0,0 +1,421 @@
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
+import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
+import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/services/issue/common/issue.service';
+import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
+import { registerAction2, Action2 } from 'vscode/vscode/vs/platform/actions/common/actions';
+import { IUserDataProfileService, IUserDataProfileManagementService, IUserDataProfileImportExportService } from 'vscode/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
+import { IExtensionBisectService } from 'vscode/vscode/vs/workbench/services/extensionManagement/browser/extensionBisect.service';
+import { NotificationPriority } from 'vscode/vscode/vs/platform/notification/common/notification';
+import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
+import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
+import { IUserDataProfilesService } from 'vscode/vscode/vs/platform/userDataProfile/common/userDataProfile.service';
+import { Categories } from 'vscode/vscode/vs/platform/action/common/actionCommonCategories';
+import { RawContextKey, ContextKeyExpr } from 'vscode/vscode/vs/platform/contextkey/common/contextkey';
+import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
+import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
+import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
+import { IOpenerService } from 'vscode/vscode/vs/platform/opener/common/opener.service';
+import { URI } from 'vscode/vscode/vs/base/common/uri';
+import { RemoteNameContext } from 'vscode/vscode/vs/workbench/common/contextkeys';
+import { IsWebContext } from 'vscode/vscode/vs/platform/contextkey/common/contextkeys';
+import { ITroubleshootIssueService } from 'vscode/vscode/vs/workbench/services/issue/browser/issueTroubleshoot.service';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
+
+var TroubleshootIssueService_1, IssueTroubleshootUi_1;
+var TroubleshootStage;
+( (function(TroubleshootStage) {
+    TroubleshootStage[TroubleshootStage["EXTENSIONS"] = 1] = "EXTENSIONS";
+    TroubleshootStage[TroubleshootStage["WORKBENCH"] = 2] = "WORKBENCH";
+})(TroubleshootStage || (TroubleshootStage = {})));
+class TroubleShootState {
+    static fromJSON(raw) {
+        if (!raw) {
+            return undefined;
+        }
+        try {
+            const data = JSON.parse(raw);
+            if ((data.stage === TroubleshootStage.EXTENSIONS || data.stage === TroubleshootStage.WORKBENCH)
+                && typeof data.profile === 'string') {
+                return ( new TroubleShootState(data.stage, data.profile));
+            }
+        }
+        catch {  }
+        return undefined;
+    }
+    constructor(stage, profile) {
+        this.stage = stage;
+        this.profile = profile;
+    }
+}
+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) {
+        super();
+        this.userDataProfileService = userDataProfileService;
+        this.userDataProfilesService = userDataProfilesService;
+        this.userDataProfileManagementService = userDataProfileManagementService;
+        this.userDataProfileImportExportService = userDataProfileImportExportService;
+        this.dialogService = dialogService;
+        this.extensionBisectService = extensionBisectService;
+        this.notificationService = notificationService;
+        this.extensionManagementService = extensionManagementService;
+        this.extensionEnablementService = extensionEnablementService;
+        this.issueService = issueService;
+        this.productService = productService;
+        this.hostService = hostService;
+        this.storageService = storageService;
+        this.openerService = openerService;
+    }
+    isActive() {
+        return this.state !== undefined;
+    }
+    async start() {
+        if (this.isActive()) {
+            throw new Error('invalid state');
+        }
+        const res = await this.dialogService.confirm({
+            message: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'troubleshoot issue',
+                "Troubleshoot Issue"
+            )),
+            detail: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'detail.start',
+                "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: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                { key: 'msg', comment: ['&& denotes a mnemonic'] },
+                "&&Troubleshoot Issue"
+            )),
+            custom: true
+        });
+        if (!res.confirmed) {
+            return;
+        }
+        const originalProfile = this.userDataProfileService.currentProfile;
+        await this.userDataProfileImportExportService.createTroubleshootProfile();
+        this.state = ( new TroubleShootState(TroubleshootStage.EXTENSIONS, originalProfile.id));
+        await this.resume();
+    }
+    async resume() {
+        if (!this.isActive()) {
+            return;
+        }
+        if (this.state?.stage === TroubleshootStage.EXTENSIONS && !this.extensionBisectService.isActive) {
+            await this.reproduceIssueWithExtensionsDisabled();
+        }
+        if (this.state?.stage === TroubleshootStage.WORKBENCH) {
+            await this.reproduceIssueWithEmptyProfile();
+        }
+        await this.stop();
+    }
+    async stop() {
+        if (!this.isActive()) {
+            return;
+        }
+        if (this.notificationHandle) {
+            this.notificationHandle.close();
+            this.notificationHandle = undefined;
+        }
+        if (this.extensionBisectService.isActive) {
+            await this.extensionBisectService.reset();
+        }
+        const profile = this.userDataProfilesService.profiles.find(p => p.id === this.state?.profile) ?? this.userDataProfilesService.defaultProfile;
+        this.state = undefined;
+        await this.userDataProfileManagementService.switchProfile(profile);
+    }
+    async reproduceIssueWithExtensionsDisabled() {
+        if (!(await this.extensionManagementService.getInstalled(1 )).length) {
+            this.state = ( new TroubleShootState(TroubleshootStage.WORKBENCH, this.state.profile));
+            return;
+        }
+        const result = await this.askToReproduceIssue(( localizeWithPath(
+            'vs/workbench/services/issue/browser/issueTroubleshoot',
+            'profile.extensions.disabled',
+            "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') {
+            const profile = this.userDataProfilesService.profiles.find(p => p.id === this.state.profile) ?? this.userDataProfilesService.defaultProfile;
+            await this.reproduceIssueWithExtensionsBisect(profile);
+        }
+        if (result === 'bad') {
+            this.state = ( new TroubleShootState(TroubleshootStage.WORKBENCH, this.state.profile));
+        }
+        if (result === 'stop') {
+            await this.stop();
+        }
+    }
+    async reproduceIssueWithEmptyProfile() {
+        await this.userDataProfileManagementService.createAndEnterTransientProfile();
+        this.updateState(this.state);
+        const result = await this.askToReproduceIssue(( localizeWithPath(
+            'vs/workbench/services/issue/browser/issueTroubleshoot',
+            'empty.profile',
+            "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') {
+            await this.stop();
+        }
+        if (result === 'good') {
+            await this.askToReportIssue(( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'issue is with configuration',
+                "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(( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'issue is in core',
+                "Issue troubleshooting has identified that the issue is with {0}.",
+                this.productService.nameLong
+            )));
+        }
+    }
+    async reproduceIssueWithExtensionsBisect(profile) {
+        await this.userDataProfileManagementService.switchProfile(profile);
+        const extensions = (await this.extensionManagementService.getInstalled(1 )).filter(ext => this.extensionEnablementService.isEnabled(ext));
+        await this.extensionBisectService.start(extensions);
+        await this.hostService.reload();
+    }
+    askToReproduceIssue(message) {
+        return ( new Promise((c, e) => {
+            const goodPrompt = {
+                label: ( localizeWithPath(
+                    'vs/workbench/services/issue/browser/issueTroubleshoot',
+                    'I cannot reproduce',
+                    "I Can't Reproduce"
+                )),
+                run: () => c('good')
+            };
+            const badPrompt = {
+                label: ( localizeWithPath(
+                    'vs/workbench/services/issue/browser/issueTroubleshoot',
+                    'This is Bad',
+                    "I Can Reproduce"
+                )),
+                run: () => c('bad')
+            };
+            const stop = {
+                label: ( localizeWithPath('vs/workbench/services/issue/browser/issueTroubleshoot', 'Stop', "Stop")),
+                run: () => c('stop')
+            };
+            this.notificationHandle = this.notificationService.prompt(Severity$1.Info, message, [goodPrompt, badPrompt, stop], { sticky: true, priority: NotificationPriority.URGENT });
+        }));
+    }
+    async askToReportIssue(message) {
+        let isCheckedInInsiders = false;
+        if (this.productService.quality === 'stable') {
+            const res = await this.askToReproduceIssueWithInsiders();
+            if (res === 'good') {
+                await this.dialogService.prompt({
+                    type: Severity$1.Info,
+                    message: ( localizeWithPath(
+                        'vs/workbench/services/issue/browser/issueTroubleshoot',
+                        'troubleshoot issue',
+                        "Troubleshoot Issue"
+                    )),
+                    detail: ( localizeWithPath(
+                        'vs/workbench/services/issue/browser/issueTroubleshoot',
+                        'use insiders',
+                        "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
+                    )),
+                    custom: true
+                });
+                return;
+            }
+            if (res === 'stop') {
+                await this.stop();
+                return;
+            }
+            if (res === 'bad') {
+                isCheckedInInsiders = true;
+            }
+        }
+        await this.issueService.openReporter({
+            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: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'troubleshoot issue',
+                "Troubleshoot Issue"
+            )),
+            primaryButton: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'download insiders',
+                "Download {0} Insiders",
+                this.productService.nameLong
+            )),
+            cancelButton: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'report anyway',
+                "Report Issue Anyway"
+            )),
+            detail: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'ask to download insiders',
+                "Please try to download and reproduce the issue in {0} insiders.",
+                this.productService.nameLong
+            )),
+            custom: {
+                disableCloseAction: true,
+            }
+        });
+        if (!confirmRes.confirmed) {
+            return undefined;
+        }
+        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: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'troubleshoot issue',
+                "Troubleshoot Issue"
+            )),
+            buttons: [{
+                    label: ( localizeWithPath(
+                        'vs/workbench/services/issue/browser/issueTroubleshoot',
+                        'good',
+                        "I can't reproduce"
+                    )),
+                    run: () => 'good'
+                }, {
+                    label: ( localizeWithPath(
+                        'vs/workbench/services/issue/browser/issueTroubleshoot',
+                        'bad',
+                        "I can reproduce"
+                    )),
+                    run: () => 'bad'
+                }],
+            cancelButton: {
+                label: ( localizeWithPath('vs/workbench/services/issue/browser/issueTroubleshoot', 'stop', "Stop")),
+                run: () => 'stop'
+            },
+            detail: ( localizeWithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'ask to reproduce issue',
+                "Please try to reproduce the issue in {0} insiders and confirm if the issue exists there.",
+                this.productService.nameLong
+            )),
+            custom: {
+                disableCloseAction: true,
+            }
+        });
+        return res.result;
+    }
+    get state() {
+        if (this._state === undefined) {
+            const raw = this.storageService.get(TroubleshootIssueService_1.storageKey, 0 );
+            this._state = TroubleShootState.fromJSON(raw);
+        }
+        return this._state || undefined;
+    }
+    set state(state) {
+        this._state = state ?? null;
+        this.updateState(state);
+    }
+    updateState(state) {
+        if (state) {
+            this.storageService.store(TroubleshootIssueService_1.storageKey, JSON.stringify(state), 0 , 1 );
+        }
+        else {
+            this.storageService.remove(TroubleshootIssueService_1.storageKey, 0 );
+        }
+    }
+};
+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)); }
+    constructor(contextKeyService, troubleshootIssueService, storageService) {
+        super();
+        this.contextKeyService = contextKeyService;
+        this.troubleshootIssueService = troubleshootIssueService;
+        this.updateContext();
+        if (troubleshootIssueService.isActive()) {
+            troubleshootIssueService.resume();
+        }
+        this._register(storageService.onDidChangeValue(0 , TroubleshootIssueService.storageKey, this._register(( new DisposableStore())))(() => {
+            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));
+( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(IssueTroubleshootUi, 3 );
+registerAction2(class TroubleshootIssueAction extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.troubleshootIssue.start',
+            title: ( localize2WithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'troubleshootIssue',
+                'Troubleshoot Issue...'
+            )),
+            category: Categories.Help,
+            f1: true,
+            precondition: ( ContextKeyExpr.and(( IssueTroubleshootUi.ctxIsTroubleshootActive.negate()), ( RemoteNameContext.isEqualTo('')), ( IsWebContext.negate()))),
+        });
+    }
+    run(accessor) {
+        return accessor.get(ITroubleshootIssueService).start();
+    }
+});
+registerAction2(class extends Action2 {
+    constructor() {
+        super({
+            id: 'workbench.action.troubleshootIssue.stop',
+            title: ( localize2WithPath(
+                'vs/workbench/services/issue/browser/issueTroubleshoot',
+                'title.stop',
+                'Stop Troubleshoot Issue'
+            )),
+            category: Categories.Help,
+            f1: true,
+            precondition: IssueTroubleshootUi.ctxIsTroubleshootActive
+        });
+    }
+    async run(accessor) {
+        return accessor.get(ITroubleshootIssueService).stop();
+    }
+});
+
+export { TroubleshootIssueService };