mirror of
https://github.com/VSCodium/vscodium.git
synced 2026-04-11 16:27:18 +10:00
93 lines
5.6 KiB
Diff
93 lines
5.6 KiB
Diff
diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
|
|
index 46120a9..6bc88c8 100644
|
|
--- a/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
|
|
+++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionsSlowActions.ts
|
|
@@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
|
|
- OS Version: \`${osVersion}\`
|
|
-- VS Code version: \`${this._productService.version}\`\n\n${message}`);
|
|
+- !!APP_NAME!! version: \`${this._productService.version}\`\n\n${message}`);
|
|
|
|
diff --git a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
|
|
index efe8061..831ce2e 100644
|
|
--- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
|
|
+++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
|
|
@@ -591,3 +591,3 @@ export class BaseIssueReporterService extends Disposable {
|
|
if (title) {
|
|
- this.searchDuplicates(title, issueDescription);
|
|
+ this.searchGitHub('!!GH_REPO_PATH!!', title);
|
|
} else {
|
|
@@ -668,33 +668,2 @@ export class BaseIssueReporterService extends Disposable {
|
|
|
|
- @debounce(300)
|
|
- private searchDuplicates(title: string, body?: string): void {
|
|
- const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
|
|
- const init = {
|
|
- method: 'POST',
|
|
- body: JSON.stringify({
|
|
- title,
|
|
- body
|
|
- }),
|
|
- headers: new Headers({
|
|
- 'Content-Type': 'application/json'
|
|
- })
|
|
- };
|
|
-
|
|
- fetch(url, init).then((response) => {
|
|
- response.json().then(result => {
|
|
- this.clearSearchResults();
|
|
-
|
|
- if (result && result.candidates) {
|
|
- this.displaySearchResults(result.candidates);
|
|
- } else {
|
|
- throw new Error('Unexpected response, no candidates property');
|
|
- }
|
|
- }).catch(_ => {
|
|
- // Ignore
|
|
- });
|
|
- }).catch(_ => {
|
|
- // Ignore
|
|
- });
|
|
- }
|
|
-
|
|
private displaySearchResults(results: SearchResult[]) {
|
|
@@ -786,4 +755,4 @@ export class BaseIssueReporterService extends Disposable {
|
|
sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
|
|
- sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false));
|
|
- sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false));
|
|
+ sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "!!APP_NAME!!"), false));
|
|
+ sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A !!APP_NAME!! extension"), false));
|
|
if (this.product.reportMarketplaceIssueUrl) {
|
|
@@ -874,3 +843,3 @@ export class BaseIssueReporterService extends Disposable {
|
|
hide(descriptionTextArea);
|
|
- reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
|
|
+ reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of !!APP_NAME!!"));
|
|
reset(descriptionSubtitle, localize('elsewhereDescription', "The '{0}' extension prefers to use an external issue reporter. To be taken to that issue reporting experience, click the button below.", selectedExtension.displayName));
|
|
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
|
|
index 0bbd8ac..3f35022 100644
|
|
--- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
|
|
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
|
|
@@ -92,3 +92,3 @@ ${this._data.issueDescription}
|
|
${this.getExtensionVersion()}
|
|
-VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
|
|
+!!APP_NAME!! version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
|
|
OS version: ${this._data.versionInfo && this._data.versionInfo.os}
|
|
diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
|
|
index e739f44..0024f74 100644
|
|
--- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
|
|
+++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
|
|
@@ -14,3 +14,3 @@ const sendExperimentsLabel = escape(localize('sendExperiments', "Include A/B exp
|
|
const sendExtensionData = escape(localize('sendExtensionData', "Include additional extension info"));
|
|
-const acknowledgementsLabel = escape(localize('acknowledgements', "I acknowledge that my VS Code version is not updated and this issue may be closed."));
|
|
+const acknowledgementsLabel = escape(localize('acknowledgements', "I acknowledge that my !!APP_NAME!! version is not updated and this issue may be closed."));
|
|
const reviewGuidanceLabel = localize( // intentionally not escaped because of its embedded tags
|
|
@@ -19,3 +19,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
|
|
comment: [
|
|
- '{Locked="<a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
|
|
+ '{Locked="<a href=\"https://github.com/!!GH_REPO_PATH!!/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
|
|
'{Locked="</a>"}'
|
|
@@ -23,3 +23,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
|
|
},
|
|
- 'Before you report an issue here please <a href="https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>. Please complete the form in English.'
|
|
+ 'Before you report an issue here please <a href="https://github.com/!!GH_REPO_PATH!!/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>. Please complete the form in English.'
|
|
);
|