@codingame/monaco-vscode-keybindings-service-override 11.1.2 → 12.0.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/index.d.ts +19 -2
- package/index.js +110 -1
- package/package.json +21 -8
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.d.ts +10 -0
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js +18 -12
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardMapper.d.ts +15 -0
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardMapper.js +2 -0
- package/vscode/src/vs/workbench/browser/contextkeys.d.ts +67 -0
- package/vscode/src/vs/workbench/browser/contextkeys.js +17 -16
- package/vscode/src/vs/workbench/contrib/commands/common/commands.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js +6 -5
- package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.d.ts +1 -0
- package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js +2 -1
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.d.ts +14 -0
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.js +27 -26
- package/vscode/src/vs/workbench/contrib/preferences/common/smartSnippetInserter.d.ts +12 -0
- package/vscode/src/vs/workbench/contrib/preferences/common/smartSnippetInserter.js +14 -13
- package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.d.ts +44 -0
- package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js +183 -159
- package/vscode/src/vs/workbench/services/commands/common/commandService.d.ts +23 -0
- package/vscode/src/vs/workbench/services/commands/common/commandService.js +3 -1
- package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.d.ts +58 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js +130 -129
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.d.ts +69 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js +37 -45
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.d.ts +8 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.js +2 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dvorak.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dvorak.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.linux.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.d.ts +1 -0
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.js +1 -0
- package/vscode/src/vs/workbench/services/keybinding/common/keybindingIO.d.ts +21 -0
- package/vscode/src/vs/workbench/services/keybinding/common/keybindingIO.js +2 -1
- package/vscode/src/vs/workbench/services/keybinding/common/keymapInfo.d.ts +35 -0
- package/vscode/src/vs/workbench/services/keybinding/common/keymapInfo.js +2 -1
- package/vscode/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.d.ts +43 -0
- package/vscode/src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.js +176 -178
- package/vscode/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.d.ts +49 -0
- package/vscode/src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.js +71 -68
- package/keybindings.js +0 -108
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
import { Event } from "vscode/vscode/vs/base/common/event";
|
|
2
|
+
import { Disposable } from "vscode/vscode/vs/base/common/lifecycle";
|
|
3
|
+
import { KeymapInfo } from "../common/keymapInfo.js";
|
|
4
|
+
import { IKeyboardMapper } from "../../../../platform/keyboardLayout/common/keyboardMapper.js";
|
|
5
|
+
import { IKeyboardEvent } from "vscode/vscode/vs/platform/keybinding/common/keybinding";
|
|
6
|
+
import { IFileService } from "vscode/vscode/vs/platform/files/common/files.service";
|
|
7
|
+
import { IEnvironmentService } from "vscode/vscode/vs/platform/environment/common/environment.service";
|
|
8
|
+
import { IConfigurationService } from "vscode/vscode/vs/platform/configuration/common/configuration.service";
|
|
9
|
+
import { INotificationService } from "vscode/vscode/vs/platform/notification/common/notification.service";
|
|
10
|
+
import { ICommandService } from "vscode/vscode/vs/platform/commands/common/commands.service";
|
|
11
|
+
import { IStorageService } from "vscode/vscode/vs/platform/storage/common/storage.service";
|
|
12
|
+
import { IKeyboardLayoutInfo, IKeyboardMapping } from "@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout";
|
|
13
|
+
import { IKeyboardLayoutService } from "vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout.service";
|
|
14
|
+
export declare class BrowserKeyboardMapperFactoryBase extends Disposable {
|
|
15
|
+
private readonly _configurationService;
|
|
16
|
+
protected _initialized: boolean;
|
|
17
|
+
protected _keyboardMapper: IKeyboardMapper | null;
|
|
18
|
+
private readonly _onDidChangeKeyboardMapper;
|
|
19
|
+
readonly onDidChangeKeyboardMapper: Event<void>;
|
|
20
|
+
protected _keymapInfos: KeymapInfo[];
|
|
21
|
+
protected _mru: KeymapInfo[];
|
|
22
|
+
private _activeKeymapInfo;
|
|
23
|
+
private keyboardLayoutMapAllowed;
|
|
24
|
+
get activeKeymap(): KeymapInfo | null;
|
|
25
|
+
get keymapInfos(): KeymapInfo[];
|
|
26
|
+
get activeKeyboardLayout(): IKeyboardLayoutInfo | null;
|
|
27
|
+
get activeKeyMapping(): IKeyboardMapping | null;
|
|
28
|
+
get keyboardLayouts(): IKeyboardLayoutInfo[];
|
|
29
|
+
protected constructor(_configurationService: IConfigurationService);
|
|
30
|
+
registerKeyboardLayout(layout: KeymapInfo): void;
|
|
31
|
+
removeKeyboardLayout(layout: KeymapInfo): void;
|
|
32
|
+
getMatchedKeymapInfo(keyMapping: IKeyboardMapping | null): {
|
|
33
|
+
result: KeymapInfo;
|
|
34
|
+
score: number;
|
|
35
|
+
} | null;
|
|
36
|
+
getUSStandardLayout(): KeymapInfo | null;
|
|
37
|
+
isKeyMappingActive(keymap: IKeyboardMapping | null): boolean | null;
|
|
38
|
+
setUSKeyboardLayout(): void;
|
|
39
|
+
setActiveKeyMapping(keymap: IKeyboardMapping | null): void;
|
|
40
|
+
setActiveKeymapInfo(keymapInfo: KeymapInfo): void;
|
|
41
|
+
setLayoutFromBrowserAPI(): void;
|
|
42
|
+
private _updateKeyboardLayoutAsync;
|
|
43
|
+
getKeyboardMapper(): IKeyboardMapper;
|
|
44
|
+
validateCurrentKeyboardMapping(keyboardEvent: IKeyboardEvent): void;
|
|
45
|
+
setKeyboardLayout(layoutName: string): void;
|
|
46
|
+
private _setKeyboardData;
|
|
47
|
+
private static _createKeyboardMapper;
|
|
48
|
+
private _validateCurrentKeyboardMapping;
|
|
49
|
+
private _getBrowserKeyMapping;
|
|
50
|
+
}
|
|
51
|
+
export declare class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBase {
|
|
52
|
+
constructor(configurationService: IConfigurationService, notificationService: INotificationService, storageService: IStorageService, commandService: ICommandService);
|
|
53
|
+
}
|
|
54
|
+
export declare class BrowserKeyboardLayoutService extends Disposable implements IKeyboardLayoutService {
|
|
55
|
+
private configurationService;
|
|
56
|
+
_serviceBrand: undefined;
|
|
57
|
+
private readonly _onDidChangeKeyboardLayout;
|
|
58
|
+
readonly onDidChangeKeyboardLayout: Event<void>;
|
|
59
|
+
private _userKeyboardLayout;
|
|
60
|
+
private readonly _factory;
|
|
61
|
+
private _keyboardLayoutMode;
|
|
62
|
+
constructor(environmentService: IEnvironmentService, fileService: IFileService, notificationService: INotificationService, storageService: IStorageService, commandService: ICommandService, configurationService: IConfigurationService);
|
|
63
|
+
setUserKeyboardLayoutIfMatched(): void;
|
|
64
|
+
getKeyboardMapper(): IKeyboardMapper;
|
|
65
|
+
getCurrentKeyboardLayout(): IKeyboardLayoutInfo | null;
|
|
66
|
+
getAllKeyboardLayouts(): IKeyboardLayoutInfo[];
|
|
67
|
+
getRawKeyboardMapping(): IKeyboardMapping | null;
|
|
68
|
+
validateCurrentKeyboardMapping(keyboardEvent: IKeyboardEvent): void;
|
|
69
|
+
}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
|
|
2
|
+
import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
|
|
2
3
|
import { localize } from 'vscode/vscode/vs/nls';
|
|
3
4
|
import { Emitter, Event } from 'vscode/vscode/vs/base/common/event';
|
|
4
5
|
import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
|
|
5
6
|
import { KeymapInfo } from '../common/keymapInfo.js';
|
|
6
|
-
import
|
|
7
|
+
import 'vscode/vscode/vs/platform/instantiation/common/extensions';
|
|
8
|
+
import { readKeyboardConfig, DispatchConfig } from '../../../../platform/keyboardLayout/common/keyboardConfig.js';
|
|
7
9
|
import { CachedKeyboardMapper } from '../../../../platform/keyboardLayout/common/keyboardMapper.js';
|
|
8
|
-
import { OS, isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
|
|
10
|
+
import { OS, OperatingSystem, isWindows, isMacintosh } from 'vscode/vscode/vs/base/common/platform';
|
|
9
11
|
import { WindowsKeyboardMapper } from '../common/windowsKeyboardMapper.js';
|
|
10
12
|
import { FallbackKeyboardMapper } from 'vscode/vscode/vs/workbench/services/keybinding/common/fallbackKeyboardMapper';
|
|
11
13
|
import { MacLinuxKeyboardMapper } from '../common/macLinuxKeyboardMapper.js';
|
|
@@ -20,7 +22,7 @@ import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/c
|
|
|
20
22
|
import { INotificationService } from 'vscode/vscode/vs/platform/notification/common/notification.service';
|
|
21
23
|
import { ICommandService } from 'vscode/vscode/vs/platform/commands/common/commands.service';
|
|
22
24
|
import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
|
|
23
|
-
import { getKeyboardLayoutId } from 'vscode/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
|
|
25
|
+
import { getKeyboardLayoutId } from '@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common/vscode/vs/platform/keyboardLayout/common/keyboardLayout';
|
|
24
26
|
import 'vscode/vscode/vs/platform/instantiation/common/instantiation';
|
|
25
27
|
|
|
26
28
|
function __variableDynamicImportRuntime0__(path) {
|
|
@@ -55,14 +57,12 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
|
|
|
55
57
|
return this._activeKeymapInfo?.mapping ?? null;
|
|
56
58
|
}
|
|
57
59
|
get keyboardLayouts() {
|
|
58
|
-
return (
|
|
59
|
-
(this._keymapInfos.map(keymapInfo => keymapInfo.layout))
|
|
60
|
-
);
|
|
60
|
+
return ( this._keymapInfos.map(keymapInfo => keymapInfo.layout));
|
|
61
61
|
}
|
|
62
62
|
constructor(_configurationService) {
|
|
63
63
|
super();
|
|
64
64
|
this._configurationService = _configurationService;
|
|
65
|
-
this._onDidChangeKeyboardMapper = (
|
|
65
|
+
this._onDidChangeKeyboardMapper = ( new Emitter());
|
|
66
66
|
this.onDidChangeKeyboardMapper = this._onDidChangeKeyboardMapper.event;
|
|
67
67
|
this.keyboardLayoutMapAllowed = navigator.keyboard !== undefined;
|
|
68
68
|
this._keyboardMapper = null;
|
|
@@ -205,15 +205,13 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
|
|
|
205
205
|
}
|
|
206
206
|
getKeyboardMapper() {
|
|
207
207
|
const config = readKeyboardConfig(this._configurationService);
|
|
208
|
-
if (config.dispatch ===
|
|
209
|
-
return (
|
|
210
|
-
(new FallbackKeyboardMapper(config.mapAltGrToCtrlAlt, OS))
|
|
211
|
-
);
|
|
208
|
+
if (config.dispatch === DispatchConfig.KeyCode || !this._initialized || !this._activeKeymapInfo) {
|
|
209
|
+
return ( new FallbackKeyboardMapper(config.mapAltGrToCtrlAlt, OS));
|
|
212
210
|
}
|
|
213
211
|
if (!this._keyboardMapper) {
|
|
214
|
-
this._keyboardMapper = (
|
|
212
|
+
this._keyboardMapper = ( new CachedKeyboardMapper(
|
|
215
213
|
BrowserKeyboardMapperFactory._createKeyboardMapper(this._activeKeymapInfo, config.mapAltGrToCtrlAlt)
|
|
216
|
-
))
|
|
214
|
+
));
|
|
217
215
|
}
|
|
218
216
|
return this._keyboardMapper;
|
|
219
217
|
}
|
|
@@ -241,19 +239,13 @@ class BrowserKeyboardMapperFactoryBase extends Disposable {
|
|
|
241
239
|
static _createKeyboardMapper(keymapInfo, mapAltGrToCtrlAlt) {
|
|
242
240
|
const rawMapping = keymapInfo.mapping;
|
|
243
241
|
const isUSStandard = !!keymapInfo.layout.isUSStandard;
|
|
244
|
-
if (OS ===
|
|
245
|
-
return (
|
|
246
|
-
(new WindowsKeyboardMapper(isUSStandard, rawMapping, mapAltGrToCtrlAlt))
|
|
247
|
-
);
|
|
242
|
+
if (OS === OperatingSystem.Windows) {
|
|
243
|
+
return ( new WindowsKeyboardMapper(isUSStandard, rawMapping, mapAltGrToCtrlAlt));
|
|
248
244
|
}
|
|
249
|
-
if ((
|
|
250
|
-
return (
|
|
251
|
-
(new FallbackKeyboardMapper(mapAltGrToCtrlAlt, OS))
|
|
252
|
-
);
|
|
245
|
+
if (( Object.keys(rawMapping)).length === 0) {
|
|
246
|
+
return ( new FallbackKeyboardMapper(mapAltGrToCtrlAlt, OS));
|
|
253
247
|
}
|
|
254
|
-
return (
|
|
255
|
-
(new MacLinuxKeyboardMapper(isUSStandard, rawMapping, mapAltGrToCtrlAlt, OS))
|
|
256
|
-
);
|
|
248
|
+
return ( new MacLinuxKeyboardMapper(isUSStandard, rawMapping, mapAltGrToCtrlAlt, OS));
|
|
257
249
|
}
|
|
258
250
|
_validateCurrentKeyboardMapping(keyboardEvent) {
|
|
259
251
|
if (!this._initialized) {
|
|
@@ -343,12 +335,12 @@ class BrowserKeyboardMapperFactory extends BrowserKeyboardMapperFactoryBase {
|
|
|
343
335
|
const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux';
|
|
344
336
|
__variableDynamicImportRuntime0__(`./keyboardLayouts/layout.contribution.${platform}.js`).then((m) => {
|
|
345
337
|
const keymapInfos = m.KeyboardLayoutContribution.INSTANCE.layoutInfos;
|
|
346
|
-
this._keymapInfos.push(...(
|
|
338
|
+
this._keymapInfos.push(...( keymapInfos.map(info => (( new KeymapInfo(
|
|
347
339
|
info.layout,
|
|
348
340
|
info.secondaryLayouts,
|
|
349
341
|
info.mapping,
|
|
350
342
|
info.isUserKeyboardLayout
|
|
351
|
-
))))))
|
|
343
|
+
))))));
|
|
352
344
|
this._mru = this._keymapInfos;
|
|
353
345
|
this._initialized = true;
|
|
354
346
|
this.setLayoutFromBrowserAPI();
|
|
@@ -361,14 +353,14 @@ class UserKeyboardLayout extends Disposable {
|
|
|
361
353
|
super();
|
|
362
354
|
this.keyboardLayoutResource = keyboardLayoutResource;
|
|
363
355
|
this.fileService = fileService;
|
|
364
|
-
this._onDidChange = this._register((
|
|
356
|
+
this._onDidChange = this._register(( new Emitter()));
|
|
365
357
|
this.onDidChange = this._onDidChange.event;
|
|
366
358
|
this._keyboardLayout = null;
|
|
367
|
-
this.reloadConfigurationScheduler = this._register((
|
|
359
|
+
this.reloadConfigurationScheduler = this._register(( new RunOnceScheduler(() => this.reload().then(changed => {
|
|
368
360
|
if (changed) {
|
|
369
361
|
this._onDidChange.fire();
|
|
370
362
|
}
|
|
371
|
-
}), 50)))
|
|
363
|
+
}), 50)));
|
|
372
364
|
this._register(Event.filter(this.fileService.onDidFilesChange, e => e.contains(this.keyboardLayoutResource))(() => this.reloadConfigurationScheduler.schedule()));
|
|
373
365
|
}
|
|
374
366
|
async initialize() {
|
|
@@ -378,7 +370,7 @@ class UserKeyboardLayout extends Disposable {
|
|
|
378
370
|
const existing = this._keyboardLayout;
|
|
379
371
|
try {
|
|
380
372
|
const content = await this.fileService.readFile(this.keyboardLayoutResource);
|
|
381
|
-
const value = parse((
|
|
373
|
+
const value = parse(( content.value.toString()));
|
|
382
374
|
if (getNodeType(value) === 'object') {
|
|
383
375
|
const layoutInfo = value.layout;
|
|
384
376
|
const mappings = value.rawMapping;
|
|
@@ -398,12 +390,12 @@ let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Di
|
|
|
398
390
|
constructor(environmentService, fileService, notificationService, storageService, commandService, configurationService) {
|
|
399
391
|
super();
|
|
400
392
|
this.configurationService = configurationService;
|
|
401
|
-
this._onDidChangeKeyboardLayout = (
|
|
393
|
+
this._onDidChangeKeyboardLayout = ( new Emitter());
|
|
402
394
|
this.onDidChangeKeyboardLayout = this._onDidChangeKeyboardLayout.event;
|
|
403
395
|
const keyboardConfig = configurationService.getValue('keyboard');
|
|
404
396
|
const layout = keyboardConfig.layout;
|
|
405
397
|
this._keyboardLayoutMode = layout ?? 'autodetect';
|
|
406
|
-
this._factory = (
|
|
398
|
+
this._factory = ( new BrowserKeyboardMapperFactory(configurationService, notificationService, storageService, commandService));
|
|
407
399
|
this._register(this._factory.onDidChangeKeyboardMapper(() => {
|
|
408
400
|
this._onDidChangeKeyboardLayout.fire();
|
|
409
401
|
}));
|
|
@@ -423,7 +415,7 @@ let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Di
|
|
|
423
415
|
}
|
|
424
416
|
}
|
|
425
417
|
}));
|
|
426
|
-
this._userKeyboardLayout = (
|
|
418
|
+
this._userKeyboardLayout = ( new UserKeyboardLayout(environmentService.keyboardLayoutResource, fileService));
|
|
427
419
|
this._userKeyboardLayout.initialize().then(() => {
|
|
428
420
|
if (this._userKeyboardLayout.keyboardLayout) {
|
|
429
421
|
this._factory.registerKeyboardLayout(this._userKeyboardLayout.keyboardLayout);
|
|
@@ -478,25 +470,25 @@ let BrowserKeyboardLayoutService = class BrowserKeyboardLayoutService extends Di
|
|
|
478
470
|
this._factory.validateCurrentKeyboardMapping(keyboardEvent);
|
|
479
471
|
}
|
|
480
472
|
};
|
|
481
|
-
BrowserKeyboardLayoutService = (
|
|
482
|
-
(
|
|
483
|
-
(
|
|
484
|
-
(
|
|
485
|
-
(
|
|
486
|
-
(
|
|
487
|
-
(
|
|
488
|
-
], BrowserKeyboardLayoutService))
|
|
489
|
-
const configurationRegistry = (
|
|
473
|
+
BrowserKeyboardLayoutService = ( __decorate([
|
|
474
|
+
( __param(0, IEnvironmentService)),
|
|
475
|
+
( __param(1, IFileService)),
|
|
476
|
+
( __param(2, INotificationService)),
|
|
477
|
+
( __param(3, IStorageService)),
|
|
478
|
+
( __param(4, ICommandService)),
|
|
479
|
+
( __param(5, IConfigurationService))
|
|
480
|
+
], BrowserKeyboardLayoutService));
|
|
481
|
+
const configurationRegistry = ( Registry.as(Extensions.Configuration));
|
|
490
482
|
const keyboardConfiguration = {
|
|
491
483
|
'id': 'keyboard',
|
|
492
484
|
'order': 15,
|
|
493
485
|
'type': 'object',
|
|
494
|
-
'title': ( localize(
|
|
486
|
+
'title': ( localize(11609, "Keyboard")),
|
|
495
487
|
'properties': {
|
|
496
488
|
'keyboard.layout': {
|
|
497
489
|
'type': 'string',
|
|
498
490
|
'default': 'autodetect',
|
|
499
|
-
'description': ( localize(
|
|
491
|
+
'description': ( localize(11610, "Control the keyboard layout used in web."))
|
|
500
492
|
}
|
|
501
493
|
}
|
|
502
494
|
};
|
package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.d.ts
ADDED
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { IKeymapInfo } from "../../common/keymapInfo.js";
|
|
2
|
+
export declare class KeyboardLayoutContribution {
|
|
3
|
+
static readonly INSTANCE: KeyboardLayoutContribution;
|
|
4
|
+
private _layoutInfos;
|
|
5
|
+
get layoutInfos(): IKeymapInfo[];
|
|
6
|
+
private constructor();
|
|
7
|
+
registerKeyboardLayout(layout: IKeymapInfo): void;
|
|
8
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dvorak.darwin.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.d.ts
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { KeyboardLayoutContribution } from "./_.contribution.js";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { KeyboardLayoutContribution } from "./_.contribution.js";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { KeyboardLayoutContribution } from "./_.contribution.js";
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|