diff --git a/src/vs/code/electron-main/diagnostics.ts b/src/vs/code/electron-main/diagnostics.ts index b6f934d0595..23047157b4a 100644 --- a/src/vs/code/electron-main/diagnostics.ts +++ b/src/vs/code/electron-main/diagnostics.ts @@ -240,7 +240,7 @@ function getProcessItem(mapPidToWindowTitle: Map, processes: Pro if (isRoot) { name = `${product.applicationName} main`; } else { - name = `${repeat(' ', indent)} ${item.name}`; + name = `${repeat('--', indent)} ${item.name}`; if (item.name === 'window') { name = `${name} (${mapPidToWindowTitle.get(item.pid)})`; diff --git a/src/vs/issue/electron-browser/index.html b/src/vs/issue/electron-browser/index.html index 93422aa7a5e..6623335fe42 100644 --- a/src/vs/issue/electron-browser/index.html +++ b/src/vs/issue/electron-browser/index.html @@ -3,7 +3,7 @@ - +
@@ -19,24 +19,26 @@
System Info - 
-							
-
+
+ +
Processes - 
-							
-
+
+ +
Workspace Stats 
-							
+							
+								
+
diff --git a/src/vs/issue/electron-browser/index.js b/src/vs/issue/electron-browser/index.js index 62267b38e35..6a2613e50c3 100644 --- a/src/vs/issue/electron-browser/index.js +++ b/src/vs/issue/electron-browser/index.js @@ -9,15 +9,13 @@ const state = { }; -const render = (state) => { +// const render = (state) => { -}; +// }; -const rendererBlocks = (state) => { +// const rendererBlocks = (state) => { -}; - -let diagnosticInfo = { }; +// }; electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { const { systemInfo, processInfo, workspaceInfo } = arg; @@ -26,12 +24,6 @@ electron.ipcRenderer.on('issueInfoResponse', (event, arg) => { state.workspaceInfo = workspaceInfo; updateAllBlocks(state); - - diagnosticInfo = { - systemInfo, - processInfo, - workspaceInfo - }; }); electron.ipcRenderer.send('issueInfoRequest'); @@ -53,17 +45,17 @@ window.submit = () => { const issueBody = `### System Info \`\`\` -${diagnosticInfo.systemInfo} +${state.systemInfo} \`\`\` ### Process Info \`\`\` -${diagnosticInfo.processInfo} +${state.processInfo} \`\`\` ### Workspace Info \`\`\` -${diagnosticInfo.workspaceInfo}; +${state.workspaceInfo}; \`\`\` ### Repro Steps @@ -81,10 +73,38 @@ function updateAllBlocks(state) { } const updateSystemInfo = (state) => { - document.querySelector('.block-system .block-info code').textContent = '\n' + state.systemInfo; + const target = document.querySelector('.block-system .block-info'); + let tableHtml = ''; + Object.keys(state.systemInfo).forEach(k => { + tableHtml += ` + + ${k} + ${state.systemInfo[k]} +`; + }); + target.innerHTML = `${tableHtml}
`; }; const updateProcessInfo = (state) => { - document.querySelector('.block-process .block-info code').textContent = '\n' + state.processInfo; + const target = document.querySelector('.block-process .block-info'); + + let tableHtml = ` + + pid + CPU % + Memory (MB) + Name + +`; + state.processInfo.forEach(p => { + tableHtml += ` + + ${p.pid} + ${p.cpu} + ${p.memory} + ${p.name} +`; + }); + target.innerHTML = `${tableHtml}
`; }; const updateWorkspaceInfo = (state) => { document.querySelector('.block-workspace .block-info code').textContent = '\n' + state.workspaceInfo; diff --git a/src/vs/issue/media/style.css b/src/vs/issue/electron-browser/style.css similarity index 92% rename from src/vs/issue/media/style.css rename to src/vs/issue/electron-browser/style.css index 917814fdf32..04393a33fb4 100644 --- a/src/vs/issue/media/style.css +++ b/src/vs/issue/electron-browser/style.css @@ -5,15 +5,10 @@ * { box-sizing: border-box; - font-family: 'Helvetica Neue', 'Helvetica', sans-serif; } html { padding: 40px 40px 80px 40px; -} - -pre code { - font-family: 'Menlo', 'Courier New', 'Courier', monospace; - font-size: 14px; + font-family: 'Helvetica Neue', 'Helvetica', sans-serif; } #block-container { @@ -27,16 +22,25 @@ pre code { font-size: 1.25rem; } +.block .block-info { + width: 100%; + font-family: 'Menlo', 'Courier New', 'Courier', monospace; + font-size: 14px; + overflow: auto; + overflow-wrap: break-word; +} +pre { + margin: 0; +} +pre code { + font-family: 'Menlo', 'Courier New', 'Courier', monospace; +} + #issue-reporter { max-width: 80vw; margin-left: auto; margin-right: auto; } -.block-info { - width: 100%; - overflow: auto; - overflow-wrap: break-word; -} #github-submit-btn { margin-top: 4rem; }