report-issue.patch 7.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142
  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/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
  10. index ec21ac3..89fabe0 100644
  11. --- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
  12. +++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
  13. @@ -630,3 +630,3 @@ export class BaseIssueReporterService extends Disposable {
  14. if (title) {
  15. - this.searchDuplicates(title, issueDescription);
  16. + this.searchGitHub('VSCodium/vscodium', title);
  17. } else {
  18. @@ -722,33 +722,2 @@ export class BaseIssueReporterService extends Disposable {
  19. - @debounce(300)
  20. - private searchDuplicates(title: string, body?: string): void {
  21. - const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
  22. - const init = {
  23. - method: 'POST',
  24. - body: JSON.stringify({
  25. - title,
  26. - body
  27. - }),
  28. - headers: new Headers({
  29. - 'Content-Type': 'application/json'
  30. - })
  31. - };
  32. -
  33. - fetch(url, init).then((response) => {
  34. - response.json().then(result => {
  35. - this.clearSearchResults();
  36. -
  37. - if (result && result.candidates) {
  38. - this.displaySearchResults(result.candidates);
  39. - } else {
  40. - throw new Error('Unexpected response, no candidates property');
  41. - }
  42. - }).catch(_ => {
  43. - // Ignore
  44. - });
  45. - }).catch(_ => {
  46. - // Ignore
  47. - });
  48. - }
  49. -
  50. private displaySearchResults(results: SearchResult[]) {
  51. @@ -844,4 +813,4 @@ export class BaseIssueReporterService extends Disposable {
  52. sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
  53. - sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false));
  54. - sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false));
  55. + sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "VSCodium"), false));
  56. + sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false));
  57. if (this.product.reportMarketplaceIssueUrl) {
  58. @@ -905,3 +874,3 @@ export class BaseIssueReporterService extends Disposable {
  59. hide(descriptionTextArea);
  60. - reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
  61. + reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium"));
  62. 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));
  63. diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
  64. index 4394874..a9c3f57 100644
  65. --- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
  66. +++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
  67. @@ -93,3 +93,3 @@ ${this._data.issueDescription}
  68. ${this.getExtensionVersion()}
  69. -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  70. +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  71. OS version: ${this._data.versionInfo && this._data.versionInfo.os}
  72. diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
  73. index 195857e..68163c0 100644
  74. --- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
  75. +++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
  76. @@ -18,3 +18,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  77. comment: [
  78. - '{Locked="<a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  79. + '{Locked="<a href=\"https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  80. '{Locked="</a>"}'
  81. @@ -22,3 +22,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  82. },
  83. - '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>.'
  84. + '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>.'
  85. );
  86. diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
  87. index b923388..043a8ac 100644
  88. --- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
  89. +++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
  90. @@ -555,3 +555,3 @@ export class IssueReporter extends Disposable {
  91. if (title) {
  92. - this.searchDuplicates(title, issueDescription);
  93. + this.searchGitHub('VSCodium/vscodium', title);
  94. } else {
  95. @@ -647,33 +647,2 @@ export class IssueReporter extends Disposable {
  96. - @debounce(300)
  97. - private searchDuplicates(title: string, body?: string): void {
  98. - const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
  99. - const init = {
  100. - method: 'POST',
  101. - body: JSON.stringify({
  102. - title,
  103. - body
  104. - }),
  105. - headers: new Headers({
  106. - 'Content-Type': 'application/json'
  107. - })
  108. - };
  109. -
  110. - fetch(url, init).then((response) => {
  111. - response.json().then(result => {
  112. - this.clearSearchResults();
  113. -
  114. - if (result && result.candidates) {
  115. - this.displaySearchResults(result.candidates);
  116. - } else {
  117. - throw new Error('Unexpected response, no candidates property');
  118. - }
  119. - }).catch(_ => {
  120. - // Ignore
  121. - });
  122. - }).catch(_ => {
  123. - // Ignore
  124. - });
  125. - }
  126. -
  127. private displaySearchResults(results: SearchResult[]) {
  128. @@ -769,4 +738,4 @@ export class IssueReporter extends Disposable {
  129. sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
  130. - sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false));
  131. - sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false));
  132. + sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "VSCodium"), false));
  133. + sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false));
  134. if (this.configuration.product.reportMarketplaceIssueUrl) {
  135. @@ -830,3 +799,3 @@ export class IssueReporter extends Disposable {
  136. hide(descriptionTextArea);
  137. - reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
  138. + reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium"));
  139. 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));