@codingame/monaco-vscode-issue-service-override 9.0.3 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-issue-service-override",
-  "version": "9.0.3",
+  "version": "10.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@9.0.3"
+    "vscode": "npm:@codingame/monaco-vscode-api@10.0.0"
   }
 }

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

@@ -17,7 +17,6 @@ import { localize } from 'vscode/vscode/vs/nls';
 import { getIconsStyleSheet } from 'vscode/vscode/vs/platform/theme/browser/iconsStyleSheet';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { IssueReporterModel } from './issueReporterModel.js';
-import { IssueType } from '../common/issue.js';
 import { IIssueFormService } from 'vscode/vscode/vs/workbench/contrib/issue/common/issue.service';
 import { normalizeGitHubUrl } from '../common/issueReporterUtil.js';
 
@@ -53,7 +52,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         const targetExtension = data.extensionId ? data.enabledExtensions.find(extension => extension.id.toLocaleLowerCase() === data.extensionId?.toLocaleLowerCase()) : undefined;
         this.issueReporterModel = ( (new IssueReporterModel({
             ...data,
-            issueType: data.issueType || IssueType.Bug,
+            issueType: data.issueType || 0 ,
             versionInfo: {
                 vscodeVersion: `${product.nameShort} ${!!product.darwinUniversalAssetId ? `${product.version} (Universal)` : product.version} (${product.commit || 'Commit unknown'}, ${product.date || 'Date unknown'})`,
                 os: `${this.os.type} ${this.os.arch} ${this.os.release}${isLinuxSnap ? ' snap' : ''}`
@@ -235,7 +234,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         const extensionsSelector = this.getElementById('extension-selector');
         if (extensionsSelector) {
             const { selectedExtension } = this.issueReporterModel.getData();
-            reset(extensionsSelector, this.makeOption('', ( localize(10170, "Select extension")), true), ...( (extensionOptions.map(extension => makeOption(extension, selectedExtension)))));
+            reset(extensionsSelector, this.makeOption('', ( localize(10360, "Select extension")), true), ...( (extensionOptions.map(extension => makeOption(extension, selectedExtension)))));
             if (!selectedExtension) {
                 extensionsSelector.selectedIndex = 0;
             }
@@ -316,11 +315,11 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
                     const info = containingElement && containingElement.lastElementChild;
                     if (info && info.classList.contains('hidden')) {
                         show(info);
-                        label.textContent = ( localize(10171, "hide"));
+                        label.textContent = ( localize(10361, "hide"));
                     }
                     else {
                         hide(info);
-                        label.textContent = ( localize(10172, "show"));
+                        label.textContent = ( localize(10362, "show"));
                     }
                 }
             });
@@ -340,16 +339,16 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             }
             const descriptionTextArea = this.getElementById('issue-title');
             if (value === IssueSource.VSCode) {
-                descriptionTextArea.placeholder = ( localize(10173, "E.g Workbench is missing problems panel"));
+                descriptionTextArea.placeholder = ( localize(10363, "E.g Workbench is missing problems panel"));
             }
             else if (value === IssueSource.Extension) {
-                descriptionTextArea.placeholder = ( localize(10174, "E.g. Missing alt text on extension readme image"));
+                descriptionTextArea.placeholder = ( localize(10364, "E.g. Missing alt text on extension readme image"));
             }
             else if (value === IssueSource.Marketplace) {
-                descriptionTextArea.placeholder = ( localize(10175, "E.g Cannot disable installed extension"));
+                descriptionTextArea.placeholder = ( localize(10365, "E.g Cannot disable installed extension"));
             }
             else {
-                descriptionTextArea.placeholder = ( localize(10176, "Please enter a title"));
+                descriptionTextArea.placeholder = ( localize(10366, "Please enter a title"));
             }
             let fileOnExtension, fileOnMarketplace = false;
             if (value === IssueSource.Extension) {
@@ -454,16 +453,16 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
     updatePreviewButtonState() {
         if (this.isPreviewEnabled()) {
             if (this.data.githubAccessToken) {
-                this.previewButton.label = ( localize(10177, "Create on GitHub"));
+                this.previewButton.label = ( localize(10367, "Create on GitHub"));
             }
             else {
-                this.previewButton.label = ( localize(10178, "Preview on GitHub"));
+                this.previewButton.label = ( localize(10368, "Preview on GitHub"));
             }
             this.previewButton.enabled = true;
         }
         else {
             this.previewButton.enabled = false;
-            this.previewButton.label = ( localize(10179, "Loading data..."));
+            this.previewButton.label = ( localize(10369, "Loading data..."));
         }
         const issueRepoName = this.getElementById('show-repo-name');
         const selectedExtension = this.issueReporterModel.getData().selectedExtension;
@@ -497,18 +496,18 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             return false;
         }
         if (this.isWeb) {
-            if (issueType === IssueType.FeatureRequest || issueType === IssueType.PerformanceIssue || issueType === IssueType.Bug) {
+            if (issueType === 2  || issueType === 1  || issueType === 0 ) {
                 return true;
             }
         }
         else {
-            if (issueType === IssueType.Bug && this.receivedSystemInfo) {
+            if (issueType === 0  && this.receivedSystemInfo) {
                 return true;
             }
-            if (issueType === IssueType.PerformanceIssue && this.receivedSystemInfo && this.receivedPerformanceInfo) {
+            if (issueType === 1  && this.receivedSystemInfo && this.receivedPerformanceInfo) {
                 return true;
             }
-            if (issueType === IssueType.FeatureRequest) {
+            if (issueType === 2 ) {
                 return true;
             }
         }
@@ -582,7 +581,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
                 }
                 else {
                     const message = $('div.list-title');
-                    message.textContent = ( localize(10180, "GitHub query limit exceeded. Please wait."));
+                    message.textContent = ( localize(10370, "GitHub query limit exceeded. Please wait."));
                     similarIssues.appendChild(message);
                     const resetTime = response.headers.get('X-RateLimit-Reset');
                     const timeToWait = resetTime ? parseInt(resetTime) - Math.floor(Date.now() / 1000) : 1;
@@ -632,7 +631,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         if (results.length) {
             const issues = $('div.issues-container');
             const issuesText = $('div.list-title');
-            issuesText.textContent = ( localize(10181, "Similar issues"));
+            issuesText.textContent = ( localize(10371, "Similar issues"));
             this.numberOfSearchResultsDisplayed = results.length < 5 ? results.length : 5;
             for (let i = 0; i < this.numberOfSearchResultsDisplayed; i++) {
                 const issue = results[i];
@@ -648,8 +647,8 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
                     const issueIcon = $('span.issue-icon');
                     issueIcon.appendChild(renderIcon(issue.state === 'open' ? Codicon.issueOpened : Codicon.issueClosed));
                     const issueStateLabel = $('span.issue-state.label');
-                    issueStateLabel.textContent = issue.state === 'open' ? ( localize(10182, "Open")) : ( localize(10183, "Closed"));
-                    issueState.title = issue.state === 'open' ? ( localize(10182, "Open")) : ( localize(10183, "Closed"));
+                    issueStateLabel.textContent = issue.state === 'open' ? ( localize(10372, "Open")) : ( localize(10373, "Closed"));
+                    issueState.title = issue.state === 'open' ? ( localize(10372, "Open")) : ( localize(10373, "Closed"));
                     issueState.appendChild(issueIcon);
                     issueState.appendChild(issueStateLabel);
                     item = $('div.issue', undefined, issueState, link);
@@ -664,7 +663,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         }
         else {
             const message = $('div.list-title');
-            message.textContent = ( localize(10184, "No similar issues found"));
+            message.textContent = ( localize(10374, "No similar issues found"));
             similarIssues.appendChild(message);
         }
     }
@@ -672,7 +671,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         const makeOption = (issueType, description) => $('option', { 'value': issueType.valueOf() }, escape(description));
         const typeSelect = this.getElementById('issue-type');
         const { issueType } = this.issueReporterModel.getData();
-        reset(typeSelect, makeOption(IssueType.Bug, ( localize(10185, "Bug Report"))), makeOption(IssueType.FeatureRequest, ( localize(10186, "Feature Request"))), makeOption(IssueType.PerformanceIssue, ( localize(10187, "Performance Issue (freeze, slow, crash)"))));
+        reset(typeSelect, makeOption(0 , ( localize(10375, "Bug Report"))), makeOption(2 , ( localize(10376, "Feature Request"))), makeOption(1 , ( localize(10377, "Performance Issue (freeze, slow, crash)"))));
         typeSelect.value = ( (issueType.toString()));
         this.setSourceOptions();
     }
@@ -702,14 +701,14 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             }
         }
         sourceSelect.innerText = '';
-        sourceSelect.append(this.makeOption('', ( localize(10188, "Select source")), true));
-        sourceSelect.append(this.makeOption(IssueSource.VSCode, ( localize(10189, "Visual Studio Code")), false));
-        sourceSelect.append(this.makeOption(IssueSource.Extension, ( localize(10190, "A VS Code extension")), false));
+        sourceSelect.append(this.makeOption('', ( localize(10378, "Select source")), true));
+        sourceSelect.append(this.makeOption(IssueSource.VSCode, ( localize(10379, "Visual Studio Code")), false));
+        sourceSelect.append(this.makeOption(IssueSource.Extension, ( localize(10380, "A VS Code extension")), false));
         if (this.product.reportMarketplaceIssueUrl) {
-            sourceSelect.append(this.makeOption(IssueSource.Marketplace, ( localize(10191, "Extensions Marketplace")), false));
+            sourceSelect.append(this.makeOption(IssueSource.Marketplace, ( localize(10381, "Extensions Marketplace")), false));
         }
-        if (issueType !== IssueType.FeatureRequest) {
-            sourceSelect.append(this.makeOption(IssueSource.Unknown, ( localize(10192, "Don't know")), false));
+        if (issueType !== 2 ) {
+            sourceSelect.append(this.makeOption(IssueSource.Unknown, ( localize(10382, "Don't know")), false));
         }
         if (selected !== -1 && selected < sourceSelect.options.length) {
             sourceSelect.selectedIndex = selected;
@@ -753,13 +752,13 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         if (selectedExtension && this.nonGitHubIssueUrl) {
             hide(titleTextArea);
             hide(descriptionTextArea);
-            reset(descriptionTitle, ( localize(10193, "This extension handles issues outside of VS Code")));
+            reset(descriptionTitle, ( localize(10383, "This extension handles issues outside of VS Code")));
             reset(descriptionSubtitle, ( localize(
-                10194,
+                10384,
                 "The '{0}' extension prefers to use an external issue reporter. To be taken to that issue reporting experience, click the button below.",
                 selectedExtension.displayName
             )));
-            this.previewButton.label = ( localize(10195, "Open External Issue Reporter"));
+            this.previewButton.label = ( localize(10385, "Open External Issue Reporter"));
             return;
         }
         if (fileOnExtension && selectedExtension?.data) {
@@ -777,7 +776,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             }, 100);
             show(extensionDataBlock);
         }
-        if (issueType === IssueType.Bug) {
+        if (issueType === 0 ) {
             if (!fileOnMarketplace) {
                 show(blockContainer);
                 show(systemBlock);
@@ -786,13 +785,13 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
                     show(extensionsBlock);
                 }
             }
-            reset(descriptionTitle, ( localize(10196, "Steps to Reproduce")) + ' ', $('span.required-input', undefined, '*'));
+            reset(descriptionTitle, ( localize(10386, "Steps to Reproduce")) + ' ', $('span.required-input', undefined, '*'));
             reset(descriptionSubtitle, ( localize(
-                10197,
+                10387,
                 "Share the steps needed to reliably reproduce the problem. Please include actual and expected results. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub."
             )));
         }
-        else if (issueType === IssueType.PerformanceIssue) {
+        else if (issueType === 1 ) {
             if (!fileOnMarketplace) {
                 show(blockContainer);
                 show(systemBlock);
@@ -806,16 +805,16 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             else if (!fileOnMarketplace) {
                 show(extensionsBlock);
             }
-            reset(descriptionTitle, ( localize(10196, "Steps to Reproduce")) + ' ', $('span.required-input', undefined, '*'));
+            reset(descriptionTitle, ( localize(10386, "Steps to Reproduce")) + ' ', $('span.required-input', undefined, '*'));
             reset(descriptionSubtitle, ( localize(
-                10198,
+                10388,
                 "When did this performance issue happen? Does it occur on startup or after a specific series of actions? We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub."
             )));
         }
-        else if (issueType === IssueType.FeatureRequest) {
-            reset(descriptionTitle, ( localize(10199, "Description")) + ' ', $('span.required-input', undefined, '*'));
+        else if (issueType === 2 ) {
+            reset(descriptionTitle, ( localize(10389, "Description")) + ' ', $('span.required-input', undefined, '*'));
             reset(descriptionSubtitle, ( localize(
-                10200,
+                10390,
                 "Please describe the feature you would like to see. We support GitHub-flavored Markdown. You will be able to edit your issue and add screenshots when we preview it on GitHub."
             )));
         }
@@ -949,7 +948,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             throw ( (new CancellationError()));
         }
         return baseUrl + `&body=${encodeURIComponent(( localize(
-            10201,
+            10391,
             "We have written the needed data into your clipboard because it was too large to send. Please paste."
         )))}`;
     }
@@ -1119,7 +1118,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         const target = this.window.document.querySelector('.block-extensions .block-info');
         if (target) {
             if (this.disableExtensions) {
-                reset(target, ( localize(10202, "Extensions are disabled")));
+                reset(target, ( localize(10392, "Extensions are disabled")));
                 return;
             }
             const themeExclusionStr = numThemeExtensions ? `\n(${numThemeExtensions} theme extensions excluded)` : '';

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

@@ -3,7 +3,6 @@ import { localize } from 'vscode/vscode/vs/nls';
 import { CommandsRegistry } from 'vscode/vscode/vs/platform/commands/common/commands';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { Registry } from 'vscode/vscode/vs/platform/registry/common/platform';
 import { Extensions as Extensions$1 } from 'vscode/vscode/vs/workbench/common/contributions';
@@ -12,7 +11,6 @@ import './issueService.js';
 import './issueTroubleshoot.js';
 import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { BaseIssueContribution } from '../common/issue.contribution.js';
-import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 
 let WebIssueContribution = class WebIssueContribution extends BaseIssueContribution {
     constructor(productService, configurationService) {
@@ -32,7 +30,7 @@ WebIssueContribution = ( (__decorate([
     ( (__param(0, IProductService))),
     ( (__param(1, IConfigurationService)))
 ], WebIssueContribution)));
-( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(WebIssueContribution, LifecyclePhase.Restored);
+( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(WebIssueContribution, 3 );
 CommandsRegistry.registerCommand('_issues.getSystemStatus', (accessor) => {
-    return ( localize(2476, "The --status argument is not yet supported in browsers."));
+    return ( localize(2702, "The --status argument is not yet supported in browsers."));
 });

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

@@ -111,19 +111,19 @@ let IssueFormService = class IssueFormService {
         await this.dialogService.prompt({
             type: Severity$1.Warning,
             message: ( localize(
-                2471,
+                2697,
                 "Your input will not be saved. Are you sure you want to close this window?"
             )),
             buttons: [
                 {
-                    label: ( localize(2472, "&&Yes")),
+                    label: ( localize(2698, "&&Yes")),
                     run: () => {
                         this.closeReporter();
                         this.issueReporterWindow = null;
                     }
                 },
                 {
-                    label: ( localize(2473, "Cancel")),
+                    label: ( localize(2699, "Cancel")),
                     run: () => { }
                 }
             ]
@@ -134,16 +134,16 @@ let IssueFormService = class IssueFormService {
         await this.dialogService.prompt({
             type: Severity$1.Warning,
             message: ( localize(
-                2474,
+                2700,
                 "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(2475, "&&OK")),
+                    label: ( localize(2701, "&&OK")),
                     run: () => { result = true; }
                 },
                 {
-                    label: ( localize(2473, "Cancel")),
+                    label: ( localize(2699, "Cancel")),
                     run: () => { result = false; }
                 }
             ]

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

@@ -1,11 +1,10 @@
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { isRemoteDiagnosticError } from 'vscode/vscode/vs/platform/diagnostics/common/diagnostics';
-import { IssueType } from '../common/issue.js';
 
 class IssueReporterModel {
     constructor(initialData) {
         const defaultData = {
-            issueType: IssueType.Bug,
+            issueType: 0 ,
             includeSystemInfo: true,
             includeWorkspaceInfo: true,
             includeProcessInfo: true,
@@ -60,9 +59,9 @@ ${this.getInfos()}
         return '';
     }
     fileOnExtension() {
-        const fileOnExtensionSupported = this._data.issueType === IssueType.Bug
-            || this._data.issueType === IssueType.PerformanceIssue
-            || this._data.issueType === IssueType.FeatureRequest;
+        const fileOnExtensionSupported = this._data.issueType === 0
+            || this._data.issueType === 1
+            || this._data.issueType === 2 ;
         return fileOnExtensionSupported && this._data.fileOnExtension;
     }
     getExtensionVersion() {
@@ -74,10 +73,10 @@ ${this.getInfos()}
         }
     }
     getIssueTypeTitle() {
-        if (this._data.issueType === IssueType.Bug) {
+        if (this._data.issueType === 0 ) {
             return 'Bug';
         }
-        else if (this._data.issueType === IssueType.PerformanceIssue) {
+        else if (this._data.issueType === 1 ) {
             return 'Performance Issue';
         }
         else {
@@ -89,7 +88,7 @@ ${this.getInfos()}
         if (this._data.fileOnMarketplace) {
             return info;
         }
-        const isBugOrPerformanceIssue = this._data.issueType === IssueType.Bug || this._data.issueType === IssueType.PerformanceIssue;
+        const isBugOrPerformanceIssue = this._data.issueType === 0  || this._data.issueType === 1 ;
         if (isBugOrPerformanceIssue) {
             if (this._data.includeExtensionData && this._data.extensionData) {
                 info += this.getExtensionData();
@@ -101,7 +100,7 @@ ${this.getInfos()}
                 info += 'System Info: ' + this._data.systemInfoWeb;
             }
         }
-        if (this._data.issueType === IssueType.PerformanceIssue) {
+        if (this._data.issueType === 1 ) {
             if (this._data.includeProcessInfo) {
                 info += this.generateProcessInfoMd();
             }

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

@@ -1,56 +1,56 @@
 import { escape } from 'vscode/vscode/vs/base/common/strings';
 import { localize } from 'vscode/vscode/vs/nls';
 
-const sendSystemInfoLabel = escape(( localize(5683, "Include my system information")));
-const sendProcessInfoLabel = escape(( localize(5684, "Include my currently running processes")));
-const sendWorkspaceInfoLabel = escape(( localize(5685, "Include my workspace metadata")));
-const sendExtensionsLabel = escape(( localize(5686, "Include my enabled extensions")));
-const sendExperimentsLabel = escape(( localize(5687, "Include A/B experiment info")));
-const sendExtensionData = escape(( localize(5688, "Include additional extension info")));
+const sendSystemInfoLabel = escape(( localize(6143, "Include my system information")));
+const sendProcessInfoLabel = escape(( localize(6144, "Include my currently running processes")));
+const sendWorkspaceInfoLabel = escape(( localize(6145, "Include my workspace metadata")));
+const sendExtensionsLabel = escape(( localize(6146, "Include my enabled extensions")));
+const sendExperimentsLabel = escape(( localize(6147, "Include A/B experiment info")));
+const sendExtensionData = escape(( localize(6148, "Include additional extension info")));
 const reviewGuidanceLabel = ( localize(
-    5689,
+    6149,
     '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>.'
 ));
 var BaseHtml = () => `
 <div class="issue-reporter" id="issue-reporter">
-	<div id="english" class="input-group hidden">${escape(( localize(5690, "Please complete the form in English.")))}</div>
+	<div id="english" class="input-group hidden">${escape(( localize(6150, "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(5691, "This is a")))}</label>
+			<label class="inline-label" for="issue-type">${escape(( localize(6151, "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(5692, "For")))} <span class="required-input">*</span></label>
+			<label class="inline-label" for="issue-source">${escape(( localize(6152, "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(5693, "An issue source is required.")))}</div>
+			<div id="issue-source-empty-error" class="validation-error hidden" role="alert">${escape(( localize(6153, "An issue source is required.")))}</div>
 			<div id="problem-source-help-text" class="instructions hidden">${escape(( localize(
-    5694,
+    6154,
     "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(5695, "disabling all extensions and reloading the window")))}</span>`)}
+    .replace('{0}', () => `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(( localize(6155, "disabling all extensions and reloading the window")))}</span>`)}
 			</div>
 
 			<div id="extension-selection">
-				<label class="inline-label" for="extension-selector">${escape(( localize(5696, "Extension")))} <span class="required-input">*</span></label>
+				<label class="inline-label" for="extension-selector">${escape(( localize(6156, "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(
-    5697,
+    6157,
     "The issue reporter is unable to create issues for this extension. Please visit {0} to report an issue."
 )))
     .replace('{0}', () => `<span tabIndex=0 role="button" id="extensionBugsLink" class="workbenchCommand"><!-- To be dynamically filled --></span>`)}</div>
 				<div id="extension-selection-validation-error-no-url" class="validation-error hidden" role="alert">
 					${escape(( localize(
-    5698,
+    6158,
     "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>
@@ -58,10 +58,10 @@ var BaseHtml = () => `
 		</div>
 
 		<div id="issue-title-container" class="input-group">
-			<label class="inline-label" for="issue-title">${escape(( localize(5699, "Title")))} <span class="required-input">*</span></label>
-			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(( localize(5700, "Please enter a title.")))}" required>
-			<div id="issue-title-empty-error" class="validation-error hidden" role="alert">${escape(( localize(5701, "A title is required.")))}</div>
-			<div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(( localize(5702, "The title is too long.")))}</div>
+			<label class="inline-label" for="issue-title">${escape(( localize(6159, "Title")))} <span class="required-input">*</span></label>
+			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(( localize(6160, "Please enter a title.")))}" required>
+			<div id="issue-title-empty-error" class="validation-error hidden" role="alert">${escape(( localize(6161, "A title is required.")))}</div>
+			<div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(( localize(6162, "The title is too long.")))}</div>
 			<small id="similar-issues">
 				<!-- To be dynamically filled -->
 			</small>
@@ -77,10 +77,10 @@ var BaseHtml = () => `
 			<!-- To be dynamically filled -->
 		</div>
 		<div class="block-info-text">
-			<textarea name="description" id="description" placeholder="${escape(( localize(5703, "Please enter details.")))}" required></textarea>
+			<textarea name="description" id="description" placeholder="${escape(( localize(6163, "Please enter details.")))}" required></textarea>
 		</div>
-		<div id="description-empty-error" class="validation-error hidden" role="alert">${escape(( localize(5704, "A description is required.")))}</div>
-		<div id="description-short-error" class="validation-error hidden" role="alert">${escape(( localize(5705, "Please provide a longer description.")))}</div>
+		<div id="description-empty-error" class="validation-error hidden" role="alert">${escape(( localize(6164, "A description is required.")))}</div>
+		<div id="description-short-error" class="validation-error hidden" role="alert">${escape(( localize(6165, "Please provide a longer description.")))}</div>
 	</div>
 
 	<div class="system-info" id="block-container">
@@ -89,9 +89,9 @@ 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(5706, "show")))}</a><span class="ext-parens" hidden>)</span>
+				<span class="ext-parens" hidden>(</span><a href="#" class="showInfo" id="extension-id">${escape(( localize(6166, "show")))}</a><span class="ext-parens" hidden>)</span>
 			</label>
-			<pre class="block-info" id="extension-data" placeholder="${escape(( localize(5707, "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(6167, "Extension does not have additional data to include.")))}" style="white-space: pre-wrap; user-select: text;">
 				<!-- To be dynamically filled -->
 			</pre>
 		</div>
@@ -100,7 +100,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(5706, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(6166, "show")))}</a>)
 			</label>
 			<div class="block-info hidden">
 				<!-- To be dynamically filled -->
@@ -110,7 +110,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(5706, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(6166, "show")))}</a>)
 			</label>
 			<pre class="block-info hidden">
 				<code>
@@ -122,7 +122,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(5706, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(6166, "show")))}</a>)
 			</label>
 			<pre id="systemInfo" class="block-info hidden">
 				<code>
@@ -134,7 +134,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(5706, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(6166, "show")))}</a>)
 			</label>
 			<div id="systemInfo" class="block-info hidden">
 				<!-- To be dynamically filled -->
@@ -144,7 +144,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(5706, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(6166, "show")))}</a>)
 			</label>
 			<pre class="block-info hidden">
 				<!-- To be dynamically filled -->

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

@@ -23,7 +23,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
             this.issueReporterModel.update({ issueType: issueType });
             const descriptionTextArea = this.getElementById('issue-title');
             if (descriptionTextArea) {
-                descriptionTextArea.placeholder = ( localize(5708, "Please enter a title"));
+                descriptionTextArea.placeholder = ( localize(6168, "Please enter a title"));
             }
             this.updatePreviewButtonState();
             this.setSourceOptions();

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

@@ -5,8 +5,6 @@ import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { userAgent } from 'vscode/vscode/vs/base/common/platform';
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
-import { ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import 'vscode/vscode/vs/platform/instantiation/common/extensions';
 import { normalizeGitHubUrl } from '../../../../platform/issue/common/issueReporterUtil.js';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import 'vscode/vscode/vs/platform/theme/common/colorUtils';
@@ -88,7 +86,7 @@ let BrowserIssueService = class BrowserIssueService {
                     const { manifest } = extension;
                     const manifestKeys = manifest.contributes ? ( Object.keys(manifest.contributes)) : [];
                     const isTheme = !manifest.main && !manifest.browser && manifestKeys.length === 1 && manifestKeys[0] === 'themes';
-                    const isBuiltin = extension.type === ExtensionType.System;
+                    const isBuiltin = extension.type === 0 ;
                     return {
                         name: manifest.name,
                         publisher: manifest.publisher,

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

@@ -1,7 +1,6 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { localize, localize2 } from 'vscode/vscode/vs/nls';
 import { IExtensionManagementService } from 'vscode/vscode/vs/platform/extensionManagement/common/extensionManagement.service';
-import { ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IProductService } from 'vscode/vscode/vs/platform/product/common/productService.service';
 import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/contrib/issue/common/issue.service';
 import { Disposable, DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
@@ -15,13 +14,10 @@ import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench
 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 'vscode/vscode/vs/platform/instantiation/common/extensions';
 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 { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
 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';
@@ -86,13 +82,13 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             throw ( (new Error('invalid state')));
         }
         const res = await this.dialogService.confirm({
-            message: ( localize(2451, "Troubleshoot Issue")),
+            message: ( localize(2677, "Troubleshoot Issue")),
             detail: ( localize(
-                2452,
+                2678,
                 "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(2453, "&&Troubleshoot Issue")),
+            primaryButton: ( localize(2679, "&&Troubleshoot Issue")),
             custom: true
         });
         if (!res.confirmed) {
@@ -131,12 +127,12 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         await this.userDataProfileManagementService.switchProfile(profile);
     }
     async reproduceIssueWithExtensionsDisabled() {
-        if (!(await this.extensionManagementService.getInstalled(ExtensionType.User)).length) {
+        if (!(await this.extensionManagementService.getInstalled(1 )).length) {
             this.state = ( (new TroubleShootState(TroubleshootStage.WORKBENCH, this.state.profile)));
             return;
         }
         const result = await this.askToReproduceIssue(( localize(
-            2454,
+            2680,
             "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') {
@@ -154,7 +150,7 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         await this.userDataProfileManagementService.createAndEnterTransientProfile();
         this.updateState(this.state);
         const result = await this.askToReproduceIssue(( localize(
-            2455,
+            2681,
             "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') {
@@ -162,13 +158,13 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         }
         if (result === 'good') {
             await this.askToReportIssue(( localize(
-                2456,
+                2682,
                 "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(
-                2457,
+                2683,
                 "Issue troubleshooting has identified that the issue is with {0}.",
                 this.productService.nameLong
             )));
@@ -176,7 +172,7 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     }
     async reproduceIssueWithExtensionsBisect(profile) {
         await this.userDataProfileManagementService.switchProfile(profile);
-        const extensions = (await this.extensionManagementService.getInstalled(ExtensionType.User)).filter(ext => this.extensionEnablementService.isEnabled(ext));
+        const extensions = (await this.extensionManagementService.getInstalled(1 )).filter(ext => this.extensionEnablementService.isEnabled(ext));
         await this.extensionBisectService.start(extensions);
         await this.hostService.reload();
     }
@@ -184,15 +180,15 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         return (
              (new Promise((c, e) => {
                 const goodPrompt = {
-                    label: ( localize(2458, "I Can't Reproduce")),
+                    label: ( localize(2684, "I Can't Reproduce")),
                     run: () => c('good')
                 };
                 const badPrompt = {
-                    label: ( localize(2459, "I Can Reproduce")),
+                    label: ( localize(2685, "I Can Reproduce")),
                     run: () => c('bad')
                 };
                 const stop = {
-                    label: ( localize(2460, "Stop")),
+                    label: ( localize(2686, "Stop")),
                     run: () => c('stop')
                 };
                 this.notificationHandle = this.notificationService.prompt(Severity$1.Info, message, [goodPrompt, badPrompt, stop], { sticky: true, priority: NotificationPriority.URGENT });
@@ -206,9 +202,9 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             if (res === 'good') {
                 await this.dialogService.prompt({
                     type: Severity$1.Info,
-                    message: ( localize(2451, "Troubleshoot Issue")),
+                    message: ( localize(2677, "Troubleshoot Issue")),
                     detail: ( localize(
-                        2461,
+                        2687,
                         "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
                     )),
@@ -231,11 +227,11 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     async askToReproduceIssueWithInsiders() {
         const confirmRes = await this.dialogService.confirm({
             type: 'info',
-            message: ( localize(2451, "Troubleshoot Issue")),
-            primaryButton: ( localize(2462, "Download {0} Insiders", this.productService.nameLong)),
-            cancelButton: ( localize(2463, "Report Issue Anyway")),
+            message: ( localize(2677, "Troubleshoot Issue")),
+            primaryButton: ( localize(2688, "Download {0} Insiders", this.productService.nameLong)),
+            cancelButton: ( localize(2689, "Report Issue Anyway")),
             detail: ( localize(
-                2464,
+                2690,
                 "Please try to download and reproduce the issue in {0} insiders.",
                 this.productService.nameLong
             )),
@@ -252,20 +248,20 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         }
         const res = await this.dialogService.prompt({
             type: 'info',
-            message: ( localize(2451, "Troubleshoot Issue")),
+            message: ( localize(2677, "Troubleshoot Issue")),
             buttons: [{
-                    label: ( localize(2465, "I can't reproduce")),
+                    label: ( localize(2691, "I can't reproduce")),
                     run: () => 'good'
                 }, {
-                    label: ( localize(2466, "I can reproduce")),
+                    label: ( localize(2692, "I can reproduce")),
                     run: () => 'bad'
                 }],
             cancelButton: {
-                label: ( localize(2467, "Stop")),
+                label: ( localize(2693, "Stop")),
                 run: () => 'stop'
             },
             detail: ( localize(
-                2468,
+                2694,
                 "Please try to reproduce the issue in {0} insiders and confirm if the issue exists there.",
                 this.productService.nameLong
             )),
@@ -277,7 +273,7 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     }
     get state() {
         if (this._state === undefined) {
-            const raw = this.storageService.get(TroubleshootIssueService_1.storageKey, StorageScope.PROFILE);
+            const raw = this.storageService.get(TroubleshootIssueService_1.storageKey, 0 );
             this._state = TroubleShootState.fromJSON(raw);
         }
         return this._state || undefined;
@@ -288,10 +284,10 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     }
     updateState(state) {
         if (state) {
-            this.storageService.store(TroubleshootIssueService_1.storageKey, JSON.stringify(state), StorageScope.PROFILE, StorageTarget.MACHINE);
+            this.storageService.store(TroubleshootIssueService_1.storageKey, JSON.stringify(state), 0 , 1 );
         }
         else {
-            this.storageService.remove(TroubleshootIssueService_1.storageKey, StorageScope.PROFILE);
+            this.storageService.remove(TroubleshootIssueService_1.storageKey, 0 );
         }
     }
 };
@@ -322,7 +318,7 @@ let IssueTroubleshootUi = class IssueTroubleshootUi extends Disposable {
         if (troubleshootIssueService.isActive()) {
             troubleshootIssueService.resume();
         }
-        this._register(storageService.onDidChangeValue(StorageScope.PROFILE, TroubleshootIssueService.storageKey, this._register(( (new DisposableStore()))))(() => {
+        this._register(storageService.onDidChangeValue(0 , TroubleshootIssueService.storageKey, this._register(( (new DisposableStore()))))(() => {
             this.updateContext();
         }));
     }
@@ -335,12 +331,12 @@ IssueTroubleshootUi = IssueTroubleshootUi_1 = ( (__decorate([
     ( (__param(1, ITroubleshootIssueService))),
     ( (__param(2, IStorageService)))
 ], IssueTroubleshootUi)));
-( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(IssueTroubleshootUi, LifecyclePhase.Restored);
+( (Registry.as(Extensions.Workbench))).registerWorkbenchContribution(IssueTroubleshootUi, 3 );
 registerAction2(class TroubleshootIssueAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.troubleshootIssue.start',
-            title: ( localize2(2469, 'Troubleshoot Issue...')),
+            title: ( localize2(2695, 'Troubleshoot Issue...')),
             category: Categories.Help,
             f1: true,
             precondition: ( (ContextKeyExpr.and(
@@ -358,7 +354,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.troubleshootIssue.stop',
-            title: ( localize2(2470, 'Stop Troubleshoot Issue')),
+            title: ( localize2(2696, 'Stop Troubleshoot Issue')),
             category: Categories.Help,
             f1: true,
             precondition: IssueTroubleshootUi.ctxIsTroubleshootActive

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

@@ -74,7 +74,7 @@ let BaseIssueContribution = class BaseIssueContribution extends Disposable {
         }));
         const reportIssue = {
             id: OpenIssueReporterActionId,
-            title: ( localize2(5709, "Report Issue...")),
+            title: ( localize2(6169, "Report Issue...")),
             category: Categories.Help
         };
         this._register(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: reportIssue }));
@@ -82,7 +82,7 @@ let BaseIssueContribution = class BaseIssueContribution extends Disposable {
             group: '3_feedback',
             command: {
                 id: OpenIssueReporterActionId,
-                title: ( localize(5710, "Report &&Issue"))
+                title: ( localize(6170, "Report &&Issue"))
             },
             order: 3
         }));

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

@@ -1,8 +0,0 @@
-var IssueType;
-( (function(IssueType) {
-    IssueType[IssueType["Bug"] = 0] = "Bug";
-    IssueType[IssueType["PerformanceIssue"] = 1] = "PerformanceIssue";
-    IssueType[IssueType["FeatureRequest"] = 2] = "FeatureRequest";
-})(IssueType || (IssueType = {})));
-
-export { IssueType };