use dom API directly so that the url is encoded properly

Author: TylerLeonhardt

src/vs/workbench/contrib/issue/browser/issueService.ts

@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { URI } from 'vs/base/common/uri';
+import * as dom from 'vs/base/browser/dom';
 import { normalizeGitHubUrl } from 'vs/platform/issue/common/issueReporterUtil';
 import { IExtensionManagementService, ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 import { ExtensionType } from 'vs/platform/extensions/common/extensions';
-import { IOpenerService } from 'vs/platform/opener/common/opener';
 import { IProductService } from 'vs/platform/product/common/productService';
 import { IWorkbenchIssueService } from 'vs/workbench/services/issue/common/issue';
 import { IssueReporterData } from 'vs/platform/issue/common/issue';
@@ -18,7 +17,6 @@ export class WebIssueService implements IWorkbenchIssueService {
 
 	constructor(
 		@IExtensionManagementService private readonly extensionManagementService: IExtensionManagementService,
-		@IOpenerService private readonly openerService: IOpenerService,
 		@IProductService private readonly productService: IProductService
 	) { }
 
@@ -33,21 +31,21 @@ export class WebIssueService implements IWorkbenchIssueService {
 		if (options.extensionId) {
 			const extensions = await this.extensionManagementService.getInstalled(ExtensionType.User);
 			selectedExtension = extensions.filter(ext => ext.identifier.id === options.extensionId)[0];
-			const extensionGitHubUrl = await this.getExtensionGitHubUrl(selectedExtension);
+			const extensionGitHubUrl = this.getExtensionGitHubUrl(selectedExtension);
 			if (extensionGitHubUrl) {
 				repositoryUrl = `${extensionGitHubUrl}/issues/new`;
 			}
 		}
 
 		if (repositoryUrl) {
 			repositoryUrl = `${repositoryUrl}?body=${encodeURIComponent(await this.getIssueDescription(selectedExtension))}&labels=web`;
-			return this.openerService.open(URI.parse(repositoryUrl)).then(_ => { });
+			dom.windowOpenNoOpener(repositoryUrl);
 		} else {
 			throw new Error(`Unable to find issue reporting url for ${options.extensionId}`);
 		}
 	}
 
-	private async getExtensionGitHubUrl(extension: ILocalExtension): Promise<string> {
+	private getExtensionGitHubUrl(extension: ILocalExtension): string {
 		let repositoryUrl = '';
 
 		const bugsUrl = extension?.manifest.bugs?.url;
@@ -64,16 +62,13 @@ export class WebIssueService implements IWorkbenchIssueService {
 	}
 
 	private async getIssueDescription(extension: ILocalExtension | undefined): Promise<string> {
-		return `
-Issue Type (Please pick one): <b>Bug | Feature request</b>
+		return `ADD ISSUE DESCRIPTION HERE
 
-ADD ISSUE DESCRIPTION HERE
-
-${extension?.manifest.version ? `\nExtension version: ${extension.manifest.version}` : ''}
-VS Code version: ${this.productService.version}
-VS Code commit: ${this.productService.commit ?? 'unknown'}
-User Agent: ${userAgent?.replace(';', ',') ?? 'unknown'}
+Version: ${this.productService.version}
+Commit: ${this.productService.commit ?? 'unknown'}
+User Agent: ${userAgent ?? 'unknown'}
 Embedder: ${this.productService.embedderIdentifier ?? 'unknown'}
+${extension?.manifest.version ? `\nExtension version: ${extension.manifest.version}` : ''}
 <!-- generated by web issue reporter -->`;
 	}
 }