Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-03 15:01:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return processes in original order, not alphabetized

Browse Source
This commit is contained in:
Rachel Macfarlane
2019-04-08 16:30:35 -07:00
parent 4c512883c9
commit 019f23ed01
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/vs/code/electron-browser/processExplorer/processExplorerMain.ts
View File

@@ -232,7 +232,7 @@ function renderTableSection(sectionName: string, processList: FormattedProcessIt
container.appendChild(body);
}
function updateProcessInfo(processLists: { [key: string]: ProcessItem | IRemoteDiagnosticError }): void {
function updateProcessInfo(processLists: [{ name: string, rootProcess: ProcessItem | IRemoteDiagnosticError }]): void {
const container = document.getElementById('process-list');
if (!container) {
return;
@@ -252,13 +252,12 @@ function updateProcessInfo(processLists: { [key: string]: ProcessItem | IRemoteD
container.append(tableHead);
const hasMultipleMachines = Object.keys(processLists).length > 1;
Object.keys(processLists).forEach((key, i) => {
processLists.forEach((remote, i) => {
const isLocal = i === 0;
const processItem = processLists[key];
if (isRemoteDiagnosticError(processItem)) {
renderProcessFetchError(key, processItem.errorMessage);
if (isRemoteDiagnosticError(remote.rootProcess)) {
renderProcessFetchError(remote.name, remote.rootProcess.errorMessage);
} else {
renderTableSection(key, getProcessList(processItem, isLocal), hasMultipleMachines, isLocal);
renderTableSection(remote.name, getProcessList(remote.rootProcess, isLocal), hasMultipleMachines, isLocal);
}
});
}
@@ -385,7 +384,7 @@ export function startup(data: ProcessExplorerData): void {
windows.forEach(window => mapPidToWindowTitle.set(window.pid, window.title));
});
ipcRenderer.on('vscode:listProcessesResponse', (_event: Event, processRoots: { [key: string]: ProcessItem | IRemoteDiagnosticError }) => {
ipcRenderer.on('vscode:listProcessesResponse', (_event: Event, processRoots: [{ name: string, rootProcess: ProcessItem | IRemoteDiagnosticError }]) => {
updateProcessInfo(processRoots);
requestProcessList(0);
});