Merge from vscode 31e03b8ffbb218a87e3941f2b63a249f061fe0e4 (#4986)

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

@@ -24,6 +24,10 @@ td {
 	vertical-align: top;
 }
 
+tr td:first-child {
+	width: 30%;
+}
+
 label {
 	user-select: none;
 }

src/vs/code/electron-browser/processExplorer/media/collapsed.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#646465" d="M6 4v8l4-4-4-4zm1 2.414L8.586 8 7 9.586V6.414z"/></svg>

src/vs/code/electron-browser/processExplorer/media/expanded.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill="#646465" d="M11 10H5.344L11 4.414V10z"/></svg>

src/vs/code/electron-browser/processExplorer/media/processExplorer.css

@@ -85,6 +85,20 @@ td {
 	height: 22px;
 }
 
+.error {
+	padding-left: 20px;
+	white-space: nowrap;
+}
+
 tbody > tr:hover {
 	background-color: #2A2D2E;
 }
+
+.hidden {
+	display: none;
+}
+
+img {
+	width: 16px;
+	margin-right: 4px;
+}

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

@@ -4,7 +4,6 @@
  *--------------------------------------------------------------------------------------------*/
 
 import 'vs/css!./media/processExplorer';
-import { listProcesses } from 'vs/base/node/ps';
 import { webFrame, ipcRenderer, clipboard } from 'electron';
 import { repeat } from 'vs/base/common/strings';
 import { totalmem } from 'os';
@@ -16,31 +15,46 @@ import * as platform from 'vs/base/common/platform';
 import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
 import { popup } from 'vs/base/parts/contextmenu/electron-browser/contextmenu';
 import { ProcessItem } from 'vs/base/common/processes';
+import { addDisposableListener } from 'vs/base/browser/dom';
+import { IDisposable } from 'vs/base/common/lifecycle';
+import { isRemoteDiagnosticError, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnosticsService';
+
 
-let processList: any[];
 let mapPidToWindowTitle = new Map<number, string>();
 
 const DEBUG_FLAGS_PATTERN = /\s--(inspect|debug)(-brk|port)?=(\d+)?/;
 const DEBUG_PORT_PATTERN = /\s--(inspect|debug)-port=(\d+)/;
+const listeners: IDisposable[] = [];
+const collapsedStateCache: Map<string, boolean> = new Map<string, boolean>();
+let lastRequestTime: number;
 
-function getProcessList(rootProcess: ProcessItem) {
-	const processes: any[] = [];
+interface FormattedProcessItem {
+	cpu: string;
+	memory: string;
+	pid: string;
+	name: string;
+	formattedName: string;
+	cmd: string;
+}
+
+function getProcessList(rootProcess: ProcessItem, isLocal: boolean): FormattedProcessItem[] {
+	const processes: FormattedProcessItem[] = [];
 
 	if (rootProcess) {
-		getProcessItem(processes, rootProcess, 0);
+		getProcessItem(processes, rootProcess, 0, isLocal);
 	}
 
 	return processes;
 }
 
-function getProcessItem(processes: any[], item: ProcessItem, indent: number): void {
+function getProcessItem(processes: FormattedProcessItem[], item: ProcessItem, indent: number, isLocal: boolean): void {
 	const isRoot = (indent === 0);
 
 	const MB = 1024 * 1024;
 
 	let name = item.name;
 	if (isRoot) {
-		name = `${product.applicationName} main`;
+		name = isLocal ? `${product.applicationName} main` : 'remote agent';
 	}
 
 	if (name === 'window') {
@@ -52,9 +66,9 @@ function getProcessItem(processes: any[], item: ProcessItem, indent: number): vo
 	const formattedName = isRoot ? name : `${repeat('    ', indent)} ${name}`;
 	const memory = process.platform === 'win32' ? item.mem : (totalmem() * (item.mem / 100));
 	processes.push({
-		cpu: Number(item.load.toFixed(0)),
-		memory: Number((memory / MB).toFixed(0)),
-		pid: Number((item.pid).toFixed(0)),
+		cpu: item.load.toFixed(0),
+		memory: (memory / MB).toFixed(0),
+		pid: item.pid.toFixed(0),
 		name,
 		formattedName,
 		cmd: item.cmd
@@ -62,7 +76,7 @@ function getProcessItem(processes: any[], item: ProcessItem, indent: number): vo
 
 	// Recurse into children if any
 	if (Array.isArray(item.children)) {
-		item.children.forEach(child => getProcessItem(processes, child, indent + 1));
+		item.children.forEach(child => getProcessItem(processes, child, indent + 1, isLocal));
 	}
 }
 
@@ -71,7 +85,7 @@ function isDebuggable(cmd: string): boolean {
 	return (matches && matches.length >= 2) || cmd.indexOf('node ') >= 0 || cmd.indexOf('node.exe') >= 0;
 }
 
-function attachTo(item: ProcessItem) {
+function attachTo(item: FormattedProcessItem) {
 	const config: any = {
 		type: 'node',
 		request: 'attach',
@@ -113,35 +127,82 @@ function getProcessIdWithHighestProperty(processList: any[], propertyName: strin
 	return maxProcessId;
 }
 
-function updateProcessInfo(processList: any[]): void {
+function updateSectionCollapsedState(shouldExpand: boolean, body: HTMLElement, twistie: HTMLImageElement, sectionName: string) {
+	if (shouldExpand) {
+		body.classList.remove('hidden');
+		collapsedStateCache.set(sectionName, false);
+		twistie.src = './media/expanded.svg';
+	} else {
+		body.classList.add('hidden');
+		collapsedStateCache.set(sectionName, true);
+		twistie.src = './media/collapsed.svg';
+	}
+}
+
+function renderProcessFetchError(sectionName: string, errorMessage: string) {
+	const container = document.getElementById('process-list');
+	if (!container) {
+		return;
+	}
+
+	const body = document.createElement('tbody');
+
+	renderProcessGroupHeader(sectionName, body, container);
+
+	const errorRow = document.createElement('tr');
+	const data = document.createElement('td');
+	data.textContent = errorMessage;
+	data.className = 'error';
+	data.colSpan = 4;
+	errorRow.appendChild(data);
+
+	body.appendChild(errorRow);
+	container.appendChild(body);
+}
+
+function renderProcessGroupHeader(sectionName: string, body: HTMLElement, container: HTMLElement) {
+	const headerRow = document.createElement('tr');
+	const data = document.createElement('td');
+	data.textContent = sectionName;
+	data.colSpan = 4;
+	headerRow.appendChild(data);
+
+	const twistie = document.createElement('img');
+	updateSectionCollapsedState(!collapsedStateCache.get(sectionName), body, twistie, sectionName);
+	data.prepend(twistie);
+
+	listeners.push(addDisposableListener(data, 'click', (e) => {
+		const isHidden = body.classList.contains('hidden');
+		updateSectionCollapsedState(isHidden, body, twistie, sectionName);
+	}));
+
+	container.appendChild(headerRow);
+}
+
+function renderTableSection(sectionName: string, processList: FormattedProcessItem[], renderManySections: boolean, sectionIsLocal: boolean): void {
 	const container = document.getElementById('process-list');
 	if (!container) {
 		return;
 	}
 
-	container.innerHTML = '';
 	const highestCPUProcess = getProcessIdWithHighestProperty(processList, 'cpu');
 	const highestMemoryProcess = getProcessIdWithHighestProperty(processList, 'memory');
 
-	const tableHead = document.createElement('thead');
-	tableHead.innerHTML = `<tr>
-		<th scope="col" class="cpu">${localize('cpu', "CPU %")}</th>
-		<th scope="col" class="memory">${localize('memory', "Memory (MB)")}</th>
-		<th scope="col" class="pid">${localize('pid', "pid")}</th>
-		<th scope="col" class="nameLabel">${localize('name', "Name")}</th>
-	</tr>`;
+	const body = document.createElement('tbody');
 
-	const tableBody = document.createElement('tbody');
+	if (renderManySections) {
+		renderProcessGroupHeader(sectionName, body, container);
+	}
 
 	processList.forEach(p => {
 		const row = document.createElement('tr');
-		row.id = p.pid;
+		row.id = p.pid.toString();
 
 		const cpu = document.createElement('td');
 		p.pid === highestCPUProcess
 			? cpu.classList.add('centered', 'highest')
 			: cpu.classList.add('centered');
-		cpu.textContent = p.cpu;
+		cpu.textContent = p.cpu.toString();
 
 		const memory = document.createElement('td');
 		p.pid === highestMemoryProcess
@@ -160,10 +221,45 @@ function updateProcessInfo(processList: any[]): void {
 		name.textContent = p.formattedName;
 
 		row.append(cpu, memory, pid, name);
-		tableBody.appendChild(row);
+
+		listeners.push(addDisposableListener(row, 'contextmenu', (e) => {
+			showContextMenu(e, p, sectionIsLocal);
+		}));
+
+		body.appendChild(row);
 	});
 
-	container.append(tableHead, tableBody);
+	container.appendChild(body);
+}
+
+function updateProcessInfo(processLists: [{ name: string, rootProcess: ProcessItem | IRemoteDiagnosticError }]): void {
+	const container = document.getElementById('process-list');
+	if (!container) {
+		return;
+	}
+
+	container.innerHTML = '';
+	listeners.forEach(l => l.dispose());
+
+	const tableHead = document.createElement('thead');
+	tableHead.innerHTML = `<tr>
+		<th scope="col" class="cpu">${localize('cpu', "CPU %")}</th>
+		<th scope="col" class="memory">${localize('memory', "Memory (MB)")}</th>
+		<th scope="col" class="pid">${localize('pid', "pid")}</th>
+		<th scope="col" class="nameLabel">${localize('name', "Name")}</th>
+	</tr>`;
+
+	container.append(tableHead);
+
+	const hasMultipleMachines = Object.keys(processLists).length > 1;
+	processLists.forEach((remote, i) => {
+		const isLocal = i === 0;
+		if (isRemoteDiagnosticError(remote.rootProcess)) {
+			renderProcessFetchError(remote.name, remote.rootProcess.errorMessage);
+		} else {
+			renderTableSection(remote.name, getProcessList(remote.rootProcess, isLocal), hasMultipleMachines, isLocal);
+		}
+	});
 }
 
 function applyStyles(styles: ProcessExplorerStyles): void {
@@ -171,11 +267,11 @@ function applyStyles(styles: ProcessExplorerStyles): void {
 	const content: string[] = [];
 
 	if (styles.hoverBackground) {
-		content.push(`tbody > tr:hover  { background-color: ${styles.hoverBackground}; }`);
+		content.push(`tbody > tr:hover, table > tr:hover  { background-color: ${styles.hoverBackground}; }`);
 	}
 
 	if (styles.hoverForeground) {
-		content.push(`tbody > tr:hover{ color: ${styles.hoverForeground}; }`);
+		content.push(`tbody > tr:hover, table > tr:hover { color: ${styles.hoverForeground}; }`);
 	}
 
 	if (styles.highlightForeground) {
@@ -200,13 +296,13 @@ function applyZoom(zoomLevel: number): void {
 	browser.setZoomLevel(webFrame.getZoomLevel(), /*isTrusted*/false);
 }
 
-function showContextMenu(e: MouseEvent) {
+function showContextMenu(e: MouseEvent, item: FormattedProcessItem, isLocal: boolean) {
 	e.preventDefault();
 
 	const items: IContextMenuItem[] = [];
+	const pid = Number(item.pid);
 
-	const pid = parseInt((e.currentTarget as HTMLElement).id);
-	if (pid && typeof pid === 'number') {
+	if (isLocal) {
 		items.push({
 			label: localize('killProcess', "Kill Process"),
 			click() {
@@ -224,48 +320,37 @@ function showContextMenu(e: MouseEvent) {
 		items.push({
 			type: 'separator'
 		});
+	}
 
-		items.push({
-			label: localize('copy', "Copy"),
-			click() {
-				const row = document.getElementById(pid.toString());
-				if (row) {
-					clipboard.writeText(row.innerText);
-				}
+	items.push({
+		label: localize('copy', "Copy"),
+		click() {
+			const row = document.getElementById(pid.toString());
+			if (row) {
+				clipboard.writeText(row.innerText);
 			}
-		});
-
-		items.push({
-			label: localize('copyAll', "Copy All"),
-			click() {
-				const processList = document.getElementById('process-list');
-				if (processList) {
-					clipboard.writeText(processList.innerText);
-				}
-			}
-		});
-
-		const item = processList.filter(process => process.pid === pid)[0];
-		if (item && isDebuggable(item.cmd)) {
-			items.push({
-				type: 'separator'
-			});
-
-			items.push({
-				label: localize('debug', "Debug"),
-				click() {
-					attachTo(item);
-				}
-			});
 		}
-	} else {
+	});
+
+	items.push({
+		label: localize('copyAll', "Copy All"),
+		click() {
+			const processList = document.getElementById('process-list');
+			if (processList) {
+				clipboard.writeText(processList.innerText);
+			}
+		}
+	});
+
+	if (item && isLocal && isDebuggable(item.cmd)) {
 		items.push({
-			label: localize('copyAll', "Copy All"),
+			type: 'separator'
+		});
+
+		items.push({
+			label: localize('debug', "Debug"),
 			click() {
-				const processList = document.getElementById('process-list');
-				if (processList) {
-					clipboard.writeText(processList.innerText);
-				}
+				attachTo(item);
 			}
 		});
 	}
@@ -273,6 +358,22 @@ function showContextMenu(e: MouseEvent) {
 	popup(items);
 }
 
+function requestProcessList(totalWaitTime: number): void {
+	setTimeout(() => {
+		const nextRequestTime = Date.now();
+		const waited = totalWaitTime + nextRequestTime - lastRequestTime;
+		lastRequestTime = nextRequestTime;
+
+		// Wait at least a second between requests.
+		if (waited > 1000) {
+			ipcRenderer.send('windowsInfoRequest');
+			ipcRenderer.send('vscode:listProcesses');
+		} else {
+			requestProcessList(waited);
+		}
+	}, 200);
+}
+
 export function startup(data: ProcessExplorerData): void {
 	applyStyles(data.styles);
 	applyZoom(data.zoomLevel);
@@ -283,23 +384,14 @@ export function startup(data: ProcessExplorerData): void {
 		windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
 	});
 
-	setInterval(() => {
-		ipcRenderer.send('windowsInfoRequest');
-
-		listProcesses(data.pid).then(processes => {
-			processList = getProcessList(processes);
-			updateProcessInfo(processList);
-
-			const tableRows = document.getElementsByTagName('tr');
-			for (let i = 0; i < tableRows.length; i++) {
-				const tableRow = tableRows[i];
-				tableRow.addEventListener('contextmenu', (e) => {
-					showContextMenu(e);
-				});
-			}
-		});
-	}, 1200);
+	ipcRenderer.on('vscode:listProcessesResponse', (_event: Event, processRoots: [{ name: string, rootProcess: ProcessItem | IRemoteDiagnosticError }]) => {
+		updateProcessInfo(processRoots);
+		requestProcessList(0);
+	});
 
+	lastRequestTime = Date.now();
+	ipcRenderer.send('windowsInfoRequest');
+	ipcRenderer.send('vscode:listProcesses');
 
 	document.onkeydown = (e: KeyboardEvent) => {
 		const cmdOrCtrlKey = platform.isMacintosh ? e.metaKey : e.ctrlKey;

src/vs/code/electron-browser/sharedProcess/sharedProcessMain.ts

@@ -101,7 +101,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 
 	services.set(IEnvironmentService, environmentService);
 	services.set(ILogService, logService);
-	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
+	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService, [environmentService.appSettingsPath]));
 	services.set(IRequestService, new SyncDescriptor(RequestService));
 	services.set(IDownloadService, new SyncDescriptor(DownloadService));
 
@@ -121,7 +121,7 @@ function main(server: Server, initData: ISharedProcessInitData, configuration: I
 	instantiationService.invokeFunction(accessor => {
 		const services = new ServiceCollection();
 		const environmentService = accessor.get(IEnvironmentService);
-		const { appRoot, extensionsPath, extensionDevelopmentLocationURI, isBuilt, installSourcePath } = environmentService;
+		const { appRoot, extensionsPath, extensionDevelopmentLocationURI: extensionDevelopmentLocationURI, isBuilt, installSourcePath } = environmentService;
 		const telemetryLogService = new FollowerLogService(logLevelClient, createSpdLogService('telemetry', initData.logLevel, environmentService.logsPath));
 		telemetryLogService.info('The below are logs for every telemetry event sent from VS Code once the log level is set to trace.');
 		telemetryLogService.info('===========================================================');

src/vs/code/electron-main/app.ts

@@ -67,7 +67,7 @@ import { storeBackgroundColor } from 'vs/code/electron-main/theme';
 import { homedir } from 'os';
 import { join, sep } from 'vs/base/common/path';
 import { localize } from 'vs/nls';
-import { REMOTE_HOST_SCHEME } from 'vs/platform/remote/common/remoteHosts';
+import { Schemas } from 'vs/base/common/network';
 import { REMOTE_FILE_SYSTEM_CHANNEL_NAME } from 'vs/platform/remote/common/remoteAgentFileSystemChannel';
 import { ResolvedAuthority } from 'vs/platform/remote/common/remoteAuthorityResolver';
 import { SnapUpdateService } from 'vs/platform/update/electron-main/updateService.snap';
@@ -748,7 +748,7 @@ export class CodeApplication extends Disposable {
 			}
 		};
 
-		protocol.registerBufferProtocol(REMOTE_HOST_SCHEME, async (request, callback) => {
+		protocol.registerBufferProtocol(Schemas.vscodeRemote, async (request, callback) => {
 			if (request.method !== 'GET') {
 				return callback(undefined);
 			}

src/vs/code/electron-main/main.ts

@@ -307,7 +307,7 @@ function createServices(args: ParsedArgs, bufferLogService: BufferLogService): I
 	services.set(ILogService, logService);
 	services.set(ILifecycleService, new SyncDescriptor(LifecycleService));
 	services.set(IStateService, new SyncDescriptor(StateService));
-	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
+	services.set(IConfigurationService, new SyncDescriptor(ConfigurationService, [environmentService.appSettingsPath]));
 	services.set(IRequestService, new SyncDescriptor(RequestService));
 	services.set(IDiagnosticsService, new SyncDescriptor(DiagnosticsService));
 

src/vs/code/electron-main/window.ts

@@ -320,6 +320,9 @@ export class CodeWindow extends Disposable implements ICodeWindow {
 		this._win.webContents.session.webRequest.onBeforeSendHeaders({ urls }, (details, cb) => {
 			this.marketplaceHeadersPromise.then(headers => {
 				const requestHeaders = objects.assign(details.requestHeaders, headers);
+				if (!this.configurationService.getValue('extensions.disableExperimentalAzureSearch')) {
+					requestHeaders['Cookie'] = `${requestHeaders['Cookie'] ? requestHeaders['Cookie'] + ';' : ''}EnableExternalSearchForVSCode=true`;
+				}
 				cb({ cancel: false, requestHeaders });
 			});
 		});

src/vs/code/node/cli.ts

@@ -24,7 +24,8 @@ function shouldSpawnCliProcess(argv: ParsedArgs): boolean {
 	return !!argv['install-source']
 		|| !!argv['list-extensions']
 		|| !!argv['install-extension']
-		|| !!argv['uninstall-extension'];
+		|| !!argv['uninstall-extension']
+		|| !!argv['locate-extension'];
 }
 
 interface IMainCli {

src/vs/code/node/cliProcessMain.ts

@@ -41,6 +41,7 @@ import { IExtensionManifest, ExtensionType, isLanguagePackExtension } from 'vs/p
 import { isUIExtension } from 'vs/platform/extensions/node/extensionsUtil';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { LocalizationsService } from 'vs/platform/localizations/node/localizations';
+import { Schemas } from 'vs/base/common/network';
 
 const notFound = (id: string) => localize('notFound', "Extension '{0}' not found.", id);
 const notInstalled = (id: string) => localize('notInstalled', "Extension '{0}' is not installed.", id);
@@ -92,6 +93,10 @@ export class Main {
 			const arg = argv['uninstall-extension'];
 			const ids: string[] = typeof arg === 'string' ? [arg] : arg;
 			await this.uninstallExtension(ids);
+		} else if (argv['locate-extension']) {
+			const arg = argv['locate-extension'];
+			const ids: string[] = typeof arg === 'string' ? [arg] : arg;
+			await this.locateExtension(ids);
 		}
 	}
 
@@ -257,6 +262,20 @@ export class Main {
 		}
 	}
 
+	private async locateExtension(extensions: string[]): Promise<void> {
+		const installed = await this.extensionManagementService.getInstalled();
+		extensions.forEach(e => {
+			installed.forEach(i => {
+				if (i.identifier.id === e) {
+					if (i.location.scheme === Schemas.file) {
+						console.log(i.location.fsPath);
+						return;
+					}
+				}
+			});
+		});
+	}
+
 	private async updateLocalizationsCache(): Promise<void> {
 		const localizationService = this.instantiationService.createInstance(LocalizationsService);
 		await localizationService.update();
@@ -286,10 +305,10 @@ export function main(argv: ParsedArgs): Promise<void> {
 		const stateService = accessor.get(IStateService);
 
 		return Promise.all([envService.appSettingsHome, envService.extensionsPath].map(p => mkdirp(p))).then(() => {
-			const { appRoot, extensionsPath, extensionDevelopmentLocationURI, isBuilt, installSourcePath } = envService;
+			const { appRoot, extensionsPath, extensionDevelopmentLocationURI: extensionDevelopmentLocationURI, isBuilt, installSourcePath } = envService;
 
 			const services = new ServiceCollection();
-			services.set(IConfigurationService, new SyncDescriptor(ConfigurationService));
+			services.set(IConfigurationService, new SyncDescriptor(ConfigurationService, [environmentService.appSettingsPath]));
 			services.set(IRequestService, new SyncDescriptor(RequestService));
 			services.set(IExtensionManagementService, new SyncDescriptor(ExtensionManagementService, [false]));
 			services.set(IExtensionGalleryService, new SyncDescriptor(ExtensionGalleryService));
@@ -321,4 +340,4 @@ export function main(argv: ParsedArgs): Promise<void> {
 			});
 		});
 	});
-}
+}