Skip to content

Commit c95fb56

Browse files
authored
changed issueReporterCommand types and bug fix (microsoft#203747)
changed uri from string, word wrap
1 parent d7cfba7 commit c95fb56

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

src/vs/code/electron-sandbox/issue/issueReporterPage.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ export default (): string => `
9393
<span id="ext-loading" hidden></span>
9494
<span class="ext-parens" hidden>(</span><a href="#" class="showInfo" id="extension-id">${escape(localize('show', "show"))}</a><span class="ext-parens" hidden>)</span>
9595
</label>
96-
<pre class="block-info" id="extension-data" placeholder="${escape(localize('extensionData', "Extension does not have additional data to include."))}">
96+
<pre class="block-info" id="extension-data" placeholder="${escape(localize('extensionData', "Extension does not have additional data to include."))}" style="white-space: pre-wrap;">
9797
<!-- To be dynamically filled -->
9898
</pre>
9999
</div>

src/vs/code/electron-sandbox/issue/issueReporterService.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { Disposable } from 'vs/base/common/lifecycle';
1515
import { isLinuxSnap, isMacintosh } from 'vs/base/common/platform';
1616
import { escape } from 'vs/base/common/strings';
1717
import { ThemeIcon } from 'vs/base/common/themables';
18+
import { URI } from 'vs/base/common/uri';
1819
import { IssueReporterModel, IssueReporterData as IssueReporterModelData } from 'vs/code/electron-sandbox/issue/issueReporterModel';
1920
import { localize } from 'vs/nls';
2021
import { isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
@@ -249,7 +250,8 @@ export class IssueReporter extends Disposable {
249250
private async updateIssueReporterUri(extension: IssueReporterExtensionData): Promise<void> {
250251
try {
251252
if (extension.command?.uri) {
252-
extension.bugsUrl = extension.command.uri;
253+
const uri = URI.revive(extension.command.uri);
254+
extension.bugsUrl = uri.toString();
253255
} else {
254256
const uri = await this.issueMainService.$getIssueReporterUri(extension.id);
255257
extension.bugsUrl = uri.toString(true);
@@ -958,7 +960,8 @@ export class IssueReporter extends Disposable {
958960
}
959961

960962
if (selectedExtension?.command?.uri) {
961-
issueUrl = selectedExtension.command.uri;
963+
const uri = URI.revive(selectedExtension.command.uri);
964+
issueUrl = uri.toString();
962965
}
963966

964967
const gitHubDetails = this.parseGitHubUrl(issueUrl);

src/vs/platform/issue/common/issue.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { URI } from 'vs/base/common/uri';
6+
import { URI, UriComponents } from 'vs/base/common/uri';
77
import { ISandboxConfiguration } from 'vs/base/parts/sandbox/common/sandboxTypes';
88
import { PerformanceInfo, SystemInfo } from 'vs/platform/diagnostics/common/diagnostics';
99
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
@@ -60,7 +60,7 @@ export interface IssueReporterExtensionData {
6060
command?: {
6161
data?: string;
6262
template?: string;
63-
uri?: string;
63+
uri?: UriComponents;
6464
};
6565
}
6666

@@ -78,7 +78,7 @@ export interface IssueReporterData extends WindowData {
7878
command?: {
7979
data?: string;
8080
template?: string;
81-
uri?: string;
81+
uri?: UriComponents;
8282
};
8383
}
8484

0 commit comments

Comments
 (0)