report-issue.patch 5.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192
  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 447f4c9..1118f18 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. +- !!APP_NAME!! 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 3d7653e..7dbd60b 100644
  11. --- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
  12. +++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
  13. @@ -665,3 +665,3 @@ export class BaseIssueReporterService extends Disposable {
  14. if (title) {
  15. - this.searchDuplicates(title, issueDescription);
  16. + this.searchGitHub('!!GH_REPO_PATH!!', title);
  17. } else {
  18. @@ -757,33 +757,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. @@ -879,4 +848,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', "!!APP_NAME!!"), false));
  56. + sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A !!APP_NAME!! extension"), false));
  57. if (this.product.reportMarketplaceIssueUrl) {
  58. @@ -967,3 +936,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 !!APP_NAME!!"));
  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 0bbd8ac..3f35022 100644
  65. --- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
  66. +++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
  67. @@ -92,3 +92,3 @@ ${this._data.issueDescription}
  68. ${this.getExtensionVersion()}
  69. -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
  70. +!!APP_NAME!! 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 e739f44..0024f74 100644
  74. --- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
  75. +++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
  76. @@ -14,3 +14,3 @@ const sendExperimentsLabel = escape(localize('sendExperiments', "Include A/B exp
  77. const sendExtensionData = escape(localize('sendExtensionData', "Include additional extension info"));
  78. -const acknowledgementsLabel = escape(localize('acknowledgements', "I acknowledge that my VS Code version is not updated and this issue may be closed."));
  79. +const acknowledgementsLabel = escape(localize('acknowledgements', "I acknowledge that my !!APP_NAME!! version is not updated and this issue may be closed."));
  80. const reviewGuidanceLabel = localize( // intentionally not escaped because of its embedded tags
  81. @@ -19,3 +19,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  82. comment: [
  83. - '{Locked="<a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  84. + '{Locked="<a href=\"https://github.com/!!GH_REPO_PATH!!/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
  85. '{Locked="</a>"}'
  86. @@ -23,3 +23,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
  87. },
  88. - '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.'
  89. + '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.'
  90. );