@theia/core 1.77.0-next.49 → 1.77.0-next.57

package/src/browser/keyboard/browser-keyboard-frontend-contribution.ts

@@ -53,7 +53,7 @@ export class BrowserKeyboardFrontendContribution implements CommandContribution
         const current = this.layoutProvider.currentLayoutData;
         const autodetect: QuickPickValue<'autodetect'> = {
             label: nls.localizeByDefault('Auto Detect'),
-            description: this.layoutProvider.currentLayoutSource !== 'user-choice' ? nls.localize('theia/core/keyboard/current', '(current: {0})', current.name) : undefined,
+            description: this.layoutProvider.layoutSource !== 'user-choice' ? nls.localize('theia/core/keyboard/current', '(current: {0})', current.name) : undefined,
             detail: nls.localize('theia/core/keyboard/tryDetect', 'Try to detect the keyboard layout from browser information and pressed keys.'),
             value: 'autodetect'
         };

package/src/browser/keyboard/browser-keyboard-layout-provider.spec.ts

@@ -27,7 +27,7 @@ import { ILogger, Loggable } from '../../common/logger';
 import { LocalStorageService } from '../storage-service';
 import { MessageService } from '../../common/message-service';
 import { WindowService } from '../window/window-service';
-import { BrowserKeyboardLayoutProvider } from './browser-keyboard-layout-provider';
+import { BrowserKeyboardLayoutProvider, KeyboardLayoutData, KeyboardLayoutSource, KeyboardTester } from './browser-keyboard-layout-provider';
 import { Key } from './keys';
 
 disableJSDOM();
@@ -134,6 +134,57 @@ describe('browser keyboard layout provider', function (): void {
         chai.expect((currentLayout.info as IMacKeyboardLayoutInfo).id).to.equal('com.apple.keylayout.French');
     });
 
+    it('scores AltGraph evidence independently from command Alt', () => {
+        const { service } = setup('linux');
+        const german = service.allLayoutData.find(data => data.name === 'German' && data.hardware === 'pc')!;
+        const tester = new KeyboardTester([german]);
+
+        tester.updateScores({ code: Key.DIGIT8.code, character: '[', altGraph: true });
+        chai.expect(tester.topScore).to.equal(1);
+
+        tester.reset();
+        tester.updateScores({ code: Key.DIGIT8.code, character: '[', altKey: true });
+        chai.expect(tester.topScore).to.equal(0);
+    });
+
+    it('can correct a wrong layout score from raw AltGraph evidence', () => {
+        const { service } = setup('linux');
+        const us = service.allLayoutData.find(data => data.name === 'US' && data.hardware === 'pc')!;
+        const german = service.allLayoutData.find(data => data.name === 'German' && data.hardware === 'pc')!;
+        const tester = new KeyboardTester([us, german]);
+
+        tester.updateScores({ code: Key.KEY_Y.code, character: 'y' });
+        chai.expect(tester.scores[0]).to.be.greaterThan(tester.scores[1]);
+        tester.updateScores({ code: Key.DIGIT8.code, character: '[', altGraph: true });
+        chai.expect(tester.scores[1]).to.equal(tester.scores[0]);
+        tester.updateScores({ code: Key.DIGIT7.code, character: '{', altGraph: true });
+        chai.expect(tester.scores[1]).to.be.greaterThan(tester.scores[0]);
+    });
+
+    it('changes the provider layout from raw AltGraph evidence', async () => {
+        const { service } = setup('linux');
+        await service.getNativeLayout();
+        const us = service.allLayoutData.find(data => data.name === 'US' && data.hardware === 'pc')!;
+        const german = service.allLayoutData.find(data => data.name === 'German' && data.hardware === 'pc')!;
+        const internal = service as unknown as {
+            tester: KeyboardTester;
+            currentLayout: KeyboardLayoutData;
+            source: KeyboardLayoutSource;
+        };
+        internal.tester = new KeyboardTester([us, german]);
+        internal.tester.updateScores({ code: Key.KEY_Y.code, character: 'y' });
+        internal.currentLayout = us;
+        internal.source = 'pressed-keys';
+        let changedLayout: KeyboardLayoutData['raw'] | undefined;
+        service.onDidChangeNativeLayout(layout => changedLayout = layout);
+
+        service.validateKey({ code: Key.DIGIT8.code, character: '[', altGraph: true });
+        service.validateKey({ code: Key.DIGIT7.code, character: '{', altGraph: true });
+
+        chai.expect(changedLayout?.info).to.deep.equal(german.raw.info);
+        chai.expect(service.currentLayoutData).to.equal(german);
+    });
+
     it('restores user selection from last session', async () => {
         const { service, container } = setup('mac');
 

package/src/browser/keyboard/browser-keyboard-layout-provider.ts

@@ -20,11 +20,11 @@ import { Emitter, Event } from '../../common/event';
 import { ILogger } from '../../common/logger';
 import { Deferred } from '../../common/promise-util';
 import {
-    NativeKeyboardLayout, KeyboardLayoutProvider, KeyboardLayoutChangeNotifier, KeyValidator, KeyValidationInput
+    NativeKeyboardLayout, KeyboardLayoutProvider, KeyboardLayoutChangeNotifier, KeyValidator, KeyValidationInput, KeyboardLayoutSource
 } from '../../common/keyboard/keyboard-layout-provider';
 import { LocalStorageService } from '../storage-service';
 
-export type KeyboardLayoutSource = 'navigator.keyboard' | 'user-choice' | 'pressed-keys';
+export type { KeyboardLayoutSource } from '../../common/keyboard/keyboard-layout-provider';
 
 @injectable()
 export class BrowserKeyboardLayoutProvider implements KeyboardLayoutProvider, KeyboardLayoutChangeNotifier, KeyValidator {
@@ -54,7 +54,7 @@ export class BrowserKeyboardLayoutProvider implements KeyboardLayoutProvider, Ke
         return this.currentLayout;
     }
 
-    get currentLayoutSource(): KeyboardLayoutSource {
+    get layoutSource(): KeyboardLayoutSource {
         return this.source;
     }
 
@@ -289,11 +289,11 @@ export class KeyboardTester {
 
     updateScores(input: KeyValidationInput): boolean {
         let property: 'value' | 'withShift' | 'withAltGr' | 'withShiftAltGr';
-        if (input.shiftKey && input.altKey) {
+        if (input.shiftKey && input.altGraph) {
             property = 'withShiftAltGr';
         } else if (input.shiftKey) {
             property = 'withShift';
-        } else if (input.altKey) {
+        } else if (input.altGraph) {
             property = 'withAltGr';
         } else {
             property = 'value';