Home Explore Help
Sign In
mirrors
/
vscodium
mirror of https://github.com/VSCodium/vscodium
2
0
Fork 0
Files Issues 0 Wiki
Tree: aa340c1b5b
Branches Tags
vscodium
/
patches
/
report-issue.patch

report-issue.patch 7.5 KB
History Raw

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. 

  2. index 87839a6..49727fc 100644
    3. 

  3. --- a/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
    4. 

  4. +++ b/src/vs/workbench/contrib/extensions/electron-sandbox/extensionsSlowActions.ts
    5. 

  5. @@ -153,3 +153,3 @@ class ReportExtensionSlowAction extends Action {
    6. 

  6.  - OS Version: \`${osVersion}\`
    7. 

  7. -- VS Code version: \`${this._productService.version}\`\n\n${message}`);
    8. 

  8. +- VSCodium version: \`${this._productService.version}\`\n\n${message}`);
    9. 

  9.  
    10. 

  10. diff --git a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
    11. 

  11. index ec21ac3..89fabe0 100644
    12. 

  12. --- a/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
    13. 

  13. +++ b/src/vs/workbench/contrib/issue/browser/baseIssueReporterService.ts
    14. 

  14. @@ -630,3 +630,3 @@ export class BaseIssueReporterService extends Disposable {
    15. 

  15.  		if (title) {
    16. 

  16. -			this.searchDuplicates(title, issueDescription);
    17. 

  17. +			this.searchGitHub('VSCodium/vscodium', title);
    18. 

  18.  		} else {
    19. 

  19. @@ -722,33 +722,2 @@ export class BaseIssueReporterService extends Disposable {
    20. 

  20.  
    21. 

  21. -	@debounce(300)
    22. 

  22. -	private searchDuplicates(title: string, body?: string): void {
    23. 

  23. -		const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
    24. 

  24. -		const init = {
    25. 

  25. -			method: 'POST',
    26. 

  26. -			body: JSON.stringify({
    27. 

  27. -				title,
    28. 

  28. -				body
    29. 

  29. -			}),
    30. 

  30. -			headers: new Headers({
    31. 

  31. -				'Content-Type': 'application/json'
    32. 

  32. -			})
    33. 

  33. -		};
    34. 

  34. -
    35. 

  35. -		fetch(url, init).then((response) => {
    36. 

  36. -			response.json().then(result => {
    37. 

  37. -				this.clearSearchResults();
    38. 

  38. -
    39. 

  39. -				if (result && result.candidates) {
    40. 

  40. -					this.displaySearchResults(result.candidates);
    41. 

  41. -				} else {
    42. 

  42. -					throw new Error('Unexpected response, no candidates property');
    43. 

  43. -				}
    44. 

  44. -			}).catch(_ => {
    45. 

  45. -				// Ignore
    46. 

  46. -			});
    47. 

  47. -		}).catch(_ => {
    48. 

  48. -			// Ignore
    49. 

  49. -		});
    50. 

  50. -	}
    51. 

  51. -
    52. 

  52.  	private displaySearchResults(results: SearchResult[]) {
    53. 

  53. @@ -844,4 +813,4 @@ export class BaseIssueReporterService extends Disposable {
    54. 

  54.  		sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
    55. 

  55. -		sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false));
    56. 

  56. -		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false));
    57. 

  57. +		sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "VSCodium"), false));
    58. 

  58. +		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false));
    59. 

  59.  		if (this.product.reportMarketplaceIssueUrl) {
    60. 

  60. @@ -905,3 +874,3 @@ export class BaseIssueReporterService extends Disposable {
    61. 

  61.  			hide(descriptionTextArea);
    62. 

  62. -			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
    63. 

  63. +			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium"));
    64. 

  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. 

  65. diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
    66. 

  66. index 4394874..a9c3f57 100644
    67. 

  67. --- a/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
    68. 

  68. +++ b/src/vs/workbench/contrib/issue/browser/issueReporterModel.ts
    69. 

  69. @@ -93,3 +93,3 @@ ${this._data.issueDescription}
    70. 

  70.  ${this.getExtensionVersion()}
    71. 

  71. -VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
    72. 

  72. +VSCodium version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
    73. 

  73.  OS version: ${this._data.versionInfo && this._data.versionInfo.os}
    74. 

  74. diff --git a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
    75. 

  75. index 195857e..68163c0 100644
    76. 

  76. --- a/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
    77. 

  77. +++ b/src/vs/workbench/contrib/issue/browser/issueReporterPage.ts
    78. 

  78. @@ -18,3 +18,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
    79. 

  79.  		comment: [
    80. 

  80. -			'{Locked="<a href=\"https://github.com/microsoft/vscode/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
    81. 

  81. +			'{Locked="<a href=\"https://github.com/VSCodium/vscodium/wiki/Submitting-Bugs-and-Suggestions\" target=\"_blank\">"}',
    82. 

  82.  			'{Locked="</a>"}'
    83. 

  83. @@ -22,3 +22,3 @@ const reviewGuidanceLabel = localize( // intentionally not escaped because of it
    84. 

  84.  	},
    85. 

  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. 

  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. 

  87.  );
    88. 

  88. diff --git a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
    89. 

  89. index b923388..043a8ac 100644
    90. 

  90. --- a/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
    91. 

  91. +++ b/src/vs/workbench/contrib/issue/electron-sandbox/issueReporterService.ts
    92. 

  92. @@ -555,3 +555,3 @@ export class IssueReporter extends Disposable {
    93. 

  93.  		if (title) {
    94. 

  94. -			this.searchDuplicates(title, issueDescription);
    95. 

  95. +			this.searchGitHub('VSCodium/vscodium', title);
    96. 

  96.  		} else {
    97. 

  97. @@ -647,33 +647,2 @@ export class IssueReporter extends Disposable {
    98. 

  98.  
    99. 

  99. -	@debounce(300)
    100. 

  100. -	private searchDuplicates(title: string, body?: string): void {
    101. 

  101. -		const url = 'https://vscode-probot.westus.cloudapp.azure.com:7890/duplicate_candidates';
    102. 

  102. -		const init = {
    103. 

  103. -			method: 'POST',
    104. 

  104. -			body: JSON.stringify({
    105. 

  105. -				title,
    106. 

  106. -				body
    107. 

  107. -			}),
    108. 

  108. -			headers: new Headers({
    109. 

  109. -				'Content-Type': 'application/json'
    110. 

  110. -			})
    111. 

  111. -		};
    112. 

  112. -
    113. 

  113. -		fetch(url, init).then((response) => {
    114. 

  114. -			response.json().then(result => {
    115. 

  115. -				this.clearSearchResults();
    116. 

  116. -
    117. 

  117. -				if (result && result.candidates) {
    118. 

  118. -					this.displaySearchResults(result.candidates);
    119. 

  119. -				} else {
    120. 

  120. -					throw new Error('Unexpected response, no candidates property');
    121. 

  121. -				}
    122. 

  122. -			}).catch(_ => {
    123. 

  123. -				// Ignore
    124. 

  124. -			});
    125. 

  125. -		}).catch(_ => {
    126. 

  126. -			// Ignore
    127. 

  127. -		});
    128. 

  128. -	}
    129. 

  129. -
    130. 

  130.  	private displaySearchResults(results: SearchResult[]) {
    131. 

  131. @@ -769,4 +738,4 @@ export class IssueReporter extends Disposable {
    132. 

  132.  		sourceSelect.append(this.makeOption('', localize('selectSource', "Select source"), true));
    133. 

  133. -		sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "Visual Studio Code"), false));
    134. 

  134. -		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VS Code extension"), false));
    135. 

  135. +		sourceSelect.append(this.makeOption(IssueSource.VSCode, localize('vscode', "VSCodium"), false));
    136. 

  136. +		sourceSelect.append(this.makeOption(IssueSource.Extension, localize('extension', "A VSCodium extension"), false));
    137. 

  137.  		if (this.configuration.product.reportMarketplaceIssueUrl) {
    138. 

  138. @@ -830,3 +799,3 @@ export class IssueReporter extends Disposable {
    139. 

  139.  			hide(descriptionTextArea);
    140. 

  140. -			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VS Code"));
    141. 

  141. +			reset(descriptionTitle, localize('handlesIssuesElsewhere', "This extension handles issues outside of VSCodium"));
    142. 

  142.  			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));
    143.