report-issue.patch 5.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990
  1. diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
  2. index 87839a6..49727fc 100644
  3. --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
  4. +++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
  5. @@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
  6. - OS Version: \`${osVersion}\`
  7. -- VS Code version: \`${this._productService.version}\`\n\n${message}`);
  8. +- VSCodium version: \`${this._productService.version}\`\n\n${message}`);
  9. diff --git a/src/vs/workbench/contrib/issue/browser/issue.ts b/src/vs/workbench/contrib/issue/browser/issue.ts
  10. index 79e4485..33f09a4 100644
  11. --- a/src/vs/workbench/contrib/issue/browser/issue.ts
  12. +++ b/src/vs/workbench/contrib/issue/browser/issue.ts
  13. @@ -451,5 +451,5 @@ export class BaseIssueReporterService extends Disposable {
  14. - public searchVSCodeIssues(title: string, issueDescription?: string): void {
  15. + public searchVSCodeIssues(title: string, _issueDescription?: string): void {
  16. if (title) {
  17. - this.searchDuplicates(title, issueDescription);
  18. + this.searchGitHub('VSCodium/vscodium', title);
  19. } else {
  20. @@ -545,33 +545,2 @@ export class BaseIssueReporterService extends Disposable {
  21. - @debounce(300)
  22. - private searchDuplicates(title: string, body?: string): void {
  23. - const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
  24. - const init = {
  25. - method: 'POST',
  26. - body: JSON.stringify({
  27. - title,
  28. - body
  29. - }),
  30. - headers: new Headers({
  31. - 'Content-Type': 'application/json'
  32. - })
  33. - };
  34. -
  35. - fetch(url, init).then((response) => {
  36. - response.json().then(result => {
  37. - this.clearSearchResults();
  38. -
  39. - if (result && result.candidates) {
  40. - this.displaySearchResults(result.candidates);
  41. - } else {
  42. - throw new Error('Unexpected response, no candidates property');
  43. - }
  44. - }).catch(_ => {
  45. - // Ignore
  46. - });
  47. - }).catch(_ => {
  48. - // Ignore
  49. - });
  50. - }
  51. -
  52. private displaySearchResults(results: SearchResult[]) {
  53. @@ -667,4 +636,4 @@ export class BaseIssueReporterService extends Disposable {
  54. sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
  55. - sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false));
  56. - sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false));
  57. + sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "VSCodium"), false));
  58. + sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false));
  59. if (this.product.reportMarketplaceIssueUrl) {
  60. @@ -728,3 +697,3 @@ export class BaseIssueReporterService extends Disposable {
  61. hide(descriptionTextArea);
  62. - reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
  63. + reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium"));
  64. 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));
  65. diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
  66. index f8274d9..15fcc8b 100644
  67. --- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
  68. +++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
  69. @@ -92,3 +92,3 @@ ${this._data.issueDescription}
  70. ${this.getExtensionVersion()}
  71. -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  72. +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  73. OS version: ${this._data.versionInfo && this._data.versionInfo.os}
  74. diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
  75. index 195857e..68163c0 100644
  76. --- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
  77. +++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
  78. @@ -18,3 +18,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  79. comment: [
  80. - '{Locked="<a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  81. + '{Locked="<a href=\"https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  82. '{Locked="</a>"}'
  83. @@ -22,3 +22,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  84. },
  85. - '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>.'
  86. + 'Before you report an issue here please <a href="https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions" target="_blank">review the guidance we provide</a>.'
  87. );