report-issue.patch 4.2 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283
  1. diff --git a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
  2. index 74f9939..341ef06 100644
  3. --- a/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
  4. +++ b/src/vs/code/electron-sandbox/issue/issueReporterModel.ts
  5. @@ -79,3 +79,3 @@ ${this._data.issueDescription}
  6. ${this.getExtensionVersion()}
  7. -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  8. +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  9. OS version: ${this._data.versionInfo && this._data.versionInfo.os}
  10. diff --git a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
  11. index 96ec5f7..5c091d9 100644
  12. --- a/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
  13. +++ b/src/vs/code/electron-sandbox/issue/issueReporterPage.ts
  14. @@ -18,3 +18,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  15. comment: [
  16. - '{Locked="<a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  17. + '{Locked="<a href=\"https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  18. '{Locked="</a>"}'
  19. @@ -22,3 +22,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  20. },
  21. - '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>.'
  22. + '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>.'
  23. );
  24. diff --git a/src/vs/code/electron-sandbox/issue/issueReporterService.ts b/src/vs/code/electron-sandbox/issue/issueReporterService.ts
  25. index d7f98f6..ed54042 100644
  26. --- a/src/vs/code/electron-sandbox/issue/issueReporterService.ts
  27. +++ b/src/vs/code/electron-sandbox/issue/issueReporterService.ts
  28. @@ -517,5 +517,5 @@ export class IssueReporter extends Disposable {
  29. - private searchVSCodeIssues(title: string, issueDescription?: string): void {
  30. + private searchVSCodeIssues(title: string, _issueDescription?: string): void {
  31. if (title) {
  32. - this.searchDuplicates(title, issueDescription);
  33. + this.searchGitHub('VSCodium/vscodium', title);
  34. } else {
  35. @@ -611,33 +611,2 @@ export class IssueReporter extends Disposable {
  36. - @debounce(300)
  37. - private searchDuplicates(title: string, body?: string): void {
  38. - const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
  39. - const init = {
  40. - method: 'POST',
  41. - body: JSON.stringify({
  42. - title,
  43. - body
  44. - }),
  45. - headers: new Headers({
  46. - 'Content-Type': 'application/json'
  47. - })
  48. - };
  49. -
  50. - fetch(url, init).then((response) => {
  51. - response.json().then(result => {
  52. - this.clearSearchResults();
  53. -
  54. - if (result && result.candidates) {
  55. - this.displaySearchResults(result.candidates);
  56. - } else {
  57. - throw new Error('Unexpected response, no candidates property');
  58. - }
  59. - }).catch(_ => {
  60. - // Ignore
  61. - });
  62. - }).catch(_ => {
  63. - // Ignore
  64. - });
  65. - }
  66. -
  67. private displaySearchResults(results: SearchResult[]) {
  68. @@ -729,3 +698,3 @@ export class IssueReporter extends Disposable {
  69. sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
  70. - sourceSelect.append(this.makeOption('vscode', localize('vscode', "Visual Studio Code"), false));
  71. + sourceSelect.append(this.makeOption('vscode', localize('vscode', "VSCodium"), false));
  72. sourceSelect.append(this.makeOption('extension', localize('extension', "An extension"), false));
  73. diff --git a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
  74. index 87839a6..49727fc 100644
  75. --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
  76. +++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
  77. @@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
  78. - OS Version: \`${osVersion}\`
  79. -- VS Code version: \`${this._productService.version}\`\n\n${message}`);
  80. +- VSCodium version: \`${this._productService.version}\`\n\n${message}`);