Include if client is in unsupported mode & include restricted mode in…

… copy (#154209)

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

@@ -140,6 +140,7 @@ export class IssueReporter extends Disposable {
 		this.handleExtensionData(configuration.data.enabledExtensions);
 		this.updateExperimentsInfo(configuration.data.experiments);
 		this.updateRestrictedMode(configuration.data.restrictedMode);
+		this.updateUnsupportedMode(configuration.data.isUnsupported);
 	}
 
 	render(): void {
@@ -1154,6 +1155,10 @@ export class IssueReporter extends Disposable {
 		this.issueReporterModel.update({ restrictedMode });
 	}
 
+	private updateUnsupportedMode(isUnsupported: boolean) {
+		this.issueReporterModel.update({ isUnsupported });
+	}
+
 	private updateExperimentsInfo(experimentInfo: string | undefined) {
 		this.issueReporterModel.update({ experimentInfo });
 		const target = document.querySelector<HTMLElement>('.block-experiments .block-info');

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

@@ -33,6 +33,7 @@ export interface IssueReporterData {
 	filterResultCount?: number;
 	experimentInfo?: string;
 	restrictedMode?: boolean;
+	isUnsupported?: boolean;
 }
 
 export class IssueReporterModel {
@@ -61,14 +62,21 @@ export class IssueReporterModel {
 	}
 
 	serialize(): string {
+		const modes = [];
+		if (this._data.restrictedMode) {
+			modes.push('Restricted');
+		}
+		if (this._data.isUnsupported) {
+			modes.push('Unsupported');
+		}
 		return `
-Issue Type: <b>${this.getIssueTypeTitle()}</b>
+Type: <b>${this.getIssueTypeTitle()}</b>
 
 ${this._data.issueDescription}
 ${this.getExtensionVersion()}
 VS Code version: ${this._data.versionInfo && this._data.versionInfo.vscodeVersion}
 OS version: ${this._data.versionInfo && this._data.versionInfo.os}
-Restricted Mode: ${this._data.restrictedMode ? 'Yes' : 'No'}
+Modes:${modes.length ? ' ' + modes.join(', ') : ''}
 ${this.getRemoteOSes()}
 ${this.getInfos()}
 <!-- generated by issue reporter -->`;

src/vs/code/test/electron-sandbox/issue/testReporterModel.test.ts

@@ -27,13 +27,13 @@ suite('IssueReporter', () => {
 		const issueReporterModel = new IssueReporterModel({});
 		assert.strictEqual(issueReporterModel.serialize(),
 			`
-Issue Type: <b>Bug</b>
+Type: <b>Bug</b>
 
 undefined
 
 VS Code version: undefined
 OS version: undefined
-Restricted Mode: No
+Modes:
 
 Extensions: none
 <!-- generated by issue reporter -->`);
@@ -58,13 +58,13 @@ Extensions: none
 		});
 		assert.strictEqual(issueReporterModel.serialize(),
 			`
-Issue Type: <b>Bug</b>
+Type: <b>Bug</b>
 
 undefined
 
 VS Code version: undefined
 OS version: undefined
-Restricted Mode: No
+Modes:
 
 <details>
 <summary>System Info</summary>
@@ -102,13 +102,13 @@ Restricted Mode: No
 		});
 		assert.strictEqual(issueReporterModel.serialize(),
 			`
-Issue Type: <b>Bug</b>
+Type: <b>Bug</b>
 
 undefined
 
 VS Code version: undefined
 OS version: undefined
-Restricted Mode: No
+Modes:
 
 <details>
 <summary>System Info</summary>
@@ -157,13 +157,13 @@ vsins829:30139715
 		});
 		assert.strictEqual(issueReporterModel.serialize(),
 			`
-Issue Type: <b>Bug</b>
+Type: <b>Bug</b>
 
 undefined
 
 VS Code version: undefined
 OS version: undefined
-Restricted Mode: No
+Modes:
 
 <details>
 <summary>System Info</summary>
@@ -214,13 +214,13 @@ Restricted Mode: No
 		});
 		assert.strictEqual(issueReporterModel.serialize(),
 			`
-Issue Type: <b>Bug</b>
+Type: <b>Bug</b>
 
 undefined
 
 VS Code version: undefined
 OS version: undefined
-Restricted Mode: No
+Modes:
 Remote OS version: Linux x64 4.18.0
 
 <details>
@@ -263,13 +263,13 @@ Remote OS version: Linux x64 4.18.0
 		});
 		assert.strictEqual(issueReporterModel.serialize(),
 			`
-Issue Type: <b>Bug</b>
+Type: <b>Bug</b>
 
 undefined
 
 VS Code version: undefined
 OS version: undefined
-Restricted Mode: No
+Modes:
 
 <details>
 <summary>System Info</summary>
@@ -287,6 +287,24 @@ Restricted Mode: No
 <!-- generated by issue reporter -->`);
 	});
 
+	test('should supply mode if applicable', () => {
+		const issueReporterModel = new IssueReporterModel({
+			isUnsupported: true,
+			restrictedMode: true
+		});
+		assert.strictEqual(issueReporterModel.serialize(),
+			`
+Type: <b>Bug</b>
+
+undefined
+
+VS Code version: undefined
+OS version: undefined
+Modes: Restricted, Unsupported
+
+Extensions: none
+<!-- generated by issue reporter -->`);
+	});
 	test('should normalize GitHub urls', () => {
 		[
 			'https://github.com/repo',

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

@@ -59,6 +59,7 @@ export interface IssueReporterData extends WindowData {
 	extensionId?: string;
 	experiments?: string;
 	restrictedMode: boolean;
+	isUnsupported: boolean;
 	githubAccessToken: string;
 	readonly issueTitle?: string;
 	readonly issueBody?: string;

src/vs/workbench/services/issue/electron-sandbox/issueService.ts

@@ -20,6 +20,7 @@ import { IWorkbenchAssignmentService } from 'vs/workbench/services/assignment/co
 import { IAuthenticationService } from 'vs/workbench/services/authentication/common/authentication';
 import { registerMainProcessRemoteService } from 'vs/platform/ipc/electron-sandbox/services';
 import { IWorkspaceTrustManagementService } from 'vs/platform/workspace/common/workspaceTrust';
+import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity';
 
 export class WorkbenchIssueService implements IWorkbenchIssueService {
 	declare readonly _serviceBrand: undefined;
@@ -33,7 +34,8 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 		@IWorkspaceTrustManagementService private readonly workspaceTrustManagementService: IWorkspaceTrustManagementService,
 		@IProductService private readonly productService: IProductService,
 		@IWorkbenchAssignmentService private readonly experimentService: IWorkbenchAssignmentService,
-		@IAuthenticationService private readonly authenticationService: IAuthenticationService
+		@IAuthenticationService private readonly authenticationService: IAuthenticationService,
+		@IIntegrityService private readonly integrityService: IIntegrityService
 	) { }
 
 	async openReporter(dataOverrides: Partial<IssueReporterData> = {}): Promise<void> {
@@ -82,13 +84,22 @@ export class WorkbenchIssueService implements IWorkbenchIssueService {
 			// Ignore
 		}
 
+		// air on the side of caution and have false be the default
+		let isUnsupported = false;
+		try {
+			isUnsupported = !(await this.integrityService.isPure()).isPure;
+		} catch (e) {
+			// Ignore
+		}
+
 		const theme = this.themeService.getColorTheme();
 		const issueReporterData: IssueReporterData = Object.assign({
 			styles: getIssueReporterStyles(theme),
 			zoomLevel: getZoomLevel(),
 			enabledExtensions: extensionData,
 			experiments: experiments?.join('\n'),
 			restrictedMode: !this.workspaceTrustManagementService.isWorkspaceTrusted(),
+			isUnsupported,
 			githubAccessToken,
 		}, dataOverrides);
 		return this.issueService.openReporter(issueReporterData);