development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-08-27 13:00:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

debt - async import('windows-foreground-love')

Browse source
This commit is contained in:
Benjamin Pasero 2019-05-27 11:35:42 +02:00
parent 588e193d83
commit a00a9a2945
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -47,23 +47,18 @@ function setupIPC(accessor: ServicesAccessor): Promise<Server> {
const environmentService = accessor.get(IEnvironmentService);
const instantiationService = accessor.get(IInstantiationService);
function allowSetForegroundWindow(service: LaunchChannelClient): Promise<void> {
let promise: Promise<void> = Promise.resolve();
async function windowsAllowSetForegroundWindow(service: LaunchChannelClient): Promise<void> {
if (platform.isWindows) {
promise = service.getMainProcessId()
.then(processId => {
logService.trace('Sending some foreground love to the running instance:', processId);
const processId = await service.getMainProcessId();
try {
const { allowSetForegroundWindow } = require.__$__nodeRequire('windows-foreground-love');
allowSetForegroundWindow(processId);
} catch (e) {
// noop
}
});
logService.trace('Sending some foreground love to the running instance:', processId);
try {
(await import('windows-foreground-love')).allowSetForegroundWindow(processId);
} catch (error) {
logService.error(error);
}
}
return promise;
}
function setup(retry: boolean): Promise<Server> {
@ -158,7 +153,7 @@ function setupIPC(accessor: ServicesAccessor): Promise<Server> {
logService.trace('Sending env to running instance...');
return allowSetForegroundWindow(service)
return windowsAllowSetForegroundWindow(service)
.then(() => service.start(environmentService.args, process.env as platform.IProcessEnvironment))
.then(() => client.dispose())
.then(() => {