Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't install keyboard layout change listener in CI #152853

Merged
merged 1 commit into from Jun 22, 2022
Merged

Don't install keyboard layout change listener in CI #152853

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/vs/platform/keyboardLayout/electron-main/keyboardLayoutMainService.ts
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/

import * as nativeKeymap from 'native-keymap';
import * as platform from 'vs/base/common/platform';
import { Emitter } from 'vs/base/common/event';
import { Disposable } from 'vs/base/common/lifecycle';
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
Expand Down Expand Up @@ -48,10 +49,15 @@ export class KeyboardLayoutMainService extends Disposable implements INativeKeyb
const nativeKeymapMod = await import('native-keymap');

this._keyboardLayoutData = readKeyboardLayoutData(nativeKeymapMod);
nativeKeymapMod.onDidChangeKeyboardLayout(() => {
this._keyboardLayoutData = readKeyboardLayoutData(nativeKeymapMod);
this._onDidChangeKeyboardLayout.fire(this._keyboardLayoutData);
});
if (!platform.isCI) {
// See https://github.com/microsoft/vscode/issues/152840
// Do not register the keyboard layout change listener in CI because it doesn't work
// on the build machines and it just adds noise to the build logs.
nativeKeymapMod.onDidChangeKeyboardLayout(() => {
this._keyboardLayoutData = readKeyboardLayoutData(nativeKeymapMod);
this._onDidChangeKeyboardLayout.fire(this._keyboardLayoutData);
});
}
}

public async getKeyboardLayoutData(): Promise<IKeyboardLayoutData> {
Expand Down