Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998 (#7880)

* Merge from vscode c58aaab8a1cc22a7139b761166a0d4f37d41e998

* fix pipelines

* fix strict-null-checks

* add missing files

src/vs/code/electron-browser/issue/issueReporter.js

@@ -10,4 +10,4 @@ const bootstrapWindow = require('../../../../bootstrap-window');
 
 bootstrapWindow.load(['vs/code/electron-browser/issue/issueReporterMain'], function (issueReporter, configuration) {
 	issueReporter.startup(configuration);
-}, { forceEnableDeveloperKeybindings: true });
+}, { forceEnableDeveloperKeybindings: true, disallowReloadKeybinding: true });

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

@@ -34,10 +34,9 @@ import { IssueReporterData, IssueReporterStyles, IssueType, ISettingsSearchIssue
 import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage';
 import { LoggerChannelClient, FollowerLogService } from 'vs/platform/log/common/logIpc';
 import { ILogService, getLogLevel } from 'vs/platform/log/common/log';
-import { OcticonLabel } from 'vs/base/browser/ui/octiconLabel/octiconLabel';
+import { CodiconLabel } from 'vs/base/browser/ui/codiconLabel/codiconLabel';
 import { normalizeGitHubUrl } from 'vs/code/electron-browser/issue/issueReporterUtil';
 import { Button } from 'vs/base/browser/ui/button/button';
-import { withUndefinedAsNull } from 'vs/base/common/types';
 import { SystemInfo, isRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
 import { SpdLogService } from 'vs/platform/log/node/spdlogService';
 import { ISharedProcessService } from 'vs/platform/ipc/electron-browser/sharedProcessService';
@@ -232,7 +231,7 @@ export class IssueReporter extends Disposable {
 
 		styleTag.innerHTML = content.join('\n');
 		document.head.appendChild(styleTag);
-		document.body.style.color = withUndefinedAsNull(styles.color);
+		document.body.style.color = styles.color || '';
 	}
 
 	private handleExtensionData(extensions: IssueReporterExtensionData[]) {
@@ -649,8 +648,8 @@ export class IssueReporter extends Disposable {
 					issueState = $('span.issue-state');
 
 					const issueIcon = $('span.issue-icon');
-					const octicon = new OcticonLabel(issueIcon);
-					octicon.text = issue.state === 'open' ? '$(issue-opened)' : '$(issue-closed)';
+					const codicon = new CodiconLabel(issueIcon);
+					codicon.text = issue.state === 'open' ? '$(issue-opened)' : '$(issue-closed)';
 
 					const issueStateLabel = $('span.issue-state.label');
 					issueStateLabel.textContent = issue.state === 'open' ? localize('open', "Open") : localize('closed', "Closed");

src/vs/code/electron-browser/issue/media/issueReporter.css

@@ -352,7 +352,7 @@ a {
 	text-overflow: ellipsis;
 }
 
-.issues-container > .issue > .issue-state .octicon {
+.issues-container > .issue > .issue-state .codicon {
 	width: 16px;
 }
 

src/vs/code/electron-browser/processExplorer/processExplorerMain.ts

@@ -19,7 +19,6 @@ import { addDisposableListener } from 'vs/base/browser/dom';
 import { DisposableStore } from 'vs/base/common/lifecycle';
 import { isRemoteDiagnosticError, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
 
-
 let mapPidToWindowTitle = new Map<number, string>();
 
 const DEBUG_FLAGS_PATTERN = /\s--(inspect|debug)(-brk|port)?=(\d+)?/;
@@ -374,9 +373,20 @@ function requestProcessList(totalWaitTime: number): void {
 	}, 200);
 }
 
+function createCloseListener(): void {
+	// Cmd/Ctrl + w closes process explorer
+	window.addEventListener('keydown', e => {
+		const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;
+		if (cmdOrCtrlKey && e.keyCode === 87) {
+			ipcRenderer.send('vscode:closeProcessExplorer');
+		}
+	});
+}
+
 export function startup(data: ProcessExplorerData): void {
 	applyStyles(data.styles);
 	applyZoom(data.zoomLevel);
+	createCloseListener();
 
 	// Map window process pids to titles, annotate process names with this when rendering to distinguish between them
 	ipcRenderer.on('vscode:windowsInfoResponse', (_event: unknown, windows: any[]) => {

src/vs/code/electron-browser/sharedProcess/contrib/storageDataCleaner.ts

@@ -13,7 +13,7 @@ import { IBackupWorkspacesFormat } from 'vs/platform/backup/node/backup';
 export class StorageDataCleaner extends Disposable {
 
 	// Workspace/Folder storage names are MD5 hashes (128bits / 4 due to hex presentation)
-	private static NON_EMPTY_WORKSPACE_ID_LENGTH = 128 / 4;
+	private static readonly NON_EMPTY_WORKSPACE_ID_LENGTH = 128 / 4;
 
 	constructor(
 		@IEnvironmentService private readonly environmentService: IEnvironmentService