diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts index 87839a6..49727fc 100644 --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts +++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts @@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action { - OS Version: \`${osVersion}\` -- VS Code version: \`${this._productService.version}\`\n\n${message}`); +- VSCodium 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 ec21ac3..89fabe0 100644 --- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts +++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts @@ -630,3 +630,3 @@ export class BaseIssueReporterService extends Disposable { if (title) { - this.searchDuplicates(title, issueDescription); + this.searchGitHub('VSCodium/vscodium', title); } else { @@ -722,33 +722,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[]) { @@ -844,4 +813,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', "VSCodium"), false)); + sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false)); if (this.product.reportMarketplaceIssueUrl) { @@ -905,3 +874,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 VSCodium")); 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 4394874..a9c3f57 100644 --- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts +++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts @@ -93,3 +93,3 @@ ${this._data.issueDescription} ${this.getExtensionVersion()} -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion} +VSCodium 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 195857e..68163c0 100644 --- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts +++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts @@ -18,3 +18,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it comment: [ - '{Locked=""}', + '{Locked=""}', '{Locked=""}' @@ -22,3 +22,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it }, - 'Before you report an issue here please review the guidance we provide.' + 'Before you report an issue here please review the guidance we provide.' ); diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts index b923388..043a8ac 100644 --- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts +++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts @@ -555,3 +555,3 @@ export class IssueReporter extends Disposable { if (title) { - this.searchDuplicates(title, issueDescription); + this.searchGitHub('VSCodium/vscodium', title); } else { @@ -647,33 +647,2 @@ export class IssueReporter 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[]) { @@ -769,4 +738,4 @@ export class IssueReporter 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', "VSCodium"), false)); + sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false)); if (this.configuration.product.reportMarketplaceIssueUrl) { @@ -830,3 +799,3 @@ export class IssueReporter 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 VSCodium")); 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));