npm - @codingame/monaco-vscode-issue-service-override - Versions diffs - 7.1.0 → 8.0.0 - Mend

@codingame/monaco-vscode-issue-service-override 7.1.0 → 8.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/issue.js CHANGED Viewed

@@ -1,9 +1,8 @@
 import { SyncDescriptor } from 'vscode/vscode/vs/platform/instantiation/common/descriptors';
-import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/contrib/issue/common/issue.service';
+import { IWorkbenchIssueService, IIssueFormService } from 'vscode/vscode/vs/workbench/contrib/issue/common/issue.service';
 import { TroubleshootIssueService } from './vscode/src/vs/workbench/contrib/issue/browser/issueTroubleshoot.js';
 import { ITroubleshootIssueService } from 'vscode/vscode/vs/workbench/contrib/issue/browser/issueTroubleshoot.service';
 import { BrowserIssueService } from './vscode/src/vs/workbench/contrib/issue/browser/issueService.js';
-import { IIssueMainService } from 'vscode/vscode/vs/platform/issue/common/issue.service';
 import { IssueFormService } from './vscode/src/vs/workbench/contrib/issue/browser/issueFormService.js';
 import './vscode/src/vs/workbench/contrib/issue/browser/issue.contribution.js';
@@ -11,7 +10,7 @@ function getServiceOverride() {
     return {
         [( IWorkbenchIssueService.toString())]: new SyncDescriptor(BrowserIssueService, [], false),
         [( ITroubleshootIssueService.toString())]: new SyncDescriptor(TroubleshootIssueService, [], false),
-        [( IIssueMainService.toString())]: new SyncDescriptor(IssueFormService, [], false)
+        [( IIssueFormService.toString())]: new SyncDescriptor(IssueFormService, [], false)
     };
 }

package/package.json CHANGED Viewed

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

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

@@ -1,20 +1,19 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+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 { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
 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';
+import './issueFormService.js';
 import './issueService.js';
+import './issueTroubleshoot.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.service';
-import { Extensions } from 'vscode/vscode/vs/platform/configuration/common/configurationRegistry';
-import './issueFormService.js';
-import './issueTroubleshoot.js';
+import { LifecyclePhase } from 'vscode/vscode/vs/workbench/services/lifecycle/common/lifecycle';
-const _moduleId = "vs/workbench/contrib/issue/browser/issue.contribution";
 let WebIssueContribution = class WebIssueContribution extends BaseIssueContribution {
     constructor(productService, configurationService) {
         super(productService, configurationService);
@@ -35,5 +34,5 @@ WebIssueContribution = ( (__decorate([
 ], WebIssueContribution)));
 ( (Registry.as(Extensions$1.Workbench))).registerWorkbenchContribution(WebIssueContribution, LifecyclePhase.Restored);
 CommandsRegistry.registerCommand('_issues.getSystemStatus', (accessor) => {
-    return ( localizeWithPath(_moduleId, 0, "The --status argument is not yet supported in browsers."));
+    return ( localize(1985, "The --status argument is not yet supported in browsers."));
 });

package/vscode/src/vs/workbench/contrib/issue/browser/issue.js CHANGED Viewed

@@ -1,24 +1,23 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { createStyleSheet, $, reset, windowOpenNoOpener } from 'vscode/vscode/vs/base/browser/dom';
 import { Button, unthemedButtonStyles } from 'vscode/vscode/vs/base/browser/ui/button/button';
 import { renderIcon } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
+import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { Delayer, RunOnceScheduler } from 'vscode/vscode/vs/base/common/async';
 import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { debounce } from 'vscode/vscode/vs/base/common/decorators';
 import { CancellationError } from 'vscode/vscode/vs/base/common/errors';
+import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
 import { isLinuxSnap } from 'vscode/vscode/vs/base/common/platform';
 import { escape } from 'vscode/vscode/vs/base/common/strings';
 import { URI } from 'vscode/vscode/vs/base/common/uri';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IssueType } from '../../../../platform/issue/common/issue.js';
-import { IIssueMainService } from 'vscode/vscode/vs/platform/issue/common/issue.service';
-import { normalizeGitHubUrl } from '../../../../platform/issue/common/issueReporterUtil.js';
+import { localize } from 'vscode/vscode/vs/nls';
 import { getIconsStyleSheet } from 'vscode/vscode/vs/platform/theme/browser/iconsStyleSheet';
 import { IssueReporterModel } from './issueReporterModel.js';
-import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
+import { IssueType } from '../common/issue.js';
+import { IIssueFormService } from 'vscode/vscode/vs/workbench/contrib/issue/common/issue.service';
+import { normalizeGitHubUrl } from '../common/issueReporterUtil.js';
-const _moduleId = "vs/workbench/contrib/issue/browser/issue";
 const MAX_URL_LENGTH = 7500;
 var IssueSource;
 ( ((function(IssueSource) {
@@ -28,7 +27,7 @@ var IssueSource;
     IssueSource["Unknown"] = "unknown";
 })(IssueSource || (IssueSource = {}))));
 let BaseIssueReporterService = class BaseIssueReporterService extends Disposable {
-    constructor(disableExtensions, data, os, product, window, isWeb, issueMainService) {
+    constructor(disableExtensions, data, os, product, window, isWeb, issueFormService) {
         super();
         this.disableExtensions = disableExtensions;
         this.data = data;
@@ -36,7 +35,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         this.product = product;
         this.window = window;
         this.isWeb = isWeb;
-        this.issueMainService = issueMainService;
+        this.issueFormService = issueFormService;
         this.receivedSystemInfo = false;
         this.numberOfSearchResultsDisplayed = 0;
         this.receivedPerformanceInfo = false;
@@ -124,6 +123,10 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         if (styles.inputBackground) {
             content.push(`input[type="text"], textarea, select, .issues-container > .issue > .issue-state, .block-info { background-color: ${styles.inputBackground} !important; }`);
         }
+        if (styles.backgroundColor) {
+            content.push(`.monaco-workbench { background-color: ${styles.backgroundColor} !important; }`);
+            content.push(`.issue-reporter-body::-webkit-scrollbar-track { background-color: ${styles.backgroundColor}; }`);
+        }
         if (styles.inputBorder) {
             content.push(`input[type="text"], textarea, select { border: 1px solid ${styles.inputBorder}; }`);
         }
@@ -155,14 +158,12 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         if (styles.textLinkActiveForeground) {
             content.push(`a:hover, .workbenchCommand:hover { color: ${styles.textLinkActiveForeground}; }`);
         }
-        if (styles.sliderBackgroundColor) {
-            content.push(`::-webkit-scrollbar-thumb { background-color: ${styles.sliderBackgroundColor}; }`);
-        }
         if (styles.sliderActiveColor) {
-            content.push(`::-webkit-scrollbar-thumb:active { background-color: ${styles.sliderActiveColor}; }`);
+            content.push(`.issue-reporter-body::-webkit-scrollbar-thumb:active { background-color: ${styles.sliderActiveColor}; }`);
         }
         if (styles.sliderHoverColor) {
-            content.push(`::--webkit-scrollbar-thumb:hover { background-color: ${styles.sliderHoverColor}; }`);
+            content.push(`.issue-reporter-body::-webkit-scrollbar-thumb { background-color: ${styles.sliderHoverColor}; }`);
+            content.push(`.issue-reporter-body::--webkit-scrollbar-thumb:hover { background-color: ${styles.sliderHoverColor}; }`);
         }
         if (styles.buttonBackground) {
             content.push(`.monaco-text-button { background-color: ${styles.buttonBackground} !important; }`);
@@ -206,11 +207,11 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
                     const info = containingElement && containingElement.lastElementChild;
                     if (info && info.classList.contains('hidden')) {
                         show(info);
-                        label.textContent = ( localizeWithPath(_moduleId, 0, "hide"));
+                        label.textContent = ( localize(10115, "hide"));
                     }
                     else {
                         hide(info);
-                        label.textContent = ( localizeWithPath(_moduleId, 1, "show"));
+                        label.textContent = ( localize(10116, "show"));
                     }
                 }
             });
@@ -230,16 +231,16 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             }
             const descriptionTextArea = this.getElementById('issue-title');
             if (value === IssueSource.VSCode) {
-                descriptionTextArea.placeholder = ( localizeWithPath(_moduleId, 2, "E.g Workbench is missing problems panel"));
+                descriptionTextArea.placeholder = ( localize(10117, "E.g Workbench is missing problems panel"));
             }
             else if (value === IssueSource.Extension) {
-                descriptionTextArea.placeholder = ( localizeWithPath(_moduleId, 3, "E.g. Missing alt text on extension readme image"));
+                descriptionTextArea.placeholder = ( localize(10118, "E.g. Missing alt text on extension readme image"));
             }
             else if (value === IssueSource.Marketplace) {
-                descriptionTextArea.placeholder = ( localizeWithPath(_moduleId, 4, "E.g Cannot disable installed extension"));
+                descriptionTextArea.placeholder = ( localize(10119, "E.g Cannot disable installed extension"));
             }
             else {
-                descriptionTextArea.placeholder = ( localizeWithPath(_moduleId, 5, "Please enter a title"));
+                descriptionTextArea.placeholder = ( localize(10120, "Please enter a title"));
             }
             let fileOnExtension, fileOnMarketplace = false;
             if (value === IssueSource.Extension) {
@@ -297,16 +298,16 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
     updatePreviewButtonState() {
         if (this.isPreviewEnabled()) {
             if (this.data.githubAccessToken) {
-                this.previewButton.label = ( localizeWithPath(_moduleId, 6, "Create on GitHub"));
+                this.previewButton.label = ( localize(10121, "Create on GitHub"));
             }
             else {
-                this.previewButton.label = ( localizeWithPath(_moduleId, 7, "Preview on GitHub"));
+                this.previewButton.label = ( localize(10122, "Preview on GitHub"));
             }
             this.previewButton.enabled = true;
         }
         else {
             this.previewButton.enabled = false;
-            this.previewButton.label = ( localizeWithPath(_moduleId, 8, "Loading data..."));
+            this.previewButton.label = ( localize(10123, "Loading data..."));
         }
         const issueRepoName = this.getElementById('show-repo-name');
         const selectedExtension = this.issueReporterModel.getData().selectedExtension;
@@ -351,6 +352,9 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             if (issueType === IssueType.PerformanceIssue && this.receivedSystemInfo && this.receivedPerformanceInfo) {
                 return true;
             }
+            if (issueType === IssueType.FeatureRequest) {
+                return true;
+            }
         }
         return false;
     }
@@ -404,7 +408,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         }
     }
     async close() {
-        await this.issueMainService.$closeReporter();
+        await this.issueFormService.closeReporter();
     }
     clearSearchResults() {
         const similarIssues = this.getElementById('similar-issues');
@@ -422,7 +426,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
                 }
                 else {
                     const message = $('div.list-title');
-                    message.textContent = ( localizeWithPath(_moduleId, 9, "GitHub query limit exceeded. Please wait."));
+                    message.textContent = ( localize(10124, "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;
@@ -472,7 +476,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         if (results.length) {
             const issues = $('div.issues-container');
             const issuesText = $('div.list-title');
-            issuesText.textContent = ( localizeWithPath(_moduleId, 10, "Similar issues"));
+            issuesText.textContent = ( localize(10125, "Similar issues"));
             this.numberOfSearchResultsDisplayed = results.length < 5 ? results.length : 5;
             for (let i = 0; i < this.numberOfSearchResultsDisplayed; i++) {
                 const issue = results[i];
@@ -488,8 +492,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' ? ( localizeWithPath(_moduleId, 11, "Open")) : ( localizeWithPath(_moduleId, 12, "Closed"));
-                    issueState.title = issue.state === 'open' ? ( localizeWithPath(_moduleId, 11, "Open")) : ( localizeWithPath(_moduleId, 12, "Closed"));
+                    issueStateLabel.textContent = issue.state === 'open' ? ( localize(10126, "Open")) : ( localize(10127, "Closed"));
+                    issueState.title = issue.state === 'open' ? ( localize(10127, "Open")) : ( localize(10127, "Closed"));
                     issueState.appendChild(issueIcon);
                     issueState.appendChild(issueStateLabel);
                     item = $('div.issue', undefined, issueState, link);
@@ -504,7 +508,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         }
         else {
             const message = $('div.list-title');
-            message.textContent = ( localizeWithPath(_moduleId, 13, "No similar issues found"));
+            message.textContent = ( localize(10128, "No similar issues found"));
             similarIssues.appendChild(message);
         }
     }
@@ -512,7 +516,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, ( localizeWithPath(_moduleId, 14, "Bug Report"))), makeOption(IssueType.FeatureRequest, ( localizeWithPath(_moduleId, 15, "Feature Request"))), makeOption(IssueType.PerformanceIssue, ( localizeWithPath(_moduleId, 16, "Performance Issue (freeze, slow, crash)"))));
+        reset(typeSelect, makeOption(IssueType.Bug, ( localize(10129, "Bug Report"))), makeOption(IssueType.FeatureRequest, ( localize(10130, "Feature Request"))), makeOption(IssueType.PerformanceIssue, ( localize(10131, "Performance Issue (freeze, slow, crash)"))));
         typeSelect.value = ( (issueType.toString()));
         this.setSourceOptions();
     }
@@ -542,14 +546,14 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             }
         }
         sourceSelect.innerText = '';
-        sourceSelect.append(this.makeOption('', ( localizeWithPath(_moduleId, 17, "Select source")), true));
-        sourceSelect.append(this.makeOption(IssueSource.VSCode, ( localizeWithPath(_moduleId, 18, "Visual Studio Code")), false));
-        sourceSelect.append(this.makeOption(IssueSource.Extension, ( localizeWithPath(_moduleId, 19, "A VS Code extension")), false));
+        sourceSelect.append(this.makeOption('', ( localize(10132, "Select source")), true));
+        sourceSelect.append(this.makeOption(IssueSource.VSCode, ( localize(10133, "Visual Studio Code")), false));
+        sourceSelect.append(this.makeOption(IssueSource.Extension, ( localize(10134, "A VS Code extension")), false));
         if (this.product.reportMarketplaceIssueUrl) {
-            sourceSelect.append(this.makeOption(IssueSource.Marketplace, ( localizeWithPath(_moduleId, 20, "Extensions Marketplace")), false));
+            sourceSelect.append(this.makeOption(IssueSource.Marketplace, ( localize(10135, "Extensions Marketplace")), false));
         }
         if (issueType !== IssueType.FeatureRequest) {
-            sourceSelect.append(this.makeOption(IssueSource.Unknown, ( localizeWithPath(_moduleId, 21, "Don't know")), false));
+            sourceSelect.append(this.makeOption(IssueSource.Unknown, ( localize(10136, "Don't know")), false));
         }
         if (selected !== -1 && selected < sourceSelect.options.length) {
             sourceSelect.selectedIndex = selected;
@@ -593,14 +597,13 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         if (selectedExtension && this.nonGitHubIssueUrl) {
             hide(titleTextArea);
             hide(descriptionTextArea);
-            reset(descriptionTitle, ( localizeWithPath(_moduleId, 22, "This extension handles issues outside of VS Code")));
-            reset(descriptionSubtitle, ( localizeWithPath(
-                _moduleId,
-                23,
+            reset(descriptionTitle, ( localize(10137, "This extension handles issues outside of VS Code")));
+            reset(descriptionSubtitle, ( localize(
+                10138,
                 "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 = ( localizeWithPath(_moduleId, 24, "Open External Issue Reporter"));
+            this.previewButton.label = ( localize(10139, "Open External Issue Reporter"));
             return;
         }
         if (fileOnExtension && selectedExtension?.data) {
@@ -627,10 +630,9 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
                     show(extensionsBlock);
                 }
             }
-            reset(descriptionTitle, ( localizeWithPath(_moduleId, 25, "Steps to Reproduce")) + ' ', $('span.required-input', undefined, '*'));
-            reset(descriptionSubtitle, ( localizeWithPath(
-                _moduleId,
-                26,
+            reset(descriptionTitle, ( localize(10140, "Steps to Reproduce")) + ' ', $('span.required-input', undefined, '*'));
+            reset(descriptionSubtitle, ( localize(
+                10141,
                 "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."
             )));
         }
@@ -648,18 +650,16 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
             else if (!fileOnMarketplace) {
                 show(extensionsBlock);
             }
-            reset(descriptionTitle, ( localizeWithPath(_moduleId, 25, "Steps to Reproduce")) + ' ', $('span.required-input', undefined, '*'));
-            reset(descriptionSubtitle, ( localizeWithPath(
-                _moduleId,
-                27,
+            reset(descriptionTitle, ( localize(10141, "Steps to Reproduce")) + ' ', $('span.required-input', undefined, '*'));
+            reset(descriptionSubtitle, ( localize(
+                10142,
                 "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, ( localizeWithPath(_moduleId, 28, "Description")) + ' ', $('span.required-input', undefined, '*'));
-            reset(descriptionSubtitle, ( localizeWithPath(
-                _moduleId,
-                29,
+            reset(descriptionTitle, ( localize(10143, "Description")) + ' ', $('span.required-input', undefined, '*'));
+            reset(descriptionSubtitle, ( localize(
+                10144,
                 "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."
             )));
         }
@@ -668,7 +668,10 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         const inputElement = this.getElementById(inputId);
         const inputValidationMessage = this.getElementById(`${inputId}-empty-error`);
         const descriptionShortMessage = this.getElementById(`description-short-error`);
-        if (!inputElement.value) {
+        if (inputId === 'description' && this.nonGitHubIssueUrl && this.data.extensionId) {
+            return true;
+        }
+        else if (!inputElement.value) {
             inputElement.classList.add('invalid-input');
             inputValidationMessage?.classList.remove('hidden');
             descriptionShortMessage?.classList.add('hidden');
@@ -785,13 +788,12 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         return true;
     }
     async writeToClipboard(baseUrl, issueBody) {
-        const shouldWrite = await this.issueMainService.$showClipboardDialog();
+        const shouldWrite = await this.issueFormService.showClipboardDialog();
         if (!shouldWrite) {
             throw ( (new CancellationError()));
         }
-        return baseUrl + `&body=${encodeURIComponent(( localizeWithPath(
-            _moduleId,
-            30,
+        return baseUrl + `&body=${encodeURIComponent(( localize(
+            10145,
             "We have written the needed data into your clipboard because it was too large to send. Please paste."
         )))}`;
     }
@@ -961,7 +963,7 @@ let BaseIssueReporterService = class BaseIssueReporterService extends Disposable
         const target = this.window.document.querySelector('.block-extensions .block-info');
         if (target) {
             if (this.disableExtensions) {
-                reset(target, ( localizeWithPath(_moduleId, 31, "Extensions are disabled")));
+                reset(target, ( localize(10146, "Extensions are disabled")));
                 return;
             }
             const themeExclusionStr = numThemeExtensions ? `\n(${numThemeExtensions} theme extensions excluded)` : '';
@@ -1006,7 +1008,7 @@ BaseIssueReporterService.__decorator = ( (__decorate([
     debounce(300)
 ], BaseIssueReporterService.prototype, "searchDuplicates", null)));
 BaseIssueReporterService = ( (__decorate([
-    ( (__param(6, IIssueMainService)))
+    ( (__param(6, IIssueFormService)))
 ], BaseIssueReporterService)));
 function hide(el) {
     el?.classList.add('hidden');

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

@@ -2,30 +2,37 @@ import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import { safeInnerHtml } from 'vscode/vscode/vs/base/browser/dom';
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { DisposableStore } from 'vscode/vscode/vs/base/common/lifecycle';
-import BaseHtml from './issueReporterPage.js';
+import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 import './media/issueReporter.css.js';
+import { localize } from 'vscode/vscode/vs/nls';
 import { MenuId } from 'vscode/vscode/vs/platform/actions/common/actions';
 import { IMenuService } from 'vscode/vscode/vs/platform/actions/common/actions.service';
 import { IContextKeyService } from 'vscode/vscode/vs/platform/contextkey/common/contextkey.service';
+import { IDialogService } from 'vscode/vscode/vs/platform/dialogs/common/dialogs.service';
 import { ExtensionIdentifierSet, ExtensionIdentifier } from 'vscode/vscode/vs/platform/extensions/common/extensions';
 import { IInstantiationService } from 'vscode/vscode/vs/platform/instantiation/common/instantiation';
+import { ILogService } from 'vscode/vscode/vs/platform/log/common/log.service';
 import product$1 from 'vscode/vscode/vs/platform/product/common/product';
+import BaseHtml from './issueReporterPage.js';
 import { IssueWebReporter } from './issueReporterService.js';
 import { AuxiliaryWindowMode } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService';
 import { IAuxiliaryWindowService } from 'vscode/vscode/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.service';
+import { IHostService } from 'vscode/vscode/vs/workbench/services/host/browser/host.service';
 let IssueFormService = class IssueFormService {
-    constructor(instantiationService, auxiliaryWindowService, menuService, contextKeyService) {
+    constructor(instantiationService, auxiliaryWindowService, menuService, contextKeyService, logService, dialogService, hostService) {
         this.instantiationService = instantiationService;
         this.auxiliaryWindowService = auxiliaryWindowService;
         this.menuService = menuService;
         this.contextKeyService = contextKeyService;
+        this.logService = logService;
+        this.dialogService = dialogService;
+        this.hostService = hostService;
         this.issueReporterWindow = null;
-        this.extensionIdentifierSet = ( new ExtensionIdentifierSet());
+        this.extensionIdentifierSet = ( (new ExtensionIdentifierSet()));
         mainWindow.addEventListener('message', async (event) => {
             if (event.data && event.data.sendChannel === 'vscode:triggerReporterMenu') {
-                const menu = this.menuService.createMenu(MenuId.IssueReporter, this.contextKeyService);
-                const actions = menu.getActions({ renderShortTitle: true }).flatMap(entry => entry[1]);
+                const actions = this.menuService.getMenuActions(MenuId.IssueReporter, this.contextKeyService, { renderShortTitle: true }).flatMap(entry => entry[1]);
                 for (const action of actions) {
                     try {
                         if (action.item && 'source' in action.item && action.item.source?.id === event.data.extensionId) {
@@ -37,19 +44,71 @@ let IssueFormService = class IssueFormService {
                         console.error(error);
                     }
                 }
-                if (!( this.extensionIdentifierSet.has(event.data.extensionId))) {
+                if (!( (this.extensionIdentifierSet.has(event.data.extensionId)))) {
                     const replyChannel = `vscode:triggerReporterMenuResponse`;
                     mainWindow.postMessage({ replyChannel }, '*');
                 }
-                menu.dispose();
             }
         });
     }
+    async reloadWithExtensionsDisabled() {
+        if (this.issueReporterWindow) {
+            try {
+                await this.hostService.reload({ disableExtensions: true });
+            }
+            catch (error) {
+                this.logService.error(error);
+            }
+        }
+    }
+    async showConfirmCloseDialog() {
+        await this.dialogService.prompt({
+            type: Severity$1.Warning,
+            message: ( localize(
+                1980,
+                "Your input will not be saved. Are you sure you want to close this window?"
+            )),
+            buttons: [
+                {
+                    label: ( localize(1981, "&&Yes")),
+                    run: () => {
+                        this.closeReporter();
+                        this.issueReporterWindow = null;
+                    }
+                },
+                {
+                    label: ( localize(1982, "Cancel")),
+                    run: () => { }
+                }
+            ]
+        });
+    }
+    async showClipboardDialog() {
+        let result = false;
+        await this.dialogService.prompt({
+            type: Severity$1.Warning,
+            message: ( localize(
+                1983,
+                "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(1984, "&&OK")),
+                    run: () => { result = true; }
+                },
+                {
+                    label: ( localize(1984, "Cancel")),
+                    run: () => { result = false; }
+                }
+            ]
+        });
+        return result;
+    }
     async openReporter(data) {
-        if (data.extensionId && ( this.extensionIdentifierSet.has(data.extensionId))) {
+        if (data.extensionId && ( (this.extensionIdentifierSet.has(data.extensionId)))) {
             const replyChannel = `vscode:triggerReporterMenuResponse`;
             mainWindow.postMessage({ data, replyChannel }, '*');
-            this.extensionIdentifierSet.delete(( new ExtensionIdentifier(data.extensionId)));
+            this.extensionIdentifierSet.delete(( (new ExtensionIdentifier(data.extensionId))));
         }
         if (this.issueReporterWindow) {
             const getModelData = await this.getIssueData();
@@ -69,8 +128,8 @@ let IssueFormService = class IssueFormService {
         this.openAuxIssueReporter(data);
     }
     async openAuxIssueReporter(data) {
-        const disposables = ( new DisposableStore());
-        const auxiliaryWindow = disposables.add(await this.auxiliaryWindowService.open({ mode: AuxiliaryWindowMode.Normal }));
+        const disposables = ( (new DisposableStore()));
+        const auxiliaryWindow = disposables.add(await this.auxiliaryWindowService.open({ mode: AuxiliaryWindowMode.Normal, bounds: { width: 700, height: 800 } }));
         this.issueReporterWindow = auxiliaryWindow.window;
         if (auxiliaryWindow) {
             await auxiliaryWindow.whenStylesHaveLoaded;
@@ -92,49 +151,13 @@ let IssueFormService = class IssueFormService {
             this.issueReporterWindow = null;
         });
     }
-    async openProcessExplorer(data) {
-        throw ( new Error('Method not implemented.'));
-    }
-    stopTracing() {
-        throw ( new Error('Method not implemented.'));
-    }
-    getSystemStatus() {
-        throw ( new Error('Method not implemented.'));
-    }
-    $getSystemInfo() {
-        throw ( new Error('Method not implemented.'));
-    }
-    $getPerformanceInfo() {
-        throw ( new Error('Method not implemented.'));
-    }
-    $reloadWithExtensionsDisabled() {
-        throw ( new Error('Method not implemented.'));
-    }
-    $showConfirmCloseDialog() {
-        throw ( new Error('Method not implemented.'));
-    }
-    $showClipboardDialog() {
-        throw ( new Error('Method not implemented.'));
-    }
-    $getIssueReporterUri(extensionId) {
-        throw ( new Error('Method not implemented.'));
-    }
-    $getIssueReporterData(extensionId) {
-        throw ( new Error('Method not implemented.'));
-    }
-    $getIssueReporterTemplate(extensionId) {
-        throw ( new Error('Method not implemented.'));
-    }
-    $getReporterStatus(extensionId, extensionName) {
-        throw ( new Error('Method not implemented.'));
-    }
-    async $sendReporterMenu(extensionId, extensionName) {
+    async sendReporterMenu(extensionId, extensionName) {
         const sendChannel = `vscode:triggerReporterMenu`;
         mainWindow.postMessage({ sendChannel, extensionId, extensionName }, '*');
-        const result = await ( new Promise((resolve, reject) => {
+        const result = await ( (new Promise((resolve, reject) => {
             const timeout = setTimeout(() => {
                 mainWindow.removeEventListener('message', listener);
-                reject(( new Error('Timeout exceeded')));
+                reject(( (new Error('Timeout exceeded'))));
             }, 5000);
             const listener = (event) => {
                 const replyChannel = `vscode:triggerReporterMenuResponse`;
@@ -145,16 +168,16 @@ let IssueFormService = class IssueFormService {
                 }
             };
             mainWindow.addEventListener('message', listener);
-        }));
+        })));
         return result;
     }
     async getIssueData() {
         const sendChannel = `vscode:triggerIssueData`;
         mainWindow.postMessage({ sendChannel }, '*');
-        const result = await ( new Promise((resolve, reject) => {
+        const result = await ( (new Promise((resolve, reject) => {
             const timeout = setTimeout(() => {
                 mainWindow.removeEventListener('message', listener);
-                reject(( new Error('Timeout exceeded')));
+                reject(( (new Error('Timeout exceeded'))));
             }, 5000);
             const listener = (event) => {
                 const replyChannel = `vscode:triggerIssueDataResponse`;
@@ -165,18 +188,21 @@ let IssueFormService = class IssueFormService {
                 }
             };
             mainWindow.addEventListener('message', listener);
-        }));
+        })));
         return result;
     }
-    async $closeReporter() {
+    async closeReporter() {
         this.issueReporterWindow?.close();
     }
 };
-IssueFormService = ( __decorate([
-    ( __param(0, IInstantiationService)),
-    ( __param(1, IAuxiliaryWindowService)),
-    ( __param(2, IMenuService)),
-    ( __param(3, IContextKeyService))
-], IssueFormService));
+IssueFormService = ( (__decorate([
+    ( (__param(0, IInstantiationService))),
+    ( (__param(1, IAuxiliaryWindowService))),
+    ( (__param(2, IMenuService))),
+    ( (__param(3, IContextKeyService))),
+    ( (__param(4, ILogService))),
+    ( (__param(5, IDialogService))),
+    ( (__param(6, IHostService)))
+], IssueFormService)));
 export { IssueFormService };

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

@@ -1,6 +1,6 @@
 import { mainWindow } from 'vscode/vscode/vs/base/browser/window';
 import { isRemoteDiagnosticError } from 'vscode/vscode/vs/platform/diagnostics/common/diagnostics';
-import { IssueType } from '../../../../platform/issue/common/issue.js';
+import { IssueType } from '../common/issue.js';
 class IssueReporterModel {
     constructor(initialData) {

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

@@ -1,61 +1,56 @@
 import { escape } from 'vscode/vscode/vs/base/common/strings';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize } from 'vscode/vscode/vs/nls';
-const _moduleId = "vs/workbench/contrib/issue/browser/issueReporterPage";
-const sendSystemInfoLabel = escape(( localizeWithPath(_moduleId, 0, "Include my system information")));
-const sendProcessInfoLabel = escape(( localizeWithPath(_moduleId, 1, "Include my currently running processes")));
-const sendWorkspaceInfoLabel = escape(( localizeWithPath(_moduleId, 2, "Include my workspace metadata")));
-const sendExtensionsLabel = escape(( localizeWithPath(_moduleId, 3, "Include my enabled extensions")));
-const sendExperimentsLabel = escape(( localizeWithPath(_moduleId, 4, "Include A/B experiment info")));
-const sendExtensionData = escape(( localizeWithPath(_moduleId, 5, "Include additional extension info")));
-const reviewGuidanceLabel = ( localizeWithPath(
-    _moduleId,
-    6,
+const sendSystemInfoLabel = escape(( localize(5670, "Include my system information")));
+const sendProcessInfoLabel = escape(( localize(5671, "Include my currently running processes")));
+const sendWorkspaceInfoLabel = escape(( localize(5672, "Include my workspace metadata")));
+const sendExtensionsLabel = escape(( localize(5673, "Include my enabled extensions")));
+const sendExperimentsLabel = escape(( localize(5674, "Include A/B experiment info")));
+const sendExtensionData = escape(( localize(5675, "Include additional extension info")));
+const reviewGuidanceLabel = ( localize(
+    5676,
     '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(( localizeWithPath(_moduleId, 7, "Please complete the form in English.")))}</div>
+	<div id="english" class="input-group hidden">${escape(( localize(5677, "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(( localizeWithPath(_moduleId, 8, "This is a")))}</label>
+			<label class="inline-label" for="issue-type">${escape(( localize(5678, "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(( localizeWithPath(_moduleId, 9, "For")))} <span class="required-input">*</span></label>
+			<label class="inline-label" for="issue-source">${escape(( localize(5679, "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(( localizeWithPath(_moduleId, 10, "An issue source is required.")))}</div>
-			<div id="problem-source-help-text" class="instructions hidden">${escape(( localizeWithPath(
-    _moduleId,
-    11,
+			<div id="issue-source-empty-error" class="validation-error hidden" role="alert">${escape(( localize(5680, "An issue source is required.")))}</div>
+			<div id="problem-source-help-text" class="instructions hidden">${escape(( localize(
+    5681,
     "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(( localizeWithPath(_moduleId, 12, "disabling all extensions and reloading the window")))}</span>`)}
+    .replace('{0}', () => `<span tabIndex=0 role="button" id="disableExtensions" class="workbenchCommand">${escape(( localize(5682, "disabling all extensions and reloading the window")))}</span>`)}
 			</div>
 			<div id="extension-selection">
-				<label class="inline-label" for="extension-selector">${escape(( localizeWithPath(_moduleId, 13, "Extension")))} <span class="required-input">*</span></label>
+				<label class="inline-label" for="extension-selector">${escape(( localize(5683, "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(( localizeWithPath(
-    _moduleId,
-    14,
+				<div id="extension-selection-validation-error" class="validation-error hidden" role="alert">${escape(( localize(
+    5684,
     "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(( localizeWithPath(
-    _moduleId,
-    15,
+					${escape(( localize(
+    5685,
     "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>
@@ -63,10 +58,10 @@ var BaseHtml = () => `
 		</div>
 		<div id="issue-title-container" class="input-group">
-			<label class="inline-label" for="issue-title">${escape(( localizeWithPath(_moduleId, 16, "Title")))} <span class="required-input">*</span></label>
-			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(( localizeWithPath(_moduleId, 17, "Please enter a title.")))}" required>
-			<div id="issue-title-empty-error" class="validation-error hidden" role="alert">${escape(( localizeWithPath(_moduleId, 18, "A title is required.")))}</div>
-			<div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(( localizeWithPath(_moduleId, 19, "The title is too long.")))}</div>
+			<label class="inline-label" for="issue-title">${escape(( localize(5686, "Title")))} <span class="required-input">*</span></label>
+			<input id="issue-title" type="text" class="inline-form-control" placeholder="${escape(( localize(5687, "Please enter a title.")))}" required>
+			<div id="issue-title-empty-error" class="validation-error hidden" role="alert">${escape(( localize(5688, "A title is required.")))}</div>
+			<div id="issue-title-length-validation-error" class="validation-error hidden" role="alert">${escape(( localize(5689, "The title is too long.")))}</div>
 			<small id="similar-issues">
 				<!-- To be dynamically filled -->
 			</small>
@@ -82,10 +77,10 @@ var BaseHtml = () => `
 			<!-- To be dynamically filled -->
 		</div>
 		<div class="block-info-text">
-			<textarea name="description" id="description" placeholder="${escape(( localizeWithPath(_moduleId, 20, "Please enter details.")))}" required></textarea>
+			<textarea name="description" id="description" placeholder="${escape(( localize(5690, "Please enter details.")))}" required></textarea>
 		</div>
-		<div id="description-empty-error" class="validation-error hidden" role="alert">${escape(( localizeWithPath(_moduleId, 21, "A description is required.")))}</div>
-		<div id="description-short-error" class="validation-error hidden" role="alert">${escape(( localizeWithPath(_moduleId, 22, "Please provide a longer description.")))}</div>
+		<div id="description-empty-error" class="validation-error hidden" role="alert">${escape(( localize(5691, "A description is required.")))}</div>
+		<div id="description-short-error" class="validation-error hidden" role="alert">${escape(( localize(5692, "Please provide a longer description.")))}</div>
 	</div>
 	<div class="system-info" id="block-container">
@@ -94,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(( localizeWithPath(_moduleId, 23, "show")))}</a><span class="ext-parens" hidden>)</span>
+				<span class="ext-parens" hidden>(</span><a href="#" class="showInfo" id="extension-id">${escape(( localize(5693, "show")))}</a><span class="ext-parens" hidden>)</span>
 			</label>
-			<pre class="block-info" id="extension-data" placeholder="${escape(( localizeWithPath(_moduleId, 24, "Extension does not have additional data to include.")))}" style="white-space: pre-wrap;">
+			<pre class="block-info" id="extension-data" placeholder="${escape(( localize(5694, "Extension does not have additional data to include.")))}" style="white-space: pre-wrap;">
 				<!-- To be dynamically filled -->
 			</pre>
 		</div>
@@ -105,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(( localizeWithPath(_moduleId, 23, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(5694, "show")))}</a>)
 			</label>
 			<div class="block-info hidden">
 				<!-- To be dynamically filled -->
@@ -115,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(( localizeWithPath(_moduleId, 23, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(5694, "show")))}</a>)
 			</label>
 			<pre class="block-info hidden">
 				<code>
@@ -127,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(( localizeWithPath(_moduleId, 23, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(5694, "show")))}</a>)
 			</label>
 			<pre id="systemInfo" class="block-info hidden">
 				<code>
@@ -139,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(( localizeWithPath(_moduleId, 23, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(5694, "show")))}</a>)
 			</label>
 			<div id="systemInfo" class="block-info hidden">
 				<!-- To be dynamically filled -->
@@ -149,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(( localizeWithPath(_moduleId, 23, "show")))}</a>)
+				(<a href="#" class="showInfo">${escape(( localize(5694, "show")))}</a>)
 			</label>
 			<pre class="block-info hidden">
 				<!-- To be dynamically filled -->

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

@@ -4,14 +4,13 @@ import { Codicon } from 'vscode/vscode/vs/base/common/codicons';
 import { groupBy } from 'vscode/vscode/vs/base/common/collections';
 import { isMacintosh } from 'vscode/vscode/vs/base/common/platform';
 import { ThemeIcon } from 'vscode/vscode/vs/base/common/themables';
-import { localizeWithPath } from 'vscode/vscode/vs/nls';
-import { IIssueMainService } from 'vscode/vscode/vs/platform/issue/common/issue.service';
+import { localize } from 'vscode/vscode/vs/nls';
 import { BaseIssueReporterService } from './issue.js';
+import { IIssueFormService } from 'vscode/vscode/vs/workbench/contrib/issue/common/issue.service';
-const _moduleId = "vs/workbench/contrib/issue/browser/issueReporterService";
 let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
-    constructor(disableExtensions, data, os, product, window, issueMainService) {
-        super(disableExtensions, data, os, product, window, true, issueMainService);
+    constructor(disableExtensions, data, os, product, window, issueFormService) {
+        super(disableExtensions, data, os, product, window, true, issueFormService);
         const target = this.window.document.querySelector('.block-system .block-info');
         const webInfo = this.window.navigator.userAgent;
         if (webInfo) {
@@ -37,7 +36,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
     }
     async sendReporterMenu(extension) {
         try {
-            const data = await this.issueMainService.$sendReporterMenu(extension.id, extension.name);
+            const data = await this.issueFormService.sendReporterMenu(extension.id, extension.name);
             return data;
         }
         catch (e) {
@@ -52,7 +51,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
             this.issueReporterModel.update({ issueType: issueType });
             const descriptionTextArea = this.getElementById('issue-title');
             if (descriptionTextArea) {
-                descriptionTextArea.placeholder = ( localizeWithPath(_moduleId, 0, "Please enter a title"));
+                descriptionTextArea.placeholder = ( localize(5695, "Please enter a title"));
             }
             this.updatePreviewButtonState();
             this.setSourceOptions();
@@ -64,7 +63,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
             });
         });
         this.addEventListener('disableExtensions', 'click', () => {
-            this.issueMainService.$reloadWithExtensionsDisabled();
+            this.issueFormService.reloadWithExtensionsDisabled();
         });
         this.addEventListener('extensionBugsLink', 'click', (e) => {
             const url = e.target.innerText;
@@ -73,7 +72,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
         this.addEventListener('disableExtensions', 'keydown', (e) => {
             e.stopPropagation();
             if (e.key === 'Enter' || e.key === ' ') {
-                this.issueMainService.$reloadWithExtensionsDisabled();
+                this.issueFormService.reloadWithExtensionsDisabled();
             }
         });
         this.window.document.onkeydown = async (e) => {
@@ -91,7 +90,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
                 const issueTitle = this.getElementById('issue-title').value;
                 const { issueDescription } = this.issueReporterModel.getData();
                 if (!this.hasBeenSubmitted && (issueTitle || issueDescription)) {
-                    this.issueMainService.$showConfirmCloseDialog();
+                    this.issueFormService.showConfirmCloseDialog();
                 }
                 else {
                     this.close();
@@ -134,7 +133,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
         const extensionsSelector = this.getElementById('extension-selector');
         if (extensionsSelector) {
             const { selectedExtension } = this.issueReporterModel.getData();
-            reset(extensionsSelector, this.makeOption('', ( localizeWithPath(_moduleId, 1, "Select extension")), true), ...( (extensionOptions.map(extension => makeOption(extension, selectedExtension)))));
+            reset(extensionsSelector, this.makeOption('', ( localize(5696, "Select extension")), true), ...( (extensionOptions.map(extension => makeOption(extension, selectedExtension)))));
             if (!selectedExtension) {
                 extensionsSelector.selectedIndex = 0;
             }
@@ -188,7 +187,7 @@ let IssueWebReporter = class IssueWebReporter extends BaseIssueReporterService {
     }
 };
 IssueWebReporter = ( (__decorate([
-    ( (__param(5, IIssueMainService)))
+    ( (__param(5, IIssueFormService)))
 ], IssueWebReporter)));
 export { IssueWebReporter };

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

@@ -1,14 +1,13 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { windowOpenNoOpener } from 'vscode/vscode/vs/base/browser/dom';
-import { userAgent } from 'vscode/vscode/vs/base/common/platform';
-import { ExtensionType } from 'vscode/vscode/vs/platform/extensions/common/extensions';
-import { normalizeGitHubUrl } from '../../../../platform/issue/common/issueReporterUtil.js';
 import { getZoomLevel } from 'vscode/vscode/vs/base/browser/browser';
+import { windowOpenNoOpener } from 'vscode/vscode/vs/base/browser/dom';
 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 { IIssueMainService } from 'vscode/vscode/vs/platform/issue/common/issue.service';
+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';
 import { foreground, textLinkForeground, textLinkActiveForeground } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
@@ -24,18 +23,18 @@ import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
 import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService.service';
 import { IWorkspaceTrustManagementService } from 'vscode/vscode/vs/platform/workspace/common/workspaceTrust.service';
 import { SIDE_BAR_BACKGROUND } from 'vscode/vscode/vs/workbench/common/theme';
+import { IIssueFormService } from 'vscode/vscode/vs/workbench/contrib/issue/common/issue.service';
 import { IWorkbenchAssignmentService } from 'vscode/vscode/vs/workbench/services/assignment/common/assignmentService.service';
 import { IAuthenticationService } from 'vscode/vscode/vs/workbench/services/authentication/common/authentication.service';
 import { IWorkbenchExtensionEnablementService } from 'vscode/vscode/vs/workbench/services/extensionManagement/common/extensionManagement.service';
-import { IIntegrityService } from 'vscode/vscode/vs/workbench/services/integrity/common/integrity.service';
-import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
 import { IExtensionService } from 'vscode/vscode/vs/workbench/services/extensions/common/extensions.service';
+import { IIntegrityService } from 'vscode/vscode/vs/workbench/services/integrity/common/integrity.service';
 let BrowserIssueService = class BrowserIssueService {
-    constructor(extensionService, productService, issueMainService, themeService, experimentService, workspaceTrustManagementService, integrityService, extensionManagementService, extensionEnablementService, authenticationService, configurationService) {
+    constructor(extensionService, productService, issueFormService, themeService, experimentService, workspaceTrustManagementService, integrityService, extensionManagementService, extensionEnablementService, authenticationService, configurationService) {
         this.extensionService = extensionService;
         this.productService = productService;
-        this.issueMainService = issueMainService;
+        this.issueFormService = issueFormService;
         this.themeService = themeService;
         this.experimentService = experimentService;
         this.workspaceTrustManagementService = workspaceTrustManagementService;
@@ -132,7 +131,7 @@ let BrowserIssueService = class BrowserIssueService {
                 isUnsupported,
                 githubAccessToken
             }, options);
-            return this.issueMainService.openReporter(issueReporterData);
+            return this.issueFormService.openReporter(issueReporterData);
         }
         throw ( new Error(`No issue reporting URL configured for ${this.productService.nameLong}.`));
     }
@@ -166,7 +165,7 @@ ${extension?.version ? `\nExtension version: ${extension.version}` : ''}
 BrowserIssueService = ( __decorate([
     ( __param(0, IExtensionService)),
     ( __param(1, IProductService)),
-    ( __param(2, IIssueMainService)),
+    ( __param(2, IIssueFormService)),
     ( __param(3, IThemeService)),
     ( __param(4, IWorkbenchAssignmentService)),
     ( __param(5, IWorkspaceTrustManagementService)),

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localizeWithPath, localize2WithPath } from 'vscode/vscode/vs/nls';
+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';
@@ -31,7 +31,6 @@ import { ITroubleshootIssueService } from 'vscode/vscode/vs/workbench/contrib/is
 import Severity$1 from 'vscode/vscode/vs/base/common/severity';
 var TroubleshootIssueService_1, IssueTroubleshootUi_1;
-const _moduleId = "vs/workbench/contrib/issue/browser/issueTroubleshoot";
 var TroubleshootStage;
 ( ((function(TroubleshootStage) {
     TroubleshootStage[TroubleshootStage["EXTENSIONS"] = 1] = "EXTENSIONS";
@@ -87,14 +86,13 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             throw ( (new Error('invalid state')));
         }
         const res = await this.dialogService.confirm({
-            message: ( localizeWithPath(_moduleId, 0, "Troubleshoot Issue")),
-            detail: ( localizeWithPath(
-                _moduleId,
-                1,
+            message: ( localize(1960, "Troubleshoot Issue")),
+            detail: ( localize(
+                1961,
                 "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(_moduleId, 2, "&&Troubleshoot Issue")),
+            primaryButton: ( localize(1962, "&&Troubleshoot Issue")),
             custom: true
         });
         if (!res.confirmed) {
@@ -137,9 +135,8 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             this.state = ( (new TroubleShootState(TroubleshootStage.WORKBENCH, this.state.profile)));
             return;
         }
-        const result = await this.askToReproduceIssue(( localizeWithPath(
-            _moduleId,
-            3,
+        const result = await this.askToReproduceIssue(( localize(
+            1963,
             "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') {
@@ -156,25 +153,22 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     async reproduceIssueWithEmptyProfile() {
         await this.userDataProfileManagementService.createAndEnterTransientProfile();
         this.updateState(this.state);
-        const result = await this.askToReproduceIssue(( localizeWithPath(
-            _moduleId,
-            4,
+        const result = await this.askToReproduceIssue(( localize(
+            1964,
             "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(
-                _moduleId,
-                5,
+            await this.askToReportIssue(( localize(
+                1965,
                 "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(
-                _moduleId,
-                6,
+            await this.askToReportIssue(( localize(
+                1966,
                 "Issue troubleshooting has identified that the issue is with {0}.",
                 this.productService.nameLong
             )));
@@ -190,15 +184,15 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         return (
              (new Promise((c, e) => {
                 const goodPrompt = {
-                    label: ( localizeWithPath(_moduleId, 7, "I Can't Reproduce")),
+                    label: ( localize(1967, "I Can't Reproduce")),
                     run: () => c('good')
                 };
                 const badPrompt = {
-                    label: ( localizeWithPath(_moduleId, 8, "I Can Reproduce")),
+                    label: ( localize(1968, "I Can Reproduce")),
                     run: () => c('bad')
                 };
                 const stop = {
-                    label: ( localizeWithPath(_moduleId, 9, "Stop")),
+                    label: ( localize(1969, "Stop")),
                     run: () => c('stop')
                 };
                 this.notificationHandle = this.notificationService.prompt(Severity$1.Info, message, [goodPrompt, badPrompt, stop], { sticky: true, priority: NotificationPriority.URGENT });
@@ -212,10 +206,9 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
             if (res === 'good') {
                 await this.dialogService.prompt({
                     type: Severity$1.Info,
-                    message: ( localizeWithPath(_moduleId, 0, "Troubleshoot Issue")),
-                    detail: ( localizeWithPath(
-                        _moduleId,
-                        10,
+                    message: ( localize(1969, "Troubleshoot Issue")),
+                    detail: ( localize(
+                        1970,
                         "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
                     )),
@@ -238,12 +231,11 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
     async askToReproduceIssueWithInsiders() {
         const confirmRes = await this.dialogService.confirm({
             type: 'info',
-            message: ( localizeWithPath(_moduleId, 0, "Troubleshoot Issue")),
-            primaryButton: ( localizeWithPath(_moduleId, 11, "Download {0} Insiders", this.productService.nameLong)),
-            cancelButton: ( localizeWithPath(_moduleId, 12, "Report Issue Anyway")),
-            detail: ( localizeWithPath(
-                _moduleId,
-                13,
+            message: ( localize(1970, "Troubleshoot Issue")),
+            primaryButton: ( localize(1971, "Download {0} Insiders", this.productService.nameLong)),
+            cancelButton: ( localize(1972, "Report Issue Anyway")),
+            detail: ( localize(
+                1973,
                 "Please try to download and reproduce the issue in {0} insiders.",
                 this.productService.nameLong
             )),
@@ -260,21 +252,20 @@ let TroubleshootIssueService = class TroubleshootIssueService extends Disposable
         }
         const res = await this.dialogService.prompt({
             type: 'info',
-            message: ( localizeWithPath(_moduleId, 0, "Troubleshoot Issue")),
+            message: ( localize(1973, "Troubleshoot Issue")),
             buttons: [{
-                    label: ( localizeWithPath(_moduleId, 14, "I can't reproduce")),
+                    label: ( localize(1974, "I can't reproduce")),
                     run: () => 'good'
                 }, {
-                    label: ( localizeWithPath(_moduleId, 15, "I can reproduce")),
+                    label: ( localize(1975, "I can reproduce")),
                     run: () => 'bad'
                 }],
             cancelButton: {
-                label: ( localizeWithPath(_moduleId, 16, "Stop")),
+                label: ( localize(1976, "Stop")),
                 run: () => 'stop'
             },
-            detail: ( localizeWithPath(
-                _moduleId,
-                17,
+            detail: ( localize(
+                1977,
                 "Please try to reproduce the issue in {0} insiders and confirm if the issue exists there.",
                 this.productService.nameLong
             )),
@@ -349,7 +340,7 @@ registerAction2(class TroubleshootIssueAction extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.troubleshootIssue.start',
-            title: ( localize2WithPath(_moduleId, 18, 'Troubleshoot Issue...')),
+            title: ( localize2(1978, 'Troubleshoot Issue...')),
             category: Categories.Help,
             f1: true,
             precondition: ( (ContextKeyExpr.and(
@@ -367,7 +358,7 @@ registerAction2(class extends Action2 {
     constructor() {
         super({
             id: 'workbench.action.troubleshootIssue.stop',
-            title: ( localize2WithPath(_moduleId, 19, 'Stop Troubleshoot Issue')),
+            title: ( localize2(1979, 'Stop Troubleshoot Issue')),
             category: Categories.Help,
             f1: true,
             precondition: IssueTroubleshootUi.ctxIsTroubleshootActive

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

@@ -1,5 +1,5 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
-import { localize2WithPath, localizeWithPath } from 'vscode/vscode/vs/nls';
+import { localize2, localize } 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';
@@ -8,7 +8,6 @@ import { IWorkbenchIssueService } from 'vscode/vscode/vs/workbench/contrib/issue
 import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-const _moduleId = "vs/workbench/contrib/issue/common/issue.contribution";
 const OpenIssueReporterActionId = 'workbench.action.openIssueReporter';
 const OpenIssueReporterApiId = 'vscode.openIssueReporter';
 const OpenIssueReporterCommandMetadata = {
@@ -75,7 +74,7 @@ let BaseIssueContribution = class BaseIssueContribution extends Disposable {
         }));
         const reportIssue = {
             id: OpenIssueReporterActionId,
-            title: ( localize2WithPath(_moduleId, 0, "Report Issue...")),
+            title: ( localize2(5697, "Report Issue...")),
             category: Categories.Help
         };
         this._register(MenuRegistry.appendMenuItem(MenuId.CommandPalette, { command: reportIssue }));
@@ -83,7 +82,7 @@ let BaseIssueContribution = class BaseIssueContribution extends Disposable {
             group: '3_feedback',
             command: {
                 id: OpenIssueReporterActionId,
-                title: ( localizeWithPath(_moduleId, 1, "Report &&Issue"))
+                title: ( localize(5698, "Report &&Issue"))
             },
             order: 3
         }));

package/vscode/src/vs/workbench/contrib/issue/common/issueReporterUtil.js ADDED Viewed

@@ -0,0 +1,17 @@
+import { rtrim } from 'vscode/vscode/vs/base/common/strings';
+function normalizeGitHubUrl(url) {
+    if (url.endsWith('.git')) {
+        url = url.substr(0, url.length - 4);
+    }
+    url = rtrim(url, '/');
+    if (url.endsWith('/new')) {
+        url = rtrim(url, '/new');
+    }
+    if (url.endsWith('/issues')) {
+        url = rtrim(url, '/issues');
+    }
+    return url;
+}
+export { normalizeGitHubUrl };

/package/vscode/src/vs/{platform → workbench/contrib}/issue/common/issue.js RENAMED Viewed

File without changes