Skip to content

Commit 1ccd6a0

Browse files
authored
Merge pull request #123910 from jeanp413/fix-123891
Fixes process explorer does not show twistie
2 parents 36e2b31 + c33420d commit 1ccd6a0

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

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

+20-4
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,15 @@ import { applyZoom, zoomIn, zoomOut } from 'vs/platform/windows/electron-sandbox
1414
import { IContextMenuItem } from 'vs/base/parts/contextmenu/common/contextmenu';
1515
import { popup } from 'vs/base/parts/contextmenu/electron-sandbox/contextmenu';
1616
import { ProcessItem } from 'vs/base/common/processes';
17-
import { append, $ } from 'vs/base/browser/dom';
17+
import { append, $, createStyleSheet } from 'vs/base/browser/dom';
1818
import { isRemoteDiagnosticError, IRemoteDiagnosticError } from 'vs/platform/diagnostics/common/diagnostics';
1919
import { ElectronIPCMainProcessService } from 'vs/platform/ipc/electron-sandbox/mainProcessService';
2020
import { ByteSize } from 'vs/platform/files/common/files';
2121
import { IListVirtualDelegate } from 'vs/base/browser/ui/list/list';
2222
import { IDataSource, ITreeNode, ITreeRenderer } from 'vs/base/browser/ui/tree/tree';
2323
import { DataTree } from 'vs/base/browser/ui/tree/dataTree';
24+
import { getIconsStyleSheet } from 'vs/platform/theme/browser/iconsStyleSheet';
25+
import { RunOnceScheduler } from 'vs/base/common/async';
2426

2527
const DEBUG_FLAGS_PATTERN = /\s--(inspect|debug)(-brk|port)?=(\d+)?/;
2628
const DEBUG_PORT_PATTERN = /\s--(inspect|debug)-port=(\d+)/;
@@ -310,8 +312,7 @@ class ProcessExplorer {
310312
renderers,
311313
new ProcessTreeDataSource(),
312314
{
313-
identityProvider:
314-
{
315+
identityProvider: {
315316
getId: (element: ProcessTree | ProcessItem | MachineProcessInformation | ProcessInformation | IRemoteDiagnosticError) => {
316317
if (isProcessItem(element)) {
317318
return element.pid.toString();
@@ -331,7 +332,7 @@ class ProcessExplorer {
331332

332333
return 'header';
333334
}
334-
}
335+
},
335336
});
336337

337338
this.tree.setInput({ processes: { processRoots } });
@@ -475,9 +476,24 @@ class ProcessExplorer {
475476
}
476477
}
477478

479+
function createCodiconStyleSheet() {
480+
const codiconStyleSheet = createStyleSheet();
481+
codiconStyleSheet.id = 'codiconStyles';
482+
483+
const iconsStyleSheet = getIconsStyleSheet();
484+
function updateAll() {
485+
codiconStyleSheet.textContent = iconsStyleSheet.getCSS();
486+
}
487+
488+
const delayer = new RunOnceScheduler(updateAll, 0);
489+
iconsStyleSheet.onDidChange(() => delayer.schedule());
490+
delayer.schedule();
491+
}
492+
478493
export function startup(configuration: ProcessExplorerWindowConfiguration): void {
479494
const platformClass = configuration.data.platform === 'win32' ? 'windows' : configuration.data.platform === 'linux' ? 'linux' : 'mac';
480495
document.body.classList.add(platformClass); // used by our fonts
496+
createCodiconStyleSheet();
481497
applyZoom(configuration.data.zoomLevel);
482498

483499
new ProcessExplorer(configuration.windowId, configuration.data);

0 commit comments

Comments
 (0)