ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge VS Code 1.31.1 (#4283)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-15 13:09:45 -07:00
committed by GitHub
parent 7d31575149
commit 86bac90001
1716 changed files with 53308 additions and 48375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/vs/code/electron-browser/processExplorer/media/processExplorer.css
View File

@@ -3,7 +3,27 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
html,
html {
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "Ubuntu", "Droid Sans", sans-serif;
font-size: 13px;
}
html:lang(zh-Hans) {
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "Noto Sans", "Microsoft YaHei", "PingFang SC", "Hiragino Sans GB", "Source Han Sans SC", "Source Han Sans CN", "Source Han Sans", sans-serif;
}
html:lang(zh-Hant) {
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "Noto Sans", "Microsoft Jhenghei", "PingFang TC", "Source Han Sans TC", "Source Han Sans", "Source Han Sans TW", sans-serif;
}
html:lang(ja) {
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "Noto Sans", "Meiryo", "Hiragino Kaku Gothic Pro", "Source Han Sans J", "Source Han Sans JP", "Source Han Sans", "Sazanami Gothic", "IPA Gothic", sans-serif;
}
html:lang(ko) {
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "Noto Sans", "Malgun Gothic", "Nanum Gothic", "Dotom", "Apple SD Gothic Neo", "AppleGothic", "Source Han Sans K", "Source Han Sans JR", "Source Han Sans", "UnDotum", "FBaekmuk Gulim", sans-serif;
}
body {
margin: 0;
padding: 0;
@@ -12,8 +32,6 @@ body {
-webkit-touch-callout: none;
-webkit-user-select: none;
user-select: none;
font-family: -apple-system, BlinkMacSystemFont, "Segoe WPC", "Segoe UI", "HelveticaNeue-Light", "Ubuntu", "Droid Sans", sans-serif;
font-size: 13px;
color: #cccccc;
}
@@ -38,7 +56,7 @@ table {
width: 100%;
table-layout: fixed;
}
th {
th[scope='col'] {
vertical-align: bottom;
border-bottom: 1px solid #cccccc;
padding: .5rem;
@@ -62,6 +80,9 @@ td {
.data {
white-space: pre;
padding-left: .5rem;
font-weight: normal;
text-align: left;
height: 22px;
}
tbody > tr:hover {

2
src/vs/code/electron-browser/processExplorer/processExplorer.html
View File

@@ -8,7 +8,7 @@
</head>
<body aria-label="">
<table id="process-list" aria-live="polite"></table>
<table id="process-list"></table>
</body>
<!-- Startup via processExplorer.js -->

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

@@ -96,7 +96,7 @@ function attachTo(item: ProcessItem) {
config.port = parseInt(matches[2]);
}
ipcRenderer.send('vscode:workbenchCommand', { id: 'workbench.action.debug.start', from: 'processExplorer', args: [config] });
ipcRenderer.send('vscode:workbenchCommand', { id: 'debug.startFromConfig', from: 'processExplorer', args: [config] });
}
function getProcessIdWithHighestProperty(processList, propertyName: string) {
@@ -113,42 +113,56 @@ function getProcessIdWithHighestProperty(processList, propertyName: string) {
}
function updateProcessInfo(processList): void {
const target = document.getElementById('process-list');
if (!target) {
const container = document.getElementById('process-list');
if (!container) {
return;
}
container.innerHTML = '';
const highestCPUProcess = getProcessIdWithHighestProperty(processList, 'cpu');
const highestMemoryProcess = getProcessIdWithHighestProperty(processList, 'memory');
let tableHtml = `
<thead>
<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>
</thead>`;
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>`;
tableHtml += `<tbody>`;
const tableBody = document.createElement('tbody');
processList.forEach(p => {
const cpuClass = p.pid === highestCPUProcess ? 'highest' : '';
const memoryClass = p.pid === highestMemoryProcess ? 'highest' : '';
const row = document.createElement('tr');
row.id = p.pid;
tableHtml += `
<tr id=${p.pid}>
<td class="centered ${cpuClass}">${p.cpu}</td>
<td class="centered ${memoryClass}">${p.memory}</td>
<td class="centered">${p.pid}</td>
<td title="${p.name}" class="data">${p.formattedName}</td>
</tr>`;
const cpu = document.createElement('td');
p.pid === highestCPUProcess
? cpu.classList.add('centered', 'highest')
: cpu.classList.add('centered');
cpu.textContent = p.cpu;
const memory = document.createElement('td');
p.pid === highestMemoryProcess
? memory.classList.add('centered', 'highest')
: memory.classList.add('centered');
memory.textContent = p.memory;
const pid = document.createElement('td');
pid.classList.add('centered');
pid.textContent = p.pid;
const name = document.createElement('th');
name.scope = 'row';
name.classList.add('data');
name.title = p.cmd;
name.textContent = p.formattedName;
row.append(cpu, memory, pid, name);
tableBody.appendChild(row);
});
tableHtml += `</tbody>`;
target.innerHTML = tableHtml;
container.append(tableHead, tableBody);
}
function applyStyles(styles: ProcessExplorerStyles): void {
@@ -171,7 +185,9 @@ function applyStyles(styles: ProcessExplorerStyles): void {
if (document.head) {
document.head.appendChild(styleTag);
}
document.body.style.color = styles.color;
if (styles.color) {
document.body.style.color = styles.color;
}
}
function applyZoom(zoomLevel: number): void {
@@ -297,4 +313,4 @@ export function startup(data: ProcessExplorerData): void {
applyZoom(webFrame.getZoomLevel() - 1);
}
};
}
}