Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check
This commit is contained in:
Anthony Dresser
2019-07-15 22:35:46 -07:00
committed by GitHub
parent f720ec642f
commit 0b7e7ddbf9
2406 changed files with 59140 additions and 35464 deletions

View File

@@ -100,20 +100,29 @@ function parseReporterOption(value) {
app.on('ready', () => {
ipcMain.on('error', (_, err) => {
if (!argv.debug) {
console.error(err);
app.exit(1);
}
});
const win = new BrowserWindow({
height: 600,
width: 800,
show: false,
webPreferences: {
backgroundThrottling: false,
webSecurity: false
nodeIntegration: true,
webSecurity: false,
webviewTag: true
}
});
win.webContents.on('did-finish-load', () => {
if (argv.debug) {
win.show();
win.webContents.openDevTools({ mode: 'right' });
win.webContents.openDevTools();
}
win.webContents.send('run', argv);
});

View File

@@ -308,5 +308,12 @@ function runTests(opts) {
ipcRenderer.on('run', (e, opts) => {
initLoader(opts);
runTests(opts).catch(err => console.error(typeof err === 'string' ? err : JSON.stringify(err)));
runTests(opts).catch(err => {
if (typeof err !== 'string') {
err = JSON.stringify(err);
}
console.error(err);
ipcRenderer.send('error', err);
});
});