maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

load main.js while waiting for app.isReady, #17108

Browse source
This commit is contained in:
Johannes Rieken 2017-05-04 17:12:47 +02:00
parent a34e5de6ff
commit 174fafae53
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main.js
View file

@ -222,13 +222,12 @@ var nodeCachedDataDir = getNodeCachedDataDir().then(function (value) {
} }
}); });
// Load our code once ready var nlsConfig = getNLSConfiguration();
app.once('ready', function () { process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
global.perfAppReady = Date.now();
var nlsConfig = getNLSConfiguration();
process.env['VSCODE_NLS_CONFIG'] = JSON.stringify(nlsConfig);
nodeCachedDataDir.then(function () { var bootstrap = require('./bootstrap-amd');
require('./bootstrap-amd').bootstrap('vs/code/electron-main/main'); nodeCachedDataDir.then(function () {
}, console.error); bootstrap.bootstrap('vs/code/electron-main/main');
}, function (err) {
console.error(err);
}); });

14
src/vs/code/electron-main/main.ts
View file

@ -199,4 +199,16 @@ function main() {
}).done(null, err => instantiationService.invokeFunction(quit, err)); }).done(null, err => instantiationService.invokeFunction(quit, err));
} }
main(); // Get going once we are ready
// TODO@Joh,Joao there more more potential here
// we should check for other instances etc while
// waiting for getting ready
if (app.isReady()) {
global.perfAppReady = Date.now();
main();
} else {
app.once('ready', () => {
global.perfAppReady = Date.now();
main();
});
}