@theia/core 1.77.0-next.7 → 1.77.0-next.77
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/README.md +5 -5
- package/lib/browser/breadcrumbs/breadcrumbs-renderer.js +1 -1
- package/lib/browser/breadcrumbs/breadcrumbs-renderer.js.map +1 -1
- package/lib/browser/catalog.json +304 -18
- package/lib/browser/color-application-contribution.d.ts +7 -1
- package/lib/browser/color-application-contribution.d.ts.map +1 -1
- package/lib/browser/color-application-contribution.js +15 -4
- package/lib/browser/color-application-contribution.js.map +1 -1
- package/lib/browser/color-application-contribution.spec.d.ts +2 -0
- package/lib/browser/color-application-contribution.spec.d.ts.map +1 -0
- package/lib/browser/color-application-contribution.spec.js +96 -0
- package/lib/browser/color-application-contribution.spec.js.map +1 -0
- package/lib/browser/color-registry.d.ts +7 -1
- package/lib/browser/color-registry.d.ts.map +1 -1
- package/lib/browser/color-registry.js +12 -0
- package/lib/browser/color-registry.js.map +1 -1
- package/lib/browser/common-commands.d.ts +3 -0
- package/lib/browser/common-commands.d.ts.map +1 -1
- package/lib/browser/common-commands.js +15 -0
- package/lib/browser/common-commands.js.map +1 -1
- package/lib/browser/common-frontend-contribution.d.ts +8 -1
- package/lib/browser/common-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/common-frontend-contribution.js +47 -3
- package/lib/browser/common-frontend-contribution.js.map +1 -1
- package/lib/browser/common-frontend-contribution.spec.js +2 -1
- package/lib/browser/common-frontend-contribution.spec.js.map +1 -1
- package/lib/browser/components/card.d.ts +1 -1
- package/lib/browser/components/card.d.ts.map +1 -1
- package/lib/browser/components/card.js +3 -2
- package/lib/browser/components/card.js.map +1 -1
- package/lib/browser/connection-status-service.spec.js +2 -1
- package/lib/browser/connection-status-service.spec.js.map +1 -1
- package/lib/browser/context-key-service.d.ts +11 -0
- package/lib/browser/context-key-service.d.ts.map +1 -1
- package/lib/browser/context-key-service.js +7 -0
- package/lib/browser/context-key-service.js.map +1 -1
- package/lib/browser/decorations-service.spec.js +2 -1
- package/lib/browser/decorations-service.spec.js.map +1 -1
- package/lib/browser/dialogs/react-dialog.spec.js +2 -1
- package/lib/browser/dialogs/react-dialog.spec.js.map +1 -1
- package/lib/browser/diff-uris.js +1 -1
- package/lib/browser/diff-uris.js.map +1 -1
- package/lib/browser/endpoint.js +2 -1
- package/lib/browser/endpoint.js.map +1 -1
- package/lib/browser/endpoint.spec.js +2 -1
- package/lib/browser/endpoint.spec.js.map +1 -1
- package/lib/browser/frontend-application-module.d.ts.map +1 -1
- package/lib/browser/frontend-application-module.js +3 -0
- package/lib/browser/frontend-application-module.js.map +1 -1
- package/lib/browser/keybinding.d.ts +95 -17
- package/lib/browser/keybinding.d.ts.map +1 -1
- package/lib/browser/keybinding.js +406 -76
- package/lib/browser/keybinding.js.map +1 -1
- package/lib/browser/keybinding.spec.js +804 -33
- package/lib/browser/keybinding.spec.js.map +1 -1
- package/lib/browser/keyboard/browser-keyboard-frontend-contribution.js +1 -1
- package/lib/browser/keyboard/browser-keyboard-frontend-contribution.js.map +1 -1
- package/lib/browser/keyboard/browser-keyboard-layout-provider.d.ts +3 -4
- package/lib/browser/keyboard/browser-keyboard-layout-provider.d.ts.map +1 -1
- package/lib/browser/keyboard/browser-keyboard-layout-provider.js +3 -3
- package/lib/browser/keyboard/browser-keyboard-layout-provider.js.map +1 -1
- package/lib/browser/keyboard/browser-keyboard-layout-provider.spec.js +42 -3
- package/lib/browser/keyboard/browser-keyboard-layout-provider.spec.js.map +1 -1
- package/lib/browser/keyboard/keyboard-layout-service.d.ts +67 -15
- package/lib/browser/keyboard/keyboard-layout-service.d.ts.map +1 -1
- package/lib/browser/keyboard/keyboard-layout-service.js +313 -98
- package/lib/browser/keyboard/keyboard-layout-service.js.map +1 -1
- package/lib/browser/keyboard/keyboard-layout-service.spec.js +570 -15
- package/lib/browser/keyboard/keyboard-layout-service.spec.js.map +1 -1
- package/lib/browser/keyboard/keys.spec.js +187 -3
- package/lib/browser/keyboard/keys.spec.js.map +1 -1
- package/lib/browser/label-provider.d.ts.map +1 -1
- package/lib/browser/label-provider.js +5 -3
- package/lib/browser/label-provider.js.map +1 -1
- package/lib/browser/label-provider.spec.js +2 -1
- package/lib/browser/label-provider.spec.js.map +1 -1
- package/lib/browser/markdown-rendering/markdown-link-handler.js +2 -1
- package/lib/browser/markdown-rendering/markdown-link-handler.js.map +1 -1
- package/lib/browser/markdown-rendering/markdown-renderer.d.ts +1 -1
- package/lib/browser/markdown-rendering/markdown-renderer.d.ts.map +1 -1
- package/lib/browser/markdown-rendering/markdown-renderer.js +4 -4
- package/lib/browser/markdown-rendering/markdown-renderer.js.map +1 -1
- package/lib/browser/markdown-rendering/markdown.js +2 -1
- package/lib/browser/markdown-rendering/markdown.js.map +1 -1
- package/lib/browser/markdown-rendering/markdown.spec.js +2 -1
- package/lib/browser/markdown-rendering/markdown.spec.js.map +1 -1
- package/lib/browser/menu/action-menu-node.d.ts +5 -3
- package/lib/browser/menu/action-menu-node.d.ts.map +1 -1
- package/lib/browser/menu/action-menu-node.js +2 -11
- package/lib/browser/menu/action-menu-node.js.map +1 -1
- package/lib/browser/menu/action-menu-node.spec.d.ts +2 -0
- package/lib/browser/menu/action-menu-node.spec.d.ts.map +1 -0
- package/lib/browser/menu/action-menu-node.spec.js +54 -0
- package/lib/browser/menu/action-menu-node.spec.js.map +1 -0
- package/lib/browser/menu/browser-menu-plugin.js +1 -1
- package/lib/browser/menu/browser-menu-plugin.js.map +1 -1
- package/lib/browser/menu/menu.spec.js +2 -1
- package/lib/browser/menu/menu.spec.js.map +1 -1
- package/lib/browser/opener-service.spec.js +3 -2
- package/lib/browser/opener-service.spec.js.map +1 -1
- package/lib/browser/perspective-service.spec.js +2 -1
- package/lib/browser/perspective-service.spec.js.map +1 -1
- package/lib/browser/preferences/preference-proxy.spec.js +2 -1
- package/lib/browser/preferences/preference-proxy.spec.js.map +1 -1
- package/lib/browser/preferences/preference-schema-provider.spec.js +2 -1
- package/lib/browser/preferences/preference-schema-provider.spec.js.map +1 -1
- package/lib/browser/preferences/preference-service.spec.js +2 -1
- package/lib/browser/preferences/preference-service.spec.js.map +1 -1
- package/lib/browser/preferences/preference-validation-service.spec.js +78 -77
- package/lib/browser/preferences/preference-validation-service.spec.js.map +1 -1
- package/lib/browser/quick-input/quick-command-service.d.ts +10 -1
- package/lib/browser/quick-input/quick-command-service.d.ts.map +1 -1
- package/lib/browser/quick-input/quick-command-service.js +31 -6
- package/lib/browser/quick-input/quick-command-service.js.map +1 -1
- package/lib/browser/quick-input/quick-command-service.spec.d.ts +2 -0
- package/lib/browser/quick-input/quick-command-service.spec.d.ts.map +1 -0
- package/lib/browser/quick-input/quick-command-service.spec.js +130 -0
- package/lib/browser/quick-input/quick-command-service.spec.js.map +1 -0
- package/lib/browser/quick-input/quick-help-service.js +1 -1
- package/lib/browser/quick-input/quick-help-service.js.map +1 -1
- package/lib/browser/quick-input/quick-input-service.spec.js +2 -1
- package/lib/browser/quick-input/quick-input-service.spec.js.map +1 -1
- package/lib/browser/quick-input/quick-pick-service-impl.d.ts +6 -6
- package/lib/browser/quick-input/quick-pick-service-impl.d.ts.map +1 -1
- package/lib/browser/quick-input/quick-view-service.spec.js +2 -1
- package/lib/browser/quick-input/quick-view-service.spec.js.map +1 -1
- package/lib/browser/secondary-window-handler.d.ts +4 -4
- package/lib/browser/secondary-window-handler.d.ts.map +1 -1
- package/lib/browser/shell/application-shell.js +1 -1
- package/lib/browser/shell/application-shell.js.map +1 -1
- package/lib/browser/shell/application-shell.spec.js +2 -1
- package/lib/browser/shell/application-shell.spec.js.map +1 -1
- package/lib/browser/shell/index.d.ts +1 -0
- package/lib/browser/shell/index.d.ts.map +1 -1
- package/lib/browser/shell/index.js +1 -0
- package/lib/browser/shell/index.js.map +1 -1
- package/lib/browser/shell/shell-layout-restorer.d.ts +2 -0
- package/lib/browser/shell/shell-layout-restorer.d.ts.map +1 -1
- package/lib/browser/shell/shell-layout-restorer.js +6 -0
- package/lib/browser/shell/shell-layout-restorer.js.map +1 -1
- package/lib/browser/shell/shell-layout-restorer.spec.js +9 -1
- package/lib/browser/shell/shell-layout-restorer.spec.js.map +1 -1
- package/lib/browser/shell/side-panel-handler.d.ts +12 -1
- package/lib/browser/shell/side-panel-handler.d.ts.map +1 -1
- package/lib/browser/shell/side-panel-handler.js +73 -0
- package/lib/browser/shell/side-panel-handler.js.map +1 -1
- package/lib/browser/shell/side-panel-handler.spec.d.ts +2 -0
- package/lib/browser/shell/side-panel-handler.spec.d.ts.map +1 -0
- package/lib/browser/shell/side-panel-handler.spec.js +85 -0
- package/lib/browser/shell/side-panel-handler.spec.js.map +1 -0
- package/lib/browser/shell/side-panel-item-visibility.d.ts +55 -0
- package/lib/browser/shell/side-panel-item-visibility.d.ts.map +1 -0
- package/lib/browser/shell/side-panel-item-visibility.js +100 -0
- package/lib/browser/shell/side-panel-item-visibility.js.map +1 -0
- package/lib/browser/shell/side-panel-item-visibility.spec.d.ts +2 -0
- package/lib/browser/shell/side-panel-item-visibility.spec.d.ts.map +1 -0
- package/lib/browser/shell/side-panel-item-visibility.spec.js +80 -0
- package/lib/browser/shell/side-panel-item-visibility.spec.js.map +1 -0
- package/lib/browser/shell/side-panel-toolbar.d.ts +1 -1
- package/lib/browser/shell/side-panel-toolbar.d.ts.map +1 -1
- package/lib/browser/shell/sidebar-menu-widget.js +1 -1
- package/lib/browser/shell/sidebar-menu-widget.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.js +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.js.map +1 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.spec.js +2 -1
- package/lib/browser/shell/tab-bar-toolbar/tab-bar-toolbar.spec.js.map +1 -1
- package/lib/browser/shell/tab-bars.d.ts +17 -0
- package/lib/browser/shell/tab-bars.d.ts.map +1 -1
- package/lib/browser/shell/tab-bars.js +33 -15
- package/lib/browser/shell/tab-bars.js.map +1 -1
- package/lib/browser/shell/tab-bars.spec.js +86 -0
- package/lib/browser/shell/tab-bars.spec.js.map +1 -1
- package/lib/browser/status-bar/status-bar.js +1 -1
- package/lib/browser/status-bar/status-bar.js.map +1 -1
- package/lib/browser/storage-service.spec.js +2 -1
- package/lib/browser/storage-service.spec.js.map +1 -1
- package/lib/browser/test/jsdom.d.ts.map +1 -1
- package/lib/browser/test/jsdom.js +11 -0
- package/lib/browser/test/jsdom.js.map +1 -1
- package/lib/browser/tooltip-service.js +1 -1
- package/lib/browser/tooltip-service.js.map +1 -1
- package/lib/browser/tree/tree-compression/compressed-tree-model.d.ts +2 -0
- package/lib/browser/tree/tree-compression/compressed-tree-model.d.ts.map +1 -1
- package/lib/browser/tree/tree-compression/compressed-tree-model.js +6 -2
- package/lib/browser/tree/tree-compression/compressed-tree-model.js.map +1 -1
- package/lib/browser/tree/tree-compression/compressed-tree-model.spec.d.ts +2 -0
- package/lib/browser/tree/tree-compression/compressed-tree-model.spec.d.ts.map +1 -0
- package/lib/browser/tree/tree-compression/compressed-tree-model.spec.js +52 -0
- package/lib/browser/tree/tree-compression/compressed-tree-model.spec.js.map +1 -0
- package/lib/browser/tree/tree-consistency.spec.js +1 -1
- package/lib/browser/tree/tree-consistency.spec.js.map +1 -1
- package/lib/browser/tree/tree-container.spec.js +6 -5
- package/lib/browser/tree/tree-container.spec.js.map +1 -1
- package/lib/browser/tree/tree-iterator.js +1 -1
- package/lib/browser/tree/tree-iterator.js.map +1 -1
- package/lib/browser/tree/tree-model.js +2 -2
- package/lib/browser/tree/tree-model.js.map +1 -1
- package/lib/browser/tree/tree-selection-state.d.ts +23 -1
- package/lib/browser/tree/tree-selection-state.d.ts.map +1 -1
- package/lib/browser/tree/tree-selection-state.js +23 -1
- package/lib/browser/tree/tree-selection-state.js.map +1 -1
- package/lib/browser/tree/tree-view-welcome-widget.js +1 -1
- package/lib/browser/tree/tree-view-welcome-widget.js.map +1 -1
- package/lib/browser/tree/tree-widget.d.ts +2 -2
- package/lib/browser/tree/tree-widget.d.ts.map +1 -1
- package/lib/browser/tree/tree-widget.js +3 -4
- package/lib/browser/tree/tree-widget.js.map +1 -1
- package/lib/browser/tree/tree-widget.spec.js +18 -0
- package/lib/browser/tree/tree-widget.spec.js.map +1 -1
- package/lib/browser/tree/tree.spec.js +2 -1
- package/lib/browser/tree/tree.spec.js.map +1 -1
- package/lib/browser/user-working-directory-provider.js +1 -1
- package/lib/browser/user-working-directory-provider.js.map +1 -1
- package/lib/browser/view-container.d.ts.map +1 -1
- package/lib/browser/view-container.js +2 -1
- package/lib/browser/view-container.js.map +1 -1
- package/lib/browser/widget-status-bar-service.d.ts +3 -1
- package/lib/browser/widget-status-bar-service.d.ts.map +1 -1
- package/lib/browser/widget-status-bar-service.js +15 -2
- package/lib/browser/widget-status-bar-service.js.map +1 -1
- package/lib/browser/widget-status-bar-service.spec.d.ts +2 -0
- package/lib/browser/widget-status-bar-service.spec.d.ts.map +1 -0
- package/lib/browser/widget-status-bar-service.spec.js +92 -0
- package/lib/browser/widget-status-bar-service.spec.js.map +1 -0
- package/lib/browser/widgets/react-renderer.js +1 -1
- package/lib/browser/widgets/react-renderer.js.map +1 -1
- package/lib/browser/widgets/react-widget.js +1 -1
- package/lib/browser/widgets/react-widget.js.map +1 -1
- package/lib/browser/widgets/select-component.d.ts.map +1 -1
- package/lib/browser/widgets/select-component.js +10 -14
- package/lib/browser/widgets/select-component.js.map +1 -1
- package/lib/browser/widgets/select-component.spec.d.ts +2 -0
- package/lib/browser/widgets/select-component.spec.d.ts.map +1 -0
- package/lib/browser/widgets/select-component.spec.js +67 -0
- package/lib/browser/widgets/select-component.spec.js.map +1 -0
- package/lib/browser/widgets/widget.js +1 -1
- package/lib/browser/widgets/widget.js.map +1 -1
- package/lib/common/buffer.js +3 -2
- package/lib/common/buffer.js.map +1 -1
- package/lib/common/cancellation.js.map +1 -1
- package/lib/common/command.spec.js +2 -1
- package/lib/common/command.spec.js.map +1 -1
- package/lib/common/core-preferences.js +5 -5
- package/lib/common/core-preferences.js.map +1 -1
- package/lib/common/disposable.spec.js +3 -2
- package/lib/common/disposable.spec.js.map +1 -1
- package/lib/common/encoding-service.js +2 -2
- package/lib/common/encoding-service.js.map +1 -1
- package/lib/common/event.d.ts +1 -1
- package/lib/common/event.d.ts.map +1 -1
- package/lib/common/event.js +0 -1
- package/lib/common/event.js.map +1 -1
- package/lib/common/file-uri.js +2 -1
- package/lib/common/file-uri.js.map +1 -1
- package/lib/common/fuzzy-search.js +1 -1
- package/lib/common/fuzzy-search.js.map +1 -1
- package/lib/common/glob.d.ts.map +1 -1
- package/lib/common/glob.js +9 -15
- package/lib/common/glob.js.map +1 -1
- package/lib/common/index.js +1 -1
- package/lib/common/index.js.map +1 -1
- package/lib/common/keyboard/keyboard-layout-provider.d.ts +7 -0
- package/lib/common/keyboard/keyboard-layout-provider.d.ts.map +1 -1
- package/lib/common/keyboard/keyboard-layout-provider.js.map +1 -1
- package/lib/common/keys.d.ts +86 -3
- package/lib/common/keys.d.ts.map +1 -1
- package/lib/common/keys.js +263 -24
- package/lib/common/keys.js.map +1 -1
- package/lib/common/message-rpc/channel.spec.js +3 -2
- package/lib/common/message-rpc/channel.spec.js.map +1 -1
- package/lib/common/messaging/proxy-factory.js +2 -2
- package/lib/common/messaging/proxy-factory.js.map +1 -1
- package/lib/common/messaging/proxy-factory.spec.js +2 -1
- package/lib/common/messaging/proxy-factory.spec.js.map +1 -1
- package/lib/common/messaging/web-socket-channel.d.ts +1 -1
- package/lib/common/messaging/web-socket-channel.d.ts.map +1 -1
- package/lib/common/path.spec.js +2 -1
- package/lib/common/path.spec.js.map +1 -1
- package/lib/common/performance/stopwatch.spec.js +2 -1
- package/lib/common/performance/stopwatch.spec.js.map +1 -1
- package/lib/common/preferences/preference-schema-service.d.ts +2 -2
- package/lib/common/preferences/preference-schema-service.d.ts.map +1 -1
- package/lib/common/preferences/preference-service.js +1 -1
- package/lib/common/preferences/preference-service.js.map +1 -1
- package/lib/common/promise-util.d.ts.map +1 -1
- package/lib/common/promise-util.js +5 -2
- package/lib/common/promise-util.js.map +1 -1
- package/lib/common/promise-util.spec.js +17 -1
- package/lib/common/promise-util.spec.js.map +1 -1
- package/lib/common/quick-pick-service.d.ts +5 -0
- package/lib/common/quick-pick-service.d.ts.map +1 -1
- package/lib/common/quick-pick-service.js +2 -1
- package/lib/common/quick-pick-service.js.map +1 -1
- package/lib/common/reference.spec.js +2 -1
- package/lib/common/reference.spec.js.map +1 -1
- package/lib/common/resource.js +1 -1
- package/lib/common/resource.js.map +1 -1
- package/lib/common/selection-service.spec.js +2 -1
- package/lib/common/selection-service.spec.js.map +1 -1
- package/lib/common/selection.js +2 -1
- package/lib/common/selection.js.map +1 -1
- package/lib/common/stream.d.ts.map +1 -1
- package/lib/common/stream.js +2 -1
- package/lib/common/stream.js.map +1 -1
- package/lib/common/strings.d.ts.map +1 -1
- package/lib/common/strings.js +1 -2
- package/lib/common/strings.js.map +1 -1
- package/lib/common/ternary-search-tree.js +2 -2
- package/lib/common/ternary-search-tree.js.map +1 -1
- package/lib/common/ternary-search-tree.spec.js +12 -0
- package/lib/common/ternary-search-tree.spec.js.map +1 -1
- package/lib/common/test/mock-resource-provider.js +1 -1
- package/lib/common/test/mock-resource-provider.js.map +1 -1
- package/lib/common/types.spec.js +2 -1
- package/lib/common/types.spec.js.map +1 -1
- package/lib/common/uri-command-handler.js +4 -3
- package/lib/common/uri-command-handler.js.map +1 -1
- package/lib/common/uri-command-handler.spec.js +3 -2
- package/lib/common/uri-command-handler.spec.js.map +1 -1
- package/lib/common/uri.spec.js +3 -2
- package/lib/common/uri.spec.js.map +1 -1
- package/lib/electron-browser/electron-clipboard-service.d.ts +1 -1
- package/lib/electron-browser/electron-clipboard-service.d.ts.map +1 -1
- package/lib/electron-browser/keyboard/electron-keyboard-module.d.ts +2 -0
- package/lib/electron-browser/keyboard/electron-keyboard-module.d.ts.map +1 -1
- package/lib/electron-browser/keyboard/electron-keyboard-module.js +8 -1
- package/lib/electron-browser/keyboard/electron-keyboard-module.js.map +1 -1
- package/lib/electron-browser/keyboard/electron-keyboard-module.spec.d.ts +2 -0
- package/lib/electron-browser/keyboard/electron-keyboard-module.spec.d.ts.map +1 -0
- package/lib/electron-browser/keyboard/electron-keyboard-module.spec.js +28 -0
- package/lib/electron-browser/keyboard/electron-keyboard-module.spec.js.map +1 -0
- package/lib/electron-browser/menu/electron-main-menu-factory.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-main-menu-factory.js +3 -2
- package/lib/electron-browser/menu/electron-main-menu-factory.js.map +1 -1
- package/lib/electron-browser/menu/electron-menu-contribution.d.ts.map +1 -1
- package/lib/electron-browser/menu/electron-menu-contribution.js +3 -0
- package/lib/electron-browser/menu/electron-menu-contribution.js.map +1 -1
- package/lib/electron-browser/preload.js +1 -1
- package/lib/electron-browser/preload.js.map +1 -1
- package/lib/electron-browser/window/window-zoom-action-bar.js +2 -1
- package/lib/electron-browser/window/window-zoom-action-bar.js.map +1 -1
- package/lib/electron-common/electron-api.d.ts +6 -1
- package/lib/electron-common/electron-api.d.ts.map +1 -1
- package/lib/electron-common/electron-api.js +21 -0
- package/lib/electron-common/electron-api.js.map +1 -1
- package/lib/electron-common/electron-api.spec.d.ts +2 -0
- package/lib/electron-common/electron-api.spec.d.ts.map +1 -0
- package/lib/electron-common/electron-api.spec.js +40 -0
- package/lib/electron-common/electron-api.spec.js.map +1 -0
- package/lib/electron-main/electron-api-main.d.ts +0 -1
- package/lib/electron-main/electron-api-main.d.ts.map +1 -1
- package/lib/electron-main/electron-api-main.js +8 -18
- package/lib/electron-main/electron-api-main.js.map +1 -1
- package/lib/electron-main/electron-main-application.d.ts.map +1 -1
- package/lib/electron-main/electron-main-application.js +10 -7
- package/lib/electron-main/electron-main-application.js.map +1 -1
- package/lib/electron-node/hosting/electron-backend-hosting-module.spec.js +2 -1
- package/lib/electron-node/hosting/electron-backend-hosting-module.spec.js.map +1 -1
- package/lib/electron-node/keyboard/electron-keyboard-layout-provider.js +1 -1
- package/lib/electron-node/keyboard/electron-keyboard-layout-provider.js.map +1 -1
- package/lib/electron-node/token/electron-token-validator.js +2 -2
- package/lib/electron-node/token/electron-token-validator.js.map +1 -1
- package/lib/node/backend-application.d.ts +11 -5
- package/lib/node/backend-application.d.ts.map +1 -1
- package/lib/node/backend-application.js +34 -12
- package/lib/node/backend-application.js.map +1 -1
- package/lib/node/backend-application.spec.js +52 -3
- package/lib/node/backend-application.spec.js.map +1 -1
- package/lib/node/bundled-resource-provider.js +4 -4
- package/lib/node/bundled-resource-provider.js.map +1 -1
- package/lib/node/bundled-resource-provider.spec.js +5 -4
- package/lib/node/bundled-resource-provider.spec.js.map +1 -1
- package/lib/node/cli.d.ts +1 -1
- package/lib/node/cli.d.ts.map +1 -1
- package/lib/node/cli.js +2 -2
- package/lib/node/cli.js.map +1 -1
- package/lib/node/cli.spec.js +3 -2
- package/lib/node/cli.spec.js.map +1 -1
- package/lib/node/console-logger-server.js +1 -1
- package/lib/node/console-logger-server.js.map +1 -1
- package/lib/node/env-variables/env-variables-server.js +1 -1
- package/lib/node/env-variables/env-variables-server.js.map +1 -1
- package/lib/node/environment-utils.spec.js +2 -1
- package/lib/node/environment-utils.spec.js.map +1 -1
- package/lib/node/file-uri.spec.js +4 -3
- package/lib/node/file-uri.spec.js.map +1 -1
- package/lib/node/filesystem-locking.js +1 -1
- package/lib/node/filesystem-locking.js.map +1 -1
- package/lib/node/hosting/browser-connection-token.js +2 -2
- package/lib/node/hosting/browser-connection-token.js.map +1 -1
- package/lib/node/i18n/localization-contribution.js +1 -1
- package/lib/node/i18n/localization-contribution.js.map +1 -1
- package/lib/node/key-store-server.js +1 -1
- package/lib/node/key-store-server.js.map +1 -1
- package/lib/node/logger-cli-contribution.js +2 -2
- package/lib/node/logger-cli-contribution.js.map +1 -1
- package/lib/node/logger-cli-contribution.spec.js +17 -16
- package/lib/node/logger-cli-contribution.spec.js.map +1 -1
- package/lib/node/messaging/binary-message-pipe.d.ts.map +1 -1
- package/lib/node/messaging/binary-message-pipe.js +5 -3
- package/lib/node/messaging/binary-message-pipe.js.map +1 -1
- package/lib/node/messaging/binary-message-pipe.spec.d.ts +2 -0
- package/lib/node/messaging/binary-message-pipe.spec.d.ts.map +1 -0
- package/lib/node/messaging/binary-message-pipe.spec.js +71 -0
- package/lib/node/messaging/binary-message-pipe.spec.js.map +1 -0
- package/lib/node/messaging/ipc-connection-provider.js +2 -2
- package/lib/node/messaging/ipc-connection-provider.js.map +1 -1
- package/lib/node/process-utils.d.ts +61 -0
- package/lib/node/process-utils.d.ts.map +1 -1
- package/lib/node/process-utils.js +157 -4
- package/lib/node/process-utils.js.map +1 -1
- package/lib/node/process-utils.slow-spec.d.ts +2 -0
- package/lib/node/process-utils.slow-spec.d.ts.map +1 -0
- package/lib/node/process-utils.slow-spec.js +106 -0
- package/lib/node/process-utils.slow-spec.js.map +1 -0
- package/lib/node/process-utils.spec.js +139 -1
- package/lib/node/process-utils.spec.js.map +1 -1
- package/lib/node/request/backend-request-facade.spec.js +2 -1
- package/lib/node/request/backend-request-facade.spec.js.map +1 -1
- package/lib/node/setting-service.spec.js +2 -1
- package/lib/node/setting-service.spec.js.map +1 -1
- package/lib/node/test/exiting-backend.d.ts +18 -0
- package/lib/node/test/exiting-backend.d.ts.map +1 -0
- package/lib/node/test/exiting-backend.js +71 -0
- package/lib/node/test/exiting-backend.js.map +1 -0
- package/package.json +16 -16
- package/src/browser/color-application-contribution.spec.ts +108 -0
- package/src/browser/color-application-contribution.ts +16 -4
- package/src/browser/color-registry.ts +13 -0
- package/src/browser/common-commands.ts +15 -0
- package/src/browser/common-frontend-contribution.ts +46 -2
- package/src/browser/components/card.tsx +1 -1
- package/src/browser/context-key-service.ts +15 -0
- package/src/browser/frontend-application-module.ts +3 -0
- package/src/browser/keybinding.spec.ts +895 -34
- package/src/browser/keybinding.ts +470 -85
- package/src/browser/keyboard/browser-keyboard-frontend-contribution.ts +1 -1
- package/src/browser/keyboard/browser-keyboard-layout-provider.spec.ts +52 -1
- package/src/browser/keyboard/browser-keyboard-layout-provider.ts +5 -5
- package/src/browser/keyboard/keyboard-layout-service.spec.ts +673 -15
- package/src/browser/keyboard/keyboard-layout-service.ts +362 -106
- package/src/browser/keyboard/keys.spec.ts +206 -1
- package/src/browser/label-provider.ts +3 -1
- package/src/browser/markdown-rendering/markdown-renderer.ts +1 -1
- package/src/browser/menu/action-menu-node.spec.ts +60 -0
- package/src/browser/menu/action-menu-node.ts +8 -14
- package/src/browser/menu/browser-menu-plugin.ts +1 -1
- package/src/browser/preferences/preference-validation-service.spec.ts +1 -1
- package/src/browser/quick-input/quick-command-service.spec.ts +159 -0
- package/src/browser/quick-input/quick-command-service.ts +36 -9
- package/src/browser/quick-input/quick-help-service.ts +1 -1
- package/src/browser/shell/index.ts +1 -0
- package/src/browser/shell/shell-layout-restorer.spec.ts +10 -0
- package/src/browser/shell/shell-layout-restorer.ts +5 -0
- package/src/browser/shell/side-panel-handler.spec.ts +94 -0
- package/src/browser/shell/side-panel-handler.ts +75 -1
- package/src/browser/shell/side-panel-item-visibility.spec.ts +91 -0
- package/src/browser/shell/side-panel-item-visibility.ts +115 -0
- package/src/browser/shell/tab-bars.spec.ts +96 -1
- package/src/browser/shell/tab-bars.ts +36 -13
- package/src/browser/style/hover-service.css +0 -2
- package/src/browser/test/jsdom.ts +11 -0
- package/src/browser/tree/tree-compression/compressed-tree-model.spec.ts +57 -0
- package/src/browser/tree/tree-compression/compressed-tree-model.ts +11 -2
- package/src/browser/tree/tree-container.spec.ts +1 -1
- package/src/browser/tree/tree-iterator.ts +1 -1
- package/src/browser/tree/tree-model.ts +2 -2
- package/src/browser/tree/tree-selection-state.ts +40 -1
- package/src/browser/tree/tree-widget.spec.tsx +20 -0
- package/src/browser/tree/tree-widget.tsx +4 -5
- package/src/browser/view-container.ts +2 -1
- package/src/browser/widget-status-bar-service.spec.ts +106 -0
- package/src/browser/widget-status-bar-service.ts +16 -3
- package/src/browser/widgets/select-component.spec.ts +77 -0
- package/src/browser/widgets/select-component.tsx +6 -10
- package/src/common/cancellation.ts +1 -1
- package/src/common/core-preferences.ts +5 -5
- package/src/common/disposable.spec.ts +1 -1
- package/src/common/event.ts +1 -2
- package/src/common/glob.ts +13 -30
- package/src/common/json-schema.ts +1 -1
- package/src/common/keyboard/keyboard-layout-provider.ts +8 -0
- package/src/common/keys.ts +312 -27
- package/src/common/message-rpc/channel.spec.ts +1 -1
- package/src/common/messaging/proxy-factory.ts +2 -2
- package/src/common/promise-util.spec.ts +18 -2
- package/src/common/promise-util.ts +5 -2
- package/src/common/quick-pick-service.ts +5 -0
- package/src/common/stream.ts +4 -3
- package/src/common/strings.ts +2 -5
- package/src/common/ternary-search-tree.spec.ts +14 -0
- package/src/common/ternary-search-tree.ts +3 -3
- package/src/common/uri-command-handler.ts +2 -2
- package/src/electron-browser/electron-clipboard-service.ts +1 -1
- package/src/electron-browser/keyboard/electron-keyboard-module.spec.ts +29 -0
- package/src/electron-browser/keyboard/electron-keyboard-module.ts +9 -2
- package/src/electron-browser/menu/electron-main-menu-factory.ts +3 -3
- package/src/electron-browser/menu/electron-menu-contribution.ts +4 -0
- package/src/electron-browser/preload.ts +2 -2
- package/src/electron-common/electron-api.spec.ts +42 -0
- package/src/electron-common/electron-api.ts +24 -1
- package/src/electron-main/electron-api-main.ts +7 -17
- package/src/electron-main/electron-main-application.ts +8 -5
- package/src/node/backend-application.spec.ts +68 -2
- package/src/node/backend-application.ts +28 -6
- package/src/node/cli.ts +1 -1
- package/src/node/logger-cli-contribution.spec.ts +1 -1
- package/src/node/messaging/binary-message-pipe.spec.ts +81 -0
- package/src/node/messaging/binary-message-pipe.ts +5 -4
- package/src/node/process-utils.slow-spec.ts +122 -0
- package/src/node/process-utils.spec.ts +162 -0
- package/src/node/process-utils.ts +166 -3
- package/src/node/test/exiting-backend.ts +75 -0
|
@@ -21,13 +21,30 @@ const event_1 = require("../../common/event");
|
|
|
21
21
|
const keys_1 = require("./keys");
|
|
22
22
|
const keyboard_layout_service_1 = require("./keyboard-layout-service");
|
|
23
23
|
const keyboard_layout_provider_1 = require("../../common/keyboard/keyboard-layout-provider");
|
|
24
|
-
const os = require("../../common/os");
|
|
25
|
-
const chai = require("chai");
|
|
26
|
-
const sinon = require("sinon");
|
|
24
|
+
const os = tslib_1.__importStar(require("../../common/os"));
|
|
25
|
+
const chai = tslib_1.__importStar(require("chai"));
|
|
26
|
+
const sinon = tslib_1.__importStar(require("sinon"));
|
|
27
|
+
class TestKeyboardLayoutService extends keyboard_layout_service_1.KeyboardLayoutService {
|
|
28
|
+
getWindowsKeyCodeInterpretations(keyCode, input, layoutModifiers) {
|
|
29
|
+
return super.getWindowsKeyCodeInterpretations(keyCode, input, layoutModifiers);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
const RUSSIAN_LAYOUT = {
|
|
33
|
+
info: { id: 'ru', lang: 'ru' },
|
|
34
|
+
mapping: {
|
|
35
|
+
KeyA: { value: 'ф', withShift: 'Ф', withAltGr: '', withShiftAltGr: '' },
|
|
36
|
+
KeyC: { value: 'с', withShift: 'С', withAltGr: '', withShiftAltGr: '' },
|
|
37
|
+
KeyV: { value: 'м', withShift: 'М', withAltGr: '', withShiftAltGr: '' },
|
|
38
|
+
KeyS: { value: 'ы', withShift: 'Ы', withAltGr: '', withShiftAltGr: '' },
|
|
39
|
+
Digit8: { value: '8', withShift: '*', withAltGr: '', withShiftAltGr: '' },
|
|
40
|
+
BracketLeft: { value: 'х', withShift: 'Х', withAltGr: '', withShiftAltGr: '' },
|
|
41
|
+
Comma: { value: 'б', withShift: 'Б', withAltGr: '', withShiftAltGr: '' }
|
|
42
|
+
}
|
|
43
|
+
};
|
|
27
44
|
describe('keyboard layout service', function () {
|
|
28
45
|
let stubOSX;
|
|
29
46
|
let stubWindows;
|
|
30
|
-
const setup = async (layout, system) => {
|
|
47
|
+
const setup = async (layout, system, layoutSource, keyValidator) => {
|
|
31
48
|
switch (system) {
|
|
32
49
|
case 'mac':
|
|
33
50
|
stubOSX = sinon.stub(os, 'isOSX').value(true);
|
|
@@ -42,9 +59,10 @@ describe('keyboard layout service', function () {
|
|
|
42
59
|
stubWindows = sinon.stub(os, 'isWindows').value(false);
|
|
43
60
|
}
|
|
44
61
|
const container = new inversify_1.Container();
|
|
45
|
-
container.bind(keyboard_layout_service_1.KeyboardLayoutService).
|
|
62
|
+
container.bind(keyboard_layout_service_1.KeyboardLayoutService).to(TestKeyboardLayoutService).inSingletonScope();
|
|
46
63
|
let MockLayoutProvider = class MockLayoutProvider {
|
|
47
64
|
constructor() {
|
|
65
|
+
this.layoutSource = layoutSource;
|
|
48
66
|
this.emitter = new event_1.Emitter();
|
|
49
67
|
}
|
|
50
68
|
get onDidChangeNativeLayout() {
|
|
@@ -59,6 +77,9 @@ describe('keyboard layout service', function () {
|
|
|
59
77
|
], MockLayoutProvider);
|
|
60
78
|
container.bind(keyboard_layout_provider_1.KeyboardLayoutProvider).to(MockLayoutProvider);
|
|
61
79
|
container.bind(keyboard_layout_provider_1.KeyboardLayoutChangeNotifier).to(MockLayoutProvider);
|
|
80
|
+
if (keyValidator) {
|
|
81
|
+
container.bind(keyboard_layout_provider_1.KeyValidator).toConstantValue(keyValidator);
|
|
82
|
+
}
|
|
62
83
|
const service = container.get(keyboard_layout_service_1.KeyboardLayoutService);
|
|
63
84
|
await service.initialize();
|
|
64
85
|
return service;
|
|
@@ -67,26 +88,198 @@ describe('keyboard layout service', function () {
|
|
|
67
88
|
stubOSX.restore();
|
|
68
89
|
stubWindows.restore();
|
|
69
90
|
});
|
|
91
|
+
it('reports an unknown layout source when no source provider is configured', async () => {
|
|
92
|
+
const layout = { info: { id: 'mock', lang: 'en' }, mapping: {} };
|
|
93
|
+
chai.expect((await setup(layout, 'linux')).layoutSource).to.equal('unknown');
|
|
94
|
+
});
|
|
95
|
+
it('reports the configured layout source', async () => {
|
|
96
|
+
const layout = { info: { id: 'mock', lang: 'en' }, mapping: {} };
|
|
97
|
+
chai.expect((await setup(layout, 'linux', 'native-keymap')).layoutSource).to.equal('native-keymap');
|
|
98
|
+
});
|
|
70
99
|
it('resolves correct key bindings with German Mac layout', async () => {
|
|
71
100
|
const macGerman = require('../../../src/common/keyboard/layouts/de-German-mac.json');
|
|
72
101
|
const service = await setup(macGerman, 'mac');
|
|
73
102
|
const toggleComment = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('Slash+M1'));
|
|
74
|
-
chai.expect(toggleComment.toString()).to.equal('meta+
|
|
103
|
+
chai.expect(toggleComment.toString()).to.equal('meta+7');
|
|
104
|
+
chai.expect(toggleComment.character).to.equal('/');
|
|
105
|
+
chai.expect(toggleComment.layoutModifiers).to.deep.equal('shift');
|
|
75
106
|
chai.expect(service.getKeyboardCharacter(toggleComment.key)).to.equal('7');
|
|
76
107
|
const indentLine = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('BracketRight+M1'));
|
|
77
|
-
chai.expect(indentLine.toString()).to.equal('meta+
|
|
108
|
+
chai.expect(indentLine.toString()).to.equal('meta+6');
|
|
109
|
+
chai.expect(indentLine.character).to.equal(']');
|
|
110
|
+
chai.expect(indentLine.layoutModifiers).to.deep.equal('altGraph');
|
|
78
111
|
chai.expect(service.getKeyboardCharacter(indentLine.key)).to.equal('6');
|
|
79
112
|
});
|
|
80
113
|
it('resolves correct key bindings with French Mac layout', async () => {
|
|
81
114
|
const macFrench = require('../../../src/common/keyboard/layouts/fr-French-mac.json');
|
|
82
115
|
const service = await setup(macFrench, 'mac');
|
|
83
116
|
const toggleComment = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('Slash+M1'));
|
|
84
|
-
chai.expect(toggleComment.toString()).to.equal('meta
|
|
117
|
+
chai.expect(toggleComment.toString()).to.equal('meta+.');
|
|
118
|
+
chai.expect(toggleComment.character).to.equal('/');
|
|
119
|
+
chai.expect(toggleComment.layoutModifiers).to.deep.equal('shift');
|
|
85
120
|
chai.expect(service.getKeyboardCharacter(toggleComment.key)).to.equal(':');
|
|
86
121
|
const indentLine = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('BracketRight+M1'));
|
|
87
|
-
chai.expect(indentLine.toString()).to.equal('meta
|
|
122
|
+
chai.expect(indentLine.toString()).to.equal('meta+-');
|
|
123
|
+
chai.expect(indentLine.character).to.equal(']');
|
|
124
|
+
chai.expect(indentLine.layoutModifiers).to.deep.equal('shiftAltGraph');
|
|
88
125
|
chai.expect(service.getKeyboardCharacter(indentLine.key)).to.equal(')');
|
|
89
126
|
});
|
|
127
|
+
it('uses global layout modifier priority and a stable physical-key tie-break', async () => {
|
|
128
|
+
const layout = {
|
|
129
|
+
info: { id: 'priority', lang: 'fr' },
|
|
130
|
+
mapping: {
|
|
131
|
+
Backslash: { value: '*', withShift: 'µ', withAltGr: '@', withShiftAltGr: '#' },
|
|
132
|
+
IntlBackslash: { value: '@', withShift: '#', withAltGr: 'µ', withShiftAltGr: '*' },
|
|
133
|
+
KeyB: { value: 'x', withShift: 'X', withAltGr: '', withShiftAltGr: '' },
|
|
134
|
+
KeyA: { value: 'x', withShift: 'X', withAltGr: '', withShiftAltGr: '' }
|
|
135
|
+
}
|
|
136
|
+
};
|
|
137
|
+
const service = await setup(layout, 'linux');
|
|
138
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('shift+2')).key).to.equal(keys_1.Key.INTL_BACKSLASH);
|
|
139
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('x')).key).to.equal(keys_1.Key.KEY_A);
|
|
140
|
+
const shifted = service.resolveKeyCode(keys_1.KeyCode.parse('shift+x'));
|
|
141
|
+
const event = service.getKeyCodeInterpretations({ key: 'X', code: 'KeyA', shiftKey: true }, 'code')
|
|
142
|
+
.find(candidate => candidate.interpretation === 'layoutModifiers');
|
|
143
|
+
chai.expect(event.dispatchString()).to.equal(shifted.dispatchString());
|
|
144
|
+
const altShifted = service.resolveKeyCode(keys_1.KeyCode.parse('alt+shift+x'));
|
|
145
|
+
const altEvent = service.getKeyCodeInterpretations({ key: 'X', code: 'KeyA', altKey: true, shiftKey: true }, 'code')
|
|
146
|
+
.find(candidate => candidate.interpretation === 'layoutModifiers');
|
|
147
|
+
chai.expect(altEvent.dispatchString()).to.equal(altShifted.dispatchString());
|
|
148
|
+
const capsLockEvent = service.getKeyCodeInterpretations({ key: 'x', code: 'KeyA', shiftKey: true }, 'code')
|
|
149
|
+
.find(candidate => candidate.interpretation === 'layoutModifiers');
|
|
150
|
+
chai.expect(capsLockEvent.dispatchString()).to.equal(shifted.dispatchString());
|
|
151
|
+
});
|
|
152
|
+
it('globally ranks case-folded fallback candidates', async () => {
|
|
153
|
+
const layout = {
|
|
154
|
+
info: { id: 'case-folded-priority', lang: 'en' },
|
|
155
|
+
mapping: {
|
|
156
|
+
KeyA: { value: 'a', withShift: 'A', withAltGr: 'ä', withShiftAltGr: '' },
|
|
157
|
+
KeyB: { value: 'b', withShift: 'ä', withAltGr: '', withShiftAltGr: '' }
|
|
158
|
+
}
|
|
159
|
+
};
|
|
160
|
+
const service = await setup(layout, 'linux');
|
|
161
|
+
const resolved = service.resolveKeyCode(keys_1.KeyCode.parse('[char:0xC4]'));
|
|
162
|
+
chai.expect(resolved.key).to.equal(keys_1.Key.KEY_B);
|
|
163
|
+
chai.expect(resolved.layoutModifiers).to.deep.equal('shift');
|
|
164
|
+
});
|
|
165
|
+
it('matches shifted physical scan-code bindings through the command interpretation', async () => {
|
|
166
|
+
const us = require('../../../src/common/keyboard/layouts/en-US-pc.json');
|
|
167
|
+
const service = await setup(us, 'linux');
|
|
168
|
+
const physical = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+shift+[BracketRight]'));
|
|
169
|
+
const interpretations = service.getKeyCodeInterpretations({
|
|
170
|
+
key: '}', code: 'BracketRight', ctrlKey: true, shiftKey: true
|
|
171
|
+
}, 'code');
|
|
172
|
+
chai.expect(physical.physical).to.be.true;
|
|
173
|
+
chai.expect(interpretations.some(candidate => candidate.dispatchString() === physical.dispatchString())).to.be.true;
|
|
174
|
+
});
|
|
175
|
+
it('keeps BÉPO logical bindings distinct from their former US-position collisions', async () => {
|
|
176
|
+
const bepo = require('../../../src/common/keyboard/layouts/fr-Bepo-pc.json');
|
|
177
|
+
const service = await setup(bepo, 'linux');
|
|
178
|
+
const undo = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+z'));
|
|
179
|
+
const outdent = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+['));
|
|
180
|
+
const close = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+w'));
|
|
181
|
+
const indent = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+]'));
|
|
182
|
+
chai.expect(undo.key).to.equal(keys_1.Key.BRACKET_LEFT);
|
|
183
|
+
chai.expect(outdent.key).to.equal(keys_1.Key.DIGIT4);
|
|
184
|
+
chai.expect(outdent.layoutModifiers).to.equal('altGraph');
|
|
185
|
+
chai.expect(close.key).to.equal(keys_1.Key.BRACKET_RIGHT);
|
|
186
|
+
chai.expect(indent.key).to.equal(keys_1.Key.DIGIT5);
|
|
187
|
+
chai.expect(indent.layoutModifiers).to.equal('altGraph');
|
|
188
|
+
});
|
|
189
|
+
it('falls back to the US position for Latin letters missing from a non-Latin layout', async () => {
|
|
190
|
+
const service = await setup(RUSSIAN_LAYOUT, 'linux');
|
|
191
|
+
const resolved = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+c'));
|
|
192
|
+
chai.expect(resolved.key).to.equal(keys_1.Key.KEY_C);
|
|
193
|
+
chai.expect(resolved.supportedByLayout).to.be.true;
|
|
194
|
+
chai.expect(resolved.layoutModifiers).to.equal('none');
|
|
195
|
+
chai.expect(resolved.dispatchString()).to.equal('ctrl+c');
|
|
196
|
+
chai.expect(service.getLatinLetterFallback(keys_1.Key.KEY_C)).to.equal('c');
|
|
197
|
+
chai.expect(service.getLatinLetterFallback(keys_1.Key.DIGIT8)).to.be.undefined;
|
|
198
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('с')).key).to.equal(keys_1.Key.KEY_C);
|
|
199
|
+
chai.expect(service.getKeyboardCharacter(keys_1.Key.KEY_C)).to.equal('с');
|
|
200
|
+
});
|
|
201
|
+
it('absorbs Shift into the Latin fallback letter', async () => {
|
|
202
|
+
const service = await setup(RUSSIAN_LAYOUT, 'linux');
|
|
203
|
+
const resolved = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+shift+a'));
|
|
204
|
+
chai.expect(resolved.key).to.equal(keys_1.Key.KEY_A);
|
|
205
|
+
chai.expect(resolved.layoutModifiers).to.equal('shift');
|
|
206
|
+
chai.expect(resolved.shift).to.be.false;
|
|
207
|
+
chai.expect(resolved.character).to.equal('A');
|
|
208
|
+
});
|
|
209
|
+
it('does not fall back for punctuation on a non-Latin layout', async () => {
|
|
210
|
+
const service = await setup(RUSSIAN_LAYOUT, 'linux');
|
|
211
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+[')).supportedByLayout).to.be.false;
|
|
212
|
+
});
|
|
213
|
+
it('does not override Latin letters produced elsewhere on the layout', async () => {
|
|
214
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
215
|
+
const service = await setup(german, 'linux');
|
|
216
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+z')).key).to.equal(keys_1.Key.KEY_Y);
|
|
217
|
+
chai.expect(service.getLatinLetterFallback(keys_1.Key.KEY_Z)).to.be.undefined;
|
|
218
|
+
});
|
|
219
|
+
it('does not override letters produced in only one case on the base or Shift layer', async () => {
|
|
220
|
+
const layout = {
|
|
221
|
+
info: { id: 'one-case-only', lang: 'en' },
|
|
222
|
+
mapping: {
|
|
223
|
+
KeyS: { value: 'o', withShift: 'Q', withAltGr: '', withShiftAltGr: '' },
|
|
224
|
+
KeyO: { value: 's', withShift: 'P', withAltGr: '', withShiftAltGr: '' }
|
|
225
|
+
}
|
|
226
|
+
};
|
|
227
|
+
const service = await setup(layout, 'linux');
|
|
228
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('o')).key).to.equal(keys_1.Key.KEY_S);
|
|
229
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('p')).key).to.equal(keys_1.Key.KEY_O);
|
|
230
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('p')).layoutModifiers).to.equal('shift');
|
|
231
|
+
for (const key of [keys_1.Key.KEY_O, keys_1.Key.KEY_P, keys_1.Key.KEY_Q, keys_1.Key.KEY_S]) {
|
|
232
|
+
chai.expect(service.getLatinLetterFallback(key)).to.be.undefined;
|
|
233
|
+
}
|
|
234
|
+
});
|
|
235
|
+
it('adds a fallback when a letter is produced only on the AltGraph layer', async () => {
|
|
236
|
+
const layout = {
|
|
237
|
+
info: { id: 'altgraph-only-latin', lang: 'ru' },
|
|
238
|
+
mapping: {
|
|
239
|
+
KeyQ: { value: 'й', withShift: 'Й', withAltGr: 'a', withShiftAltGr: '' }
|
|
240
|
+
}
|
|
241
|
+
};
|
|
242
|
+
const service = await setup(layout, 'linux');
|
|
243
|
+
const resolved = service.resolveKeyCode(keys_1.KeyCode.parse('a'));
|
|
244
|
+
chai.expect(resolved.key).to.equal(keys_1.Key.KEY_A);
|
|
245
|
+
chai.expect(resolved.layoutModifiers).to.equal('none');
|
|
246
|
+
chai.expect(service.getLatinLetterFallback(keys_1.Key.KEY_A)).to.equal('a');
|
|
247
|
+
});
|
|
248
|
+
it('adds Latin fallbacks to Windows mappings with vkeys and character values', async () => {
|
|
249
|
+
const layout = {
|
|
250
|
+
...RUSSIAN_LAYOUT,
|
|
251
|
+
mapping: {
|
|
252
|
+
...RUSSIAN_LAYOUT.mapping,
|
|
253
|
+
KeyC: { ...RUSSIAN_LAYOUT.mapping.KeyC, vkey: 'VK_C' }
|
|
254
|
+
}
|
|
255
|
+
};
|
|
256
|
+
const service = await setup(layout, 'win');
|
|
257
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+c')).key).to.equal(keys_1.Key.KEY_C);
|
|
258
|
+
chai.expect(service.getLatinLetterFallback(keys_1.Key.KEY_C)).to.equal('c');
|
|
259
|
+
});
|
|
260
|
+
it('marks printable bindings unresolved when the layout mapping is empty', async () => {
|
|
261
|
+
const layout = { info: { id: 'empty', lang: 'en' }, mapping: {} };
|
|
262
|
+
const service = await setup(layout, 'linux');
|
|
263
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+[')).supportedByLayout).to.be.false;
|
|
264
|
+
for (const lower of 'abcdefghijklmnopqrstuvwxyz') {
|
|
265
|
+
const key = keys_1.Key.getKey(`Key${lower.toUpperCase()}`);
|
|
266
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse(`ctrl+${lower}`)).key).to.equal(key);
|
|
267
|
+
chai.expect(service.getLatinLetterFallback(key)).to.equal(lower);
|
|
268
|
+
}
|
|
269
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('f1')).supportedByLayout).to.be.true;
|
|
270
|
+
});
|
|
271
|
+
it('marks unavailable logical characters unresolved instead of using the US position', async () => {
|
|
272
|
+
const layout = {
|
|
273
|
+
info: { id: 'missing-bracket', lang: 'en' },
|
|
274
|
+
mapping: {
|
|
275
|
+
KeyA: { value: 'a', withShift: 'A', withAltGr: '', withShiftAltGr: '' }
|
|
276
|
+
}
|
|
277
|
+
};
|
|
278
|
+
const service = await setup(layout, 'linux');
|
|
279
|
+
const outdent = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+['));
|
|
280
|
+
chai.expect(outdent.supportedByLayout).to.be.false;
|
|
281
|
+
chai.expect(outdent.key).to.equal(keys_1.Key.BRACKET_LEFT);
|
|
282
|
+
});
|
|
90
283
|
it('does not let a dead key hijack a keybinding on Mac (#17677)', async () => {
|
|
91
284
|
// On macOS US Extended, Option+P is the "combining comma below" dead key whose display glyph
|
|
92
285
|
// is reported as ',' by native-keymap. Since KeyP is reported before Comma, without honoring the
|
|
@@ -113,25 +306,387 @@ describe('keyboard layout service', function () {
|
|
|
113
306
|
chai.expect(openSettings.toString()).to.equal('meta+,');
|
|
114
307
|
chai.expect(service.getKeyboardCharacter(openSettings.key)).to.equal(',');
|
|
115
308
|
});
|
|
309
|
+
it('filters dead AltGraph mappings on Linux and Windows', async () => {
|
|
310
|
+
const layout = {
|
|
311
|
+
info: { id: 'dead-altgraph', lang: 'en' },
|
|
312
|
+
mapping: {
|
|
313
|
+
KeyP: {
|
|
314
|
+
value: 'p', withShift: 'P', withAltGr: '§', withShiftAltGr: '', withAltGrIsDeadKey: true, vkey: 'VK_P'
|
|
315
|
+
}
|
|
316
|
+
}
|
|
317
|
+
};
|
|
318
|
+
for (const system of ['linux', 'win']) {
|
|
319
|
+
const service = await setup(layout, system);
|
|
320
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('§')).supportedByLayout).to.be.false;
|
|
321
|
+
stubOSX.restore();
|
|
322
|
+
stubWindows.restore();
|
|
323
|
+
}
|
|
324
|
+
stubOSX = sinon.stub(os, 'isOSX').value(false);
|
|
325
|
+
stubWindows = sinon.stub(os, 'isWindows').value(false);
|
|
326
|
+
});
|
|
327
|
+
it('retains the Windows vkey fallback for value-less mappings', async () => {
|
|
328
|
+
const layout = {
|
|
329
|
+
info: { id: 'vkey-fallback', lang: 'en' },
|
|
330
|
+
mapping: { KeyA: { vkey: 'VK_A', value: '' } }
|
|
331
|
+
};
|
|
332
|
+
const service = await setup(layout, 'win');
|
|
333
|
+
const resolved = service.resolveKeyCode(keys_1.KeyCode.parse('a'));
|
|
334
|
+
chai.expect(resolved.supportedByLayout).to.be.true;
|
|
335
|
+
chai.expect(resolved.key).to.equal(keys_1.Key.KEY_A);
|
|
336
|
+
});
|
|
337
|
+
it('absorbs authored Shift when it selects a US character or layout shift layer', async () => {
|
|
338
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
339
|
+
const service = await setup(german, 'linux');
|
|
340
|
+
const legacy = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+shift+['));
|
|
341
|
+
chai.expect(legacy.shift).to.be.false;
|
|
342
|
+
chai.expect(legacy.dispatchString()).to.equal('ctrl+7@altgraph');
|
|
343
|
+
});
|
|
344
|
+
it('retains authored Shift when it is not consumed by the logical character', async () => {
|
|
345
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
346
|
+
const service = await setup(german, 'linux');
|
|
347
|
+
const umlaut = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+shift+ü'));
|
|
348
|
+
chai.expect(umlaut.dispatchString()).to.equal('shift+ctrl+[');
|
|
349
|
+
chai.expect(umlaut.layoutModifiers).to.equal('none');
|
|
350
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('shift+[char:0x41]')).dispatchString()).to.equal('a@shift');
|
|
351
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('shift+[char:0x61]')).dispatchString()).to.equal('shift+a');
|
|
352
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+shift+a')).dispatchString()).to.equal('ctrl+a@shift');
|
|
353
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+shift+[')).dispatchString()).to.equal('ctrl+7@altgraph');
|
|
354
|
+
});
|
|
355
|
+
it('requires Option for a macOS Shift+AltGraph layer', async () => {
|
|
356
|
+
const macUS = require('../../../src/common/keyboard/layouts/en-US-mac.json');
|
|
357
|
+
const service = await setup(macUS, 'mac');
|
|
358
|
+
chai.expect(service.detectLayoutModifiers({ key: '±', code: 'IntlBackslash', shiftKey: true })).to.equal('shift');
|
|
359
|
+
chai.expect(service.detectLayoutModifiers({ key: '±', code: 'IntlBackslash', shiftKey: true, altKey: true })).to.equal('shiftAltGraph');
|
|
360
|
+
});
|
|
361
|
+
it('interprets macOS Option as a command modifier besides the Option layer', async () => {
|
|
362
|
+
const macUS = require('../../../src/common/keyboard/layouts/en-US-mac.json');
|
|
363
|
+
const service = await setup(macUS, 'mac');
|
|
364
|
+
const optionShift = service.getKeyCodeInterpretations({ key: '∏', code: 'KeyP', shiftKey: true, altKey: true }, 'code');
|
|
365
|
+
chai.expect(optionShift.map(candidate => candidate.dispatchString())).to.deep.equal(['shift+alt+p', 'alt+p@shift', 'p@shift@altgraph']);
|
|
366
|
+
chai.expect(optionShift.map(candidate => candidate.character)).to.deep.equal(['P', 'P', '∏']);
|
|
367
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('shift+alt+p')).dispatchString()).to.equal('alt+p@shift');
|
|
368
|
+
const option = service.getKeyCodeInterpretations({ key: 'π', code: 'KeyP', altKey: true }, 'code');
|
|
369
|
+
chai.expect(option.map(candidate => candidate.dispatchString())).to.deep.equal(['alt+p', 'p@altgraph']);
|
|
370
|
+
chai.expect(option.map(candidate => candidate.character)).to.deep.equal(['p', 'π']);
|
|
371
|
+
const shift = service.getKeyCodeInterpretations({ key: 'P', code: 'KeyP', shiftKey: true }, 'code');
|
|
372
|
+
chai.expect(shift.map(candidate => candidate.dispatchString())).to.deep.equal(['shift+p', 'p@shift']);
|
|
373
|
+
});
|
|
374
|
+
it('records the base character for dead Option keys on macOS', async () => {
|
|
375
|
+
const service = await setup(require('../../../src/common/keyboard/layouts/en-US-mac.json'), 'mac');
|
|
376
|
+
const option = service.getKeyCodeInterpretations({ key: 'Dead', code: 'KeyE', altKey: true }, 'code');
|
|
377
|
+
chai.expect(option).to.have.length(1);
|
|
378
|
+
chai.expect(option[0].character).to.equal('e');
|
|
379
|
+
chai.expect(option[0].interpretation).to.equal('commandModifiers');
|
|
380
|
+
chai.expect(option[0].dispatchString()).to.equal('alt+e');
|
|
381
|
+
const optionShift = service.getKeyCodeInterpretations({ key: 'Dead', code: 'KeyE', altKey: true, shiftKey: true }, 'code');
|
|
382
|
+
chai.expect(optionShift.map(candidate => candidate.character)).to.deep.equal(['E', 'E']);
|
|
383
|
+
chai.expect(optionShift.map(candidate => candidate.dispatchString())).to.deep.equal(['shift+alt+e', 'alt+e@shift']);
|
|
384
|
+
const withoutOption = service.getKeyCodeInterpretations({ key: 'Dead', code: 'KeyE' }, 'code');
|
|
385
|
+
chai.expect(withoutOption).to.have.length(1);
|
|
386
|
+
chai.expect(withoutOption[0].character).to.be.undefined;
|
|
387
|
+
});
|
|
388
|
+
it('normalizes the character to the layout layer when Caps Lock inverts the case', async () => {
|
|
389
|
+
const us = await setup(require('../../../src/common/keyboard/layouts/en-US-pc.json'), 'linux');
|
|
390
|
+
const capsShift = us.getKeyCodeInterpretations({ key: 'p', code: 'KeyP', ctrlKey: true, shiftKey: true }, 'code');
|
|
391
|
+
chai.expect(capsShift.map(candidate => candidate.character)).to.deep.equal(['P', 'P']);
|
|
392
|
+
chai.expect(capsShift.map(candidate => candidate.dispatchString())).to.deep.equal(['shift+ctrl+p', 'ctrl+p@shift']);
|
|
393
|
+
const shift = us.getKeyCodeInterpretations({ key: 'P', code: 'KeyP', shiftKey: true }, 'code');
|
|
394
|
+
chai.expect(shift.map(candidate => candidate.character)).to.deep.equal(['P', 'P']);
|
|
395
|
+
stubOSX.restore();
|
|
396
|
+
stubWindows.restore();
|
|
397
|
+
const german = await setup(require('../../../src/common/keyboard/layouts/de-German-pc.json'), 'linux');
|
|
398
|
+
const capsBase = german.getKeyCodeInterpretations({ key: 'Ü', code: 'BracketLeft', ctrlKey: true }, 'code');
|
|
399
|
+
chai.expect(capsBase).to.have.length(1);
|
|
400
|
+
chai.expect(capsBase[0].character).to.equal('ü');
|
|
401
|
+
chai.expect(capsBase[0].dispatchString()).to.equal('ctrl+[');
|
|
402
|
+
});
|
|
403
|
+
it('normalizes the character to the macOS Option layer when Caps Lock inverts the case', async () => {
|
|
404
|
+
const service = await setup(require('../../../src/common/keyboard/layouts/en-US-mac.json'), 'mac');
|
|
405
|
+
const capsOption = service.getKeyCodeInterpretations({ key: 'Å', code: 'KeyA', altKey: true }, 'code');
|
|
406
|
+
chai.expect(capsOption.map(candidate => candidate.character)).to.deep.equal(['a', 'å']);
|
|
407
|
+
chai.expect(capsOption.map(candidate => candidate.dispatchString())).to.deep.equal(['alt+a', 'a@altgraph']);
|
|
408
|
+
const capsShiftOption = service.getKeyCodeInterpretations({ key: 'å', code: 'KeyA', altKey: true, shiftKey: true }, 'code');
|
|
409
|
+
chai.expect(capsShiftOption[0].character).to.equal('A');
|
|
410
|
+
chai.expect(capsShiftOption[0].dispatchString()).to.equal('shift+alt+a');
|
|
411
|
+
});
|
|
412
|
+
it('attributes Shift to the Shift layer when input reports the base character', async () => {
|
|
413
|
+
// Test automation such as Puppeteer can report the base character while Shift is held.
|
|
414
|
+
const us = require('../../../src/common/keyboard/layouts/en-US-pc.json');
|
|
415
|
+
const service = await setup(us, 'linux');
|
|
416
|
+
const input = { key: '`', code: 'Backquote', ctrlKey: true, shiftKey: true };
|
|
417
|
+
chai.expect(service.detectLayoutModifiers(input)).to.equal('shift');
|
|
418
|
+
const interpretations = service.getKeyCodeInterpretations(input, 'code');
|
|
419
|
+
chai.expect(interpretations.map(keyCode => keyCode.interpretation)).to.deep.equal(['commandModifiers', 'layoutModifiers']);
|
|
420
|
+
chai.expect(interpretations.map(keyCode => keyCode.dispatchString())).to.deep.equal(['shift+ctrl+`', 'ctrl+`@shift']);
|
|
421
|
+
chai.expect(interpretations[1].dispatchString()).to.equal(service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+shift+`')).dispatchString());
|
|
422
|
+
});
|
|
423
|
+
it('does not attribute base-character input to the Shift layer when AltGraph is active or the Shift layer is dead', async () => {
|
|
424
|
+
const layout = {
|
|
425
|
+
info: { id: 'dead-shift', lang: 'en' },
|
|
426
|
+
mapping: {
|
|
427
|
+
Backquote: {
|
|
428
|
+
value: '`', valueIsDeadKey: false, withShift: '~', withShiftIsDeadKey: false,
|
|
429
|
+
withAltGr: '', withAltGrIsDeadKey: false, withShiftAltGr: '', withShiftAltGrIsDeadKey: false
|
|
430
|
+
},
|
|
431
|
+
Equal: {
|
|
432
|
+
value: '=', valueIsDeadKey: false, withShift: '^', withShiftIsDeadKey: true,
|
|
433
|
+
withAltGr: '', withAltGrIsDeadKey: false, withShiftAltGr: '', withShiftAltGrIsDeadKey: false
|
|
434
|
+
}
|
|
435
|
+
}
|
|
436
|
+
};
|
|
437
|
+
const service = await setup(layout, 'linux');
|
|
438
|
+
chai.expect(service.detectLayoutModifiers({ key: '`', code: 'Backquote', shiftKey: true, altGraph: true })).to.be.undefined;
|
|
439
|
+
chai.expect(service.detectLayoutModifiers({ key: '=', code: 'Equal', shiftKey: true })).to.be.undefined;
|
|
440
|
+
});
|
|
441
|
+
it('normalizes the character to the Linux AltGraph layer when Caps Lock inverts the case', async () => {
|
|
442
|
+
const layout = {
|
|
443
|
+
info: { id: 'altgraph-letters', lang: 'pl' },
|
|
444
|
+
mapping: { KeyL: { value: 'l', withShift: 'L', withAltGr: 'ł', withShiftAltGr: 'Ł' } }
|
|
445
|
+
};
|
|
446
|
+
const service = await setup(layout, 'linux');
|
|
447
|
+
const capsAltGraph = service.getKeyCodeInterpretations({ key: 'Ł', code: 'KeyL', altGraph: true }, 'code');
|
|
448
|
+
chai.expect(capsAltGraph).to.have.length(1);
|
|
449
|
+
chai.expect(capsAltGraph[0].character).to.equal('ł');
|
|
450
|
+
chai.expect(capsAltGraph[0].dispatchString()).to.equal('l@altgraph');
|
|
451
|
+
const capsShiftAltGraph = service.getKeyCodeInterpretations({ key: 'ł', code: 'KeyL', shiftKey: true, altGraph: true }, 'code');
|
|
452
|
+
chai.expect(capsShiftAltGraph).to.have.length(1);
|
|
453
|
+
chai.expect(capsShiftAltGraph[0].character).to.equal('Ł');
|
|
454
|
+
});
|
|
455
|
+
it('does not add an AltGraph layer to Linux Alt+Shift input', async () => {
|
|
456
|
+
const service = await setup(require('../../../src/common/keyboard/layouts/en-US-pc.json'), 'linux');
|
|
457
|
+
chai.expect(service.getKeyCodeInterpretations({ key: 'P', code: 'KeyP', shiftKey: true, altKey: true }, 'code')
|
|
458
|
+
.map(candidate => candidate.dispatchString())).to.deep.equal(['shift+alt+p', 'alt+p@shift']);
|
|
459
|
+
});
|
|
460
|
+
it('requires AltGraph for a Linux Shift+AltGraph layer', async () => {
|
|
461
|
+
const layout = {
|
|
462
|
+
info: { id: 'same-shift-layers', lang: 'en' },
|
|
463
|
+
mapping: { KeyA: { value: 'a', withShift: 'A', withAltGr: 'ä', withShiftAltGr: 'A' } }
|
|
464
|
+
};
|
|
465
|
+
const service = await setup(layout, 'linux');
|
|
466
|
+
chai.expect(service.detectLayoutModifiers({ key: 'A', code: 'KeyA', shiftKey: true })).to.equal('shift');
|
|
467
|
+
chai.expect(service.detectLayoutModifiers({ key: 'A', code: 'KeyA', shiftKey: true, altGraph: true })).to.equal('shiftAltGraph');
|
|
468
|
+
});
|
|
469
|
+
it('uses Option as macOS AltGraph layer evidence', async () => {
|
|
470
|
+
const layout = {
|
|
471
|
+
info: { id: 'altgraph-evidence', lang: 'en' },
|
|
472
|
+
mapping: { KeyA: { value: 'a', withShift: 'A', withAltGr: 'ä', withShiftAltGr: 'Ä' } }
|
|
473
|
+
};
|
|
474
|
+
const service = await setup(layout, 'mac');
|
|
475
|
+
chai.expect(service.detectLayoutModifiers({ key: 'ä', code: 'KeyA', altKey: true })).to.equal('altGraph');
|
|
476
|
+
chai.expect(service.detectLayoutModifiers({ key: 'ä', code: 'KeyA' })).to.be.undefined;
|
|
477
|
+
});
|
|
478
|
+
it('uses emulated Windows AltGraph as platform layer evidence', async () => {
|
|
479
|
+
const layout = {
|
|
480
|
+
info: { id: 'altgraph-evidence', lang: 'en' },
|
|
481
|
+
mapping: { KeyA: { value: 'a', withShift: 'A', withAltGr: 'ä', withShiftAltGr: 'Ä' } }
|
|
482
|
+
};
|
|
483
|
+
const service = await setup(layout, 'win');
|
|
484
|
+
chai.expect(service.detectLayoutModifiers({ key: 'ä', code: 'KeyA', ctrlKey: true, altKey: true })).to.equal('altGraph');
|
|
485
|
+
});
|
|
486
|
+
it('constructs Linux layout modifier interpretations only for participating AltGraph', async () => {
|
|
487
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
488
|
+
const service = await setup(german, 'linux');
|
|
489
|
+
const participating = service.getKeyCodeInterpretations({ key: '[', code: 'Digit8', altGraph: true }, 'code');
|
|
490
|
+
chai.expect(participating).to.have.length(1);
|
|
491
|
+
chai.expect(participating[0].layoutModifiers).to.deep.equal('altGraph');
|
|
492
|
+
chai.expect(participating[0].dispatchString()).to.equal('8@altgraph');
|
|
493
|
+
const nonParticipating = service.getKeyCodeInterpretations({ key: 'o', code: 'KeyO', altGraph: true }, 'code');
|
|
494
|
+
chai.expect(nonParticipating[0].layoutModifiers).to.equal('none');
|
|
495
|
+
const withoutModifierEvidence = service.getKeyCodeInterpretations({ key: '[', code: 'Digit8' }, 'code');
|
|
496
|
+
chai.expect(withoutModifierEvidence[0].layoutModifiers).to.equal('none');
|
|
497
|
+
const withCommandAlt = service.getKeyCodeInterpretations({ key: '[', code: 'Digit8', altKey: true, altGraph: true }, 'code');
|
|
498
|
+
chai.expect(withCommandAlt[0].alt).to.be.true;
|
|
499
|
+
chai.expect(withCommandAlt[0].layoutModifiers).to.equal('altGraph');
|
|
500
|
+
});
|
|
501
|
+
it('keeps shifted printable bindings symmetric in keyCode dispatch mode', async () => {
|
|
502
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
503
|
+
const service = await setup(german, 'linux');
|
|
504
|
+
const commandPalette = keys_1.KeyCode.parse('ctrl+shift+p');
|
|
505
|
+
const shiftedPrintable = keys_1.KeyCode.parse('shift+/');
|
|
506
|
+
chai.expect(service.getKeyCodeInterpretations({ key: 'P', code: 'KeyP', keyCode: keys_1.Key.KEY_P.keyCode, ctrlKey: true, shiftKey: true }, 'keyCode')[0]
|
|
507
|
+
.dispatchString()).to.equal(commandPalette.dispatchString());
|
|
508
|
+
chai.expect(service.getKeyCodeInterpretations({ key: '/', code: 'Digit7', keyCode: keys_1.Key.SLASH.keyCode, shiftKey: true }, 'keyCode')[0]
|
|
509
|
+
.dispatchString()).to.equal(shiftedPrintable.dispatchString());
|
|
510
|
+
});
|
|
511
|
+
it('constructs command-first and layout modifier Windows interpretations', async () => {
|
|
512
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
513
|
+
const service = await setup(german, 'win');
|
|
514
|
+
const interpretations = service.getKeyCodeInterpretations({
|
|
515
|
+
key: '[', code: 'Digit8', ctrlKey: true, altKey: true, altGraph: false
|
|
516
|
+
}, 'code');
|
|
517
|
+
chai.expect(interpretations.map(code => code.interpretation)).to.deep.equal(['commandModifiers', 'layoutModifiers']);
|
|
518
|
+
chai.expect(interpretations[0].dispatchString()).to.equal('alt+ctrl+8');
|
|
519
|
+
chai.expect(interpretations[1].dispatchString()).to.equal('8@altgraph');
|
|
520
|
+
const intentional = service.getKeyCodeInterpretations({
|
|
521
|
+
key: 'f', code: 'KeyF', ctrlKey: true, altKey: true, altGraph: false
|
|
522
|
+
}, 'code');
|
|
523
|
+
chai.expect(intentional).to.have.length(1);
|
|
524
|
+
chai.expect(intentional[0].dispatchString()).to.equal('alt+ctrl+f');
|
|
525
|
+
const shiftedBinding = service.resolveKeyCode(keys_1.KeyCode.parse('ctrl+shift+p'));
|
|
526
|
+
const shiftedEvent = service.getKeyCodeInterpretations({ key: 'P', code: 'KeyP', ctrlKey: true, shiftKey: true }, 'code')
|
|
527
|
+
.find(candidate => candidate.interpretation === 'layoutModifiers');
|
|
528
|
+
chai.expect(shiftedBinding.supportedByLayout).to.be.true;
|
|
529
|
+
chai.expect(shiftedEvent.dispatchString()).to.equal(shiftedBinding.dispatchString());
|
|
530
|
+
});
|
|
531
|
+
it('preserves authored command modifiers alongside explicit Windows AltGraph', async () => {
|
|
532
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
533
|
+
const service = await setup(german, 'win');
|
|
534
|
+
const cases = [
|
|
535
|
+
{ ctrlKey: false, altKey: false, metaKey: false, expected: '8@altgraph' },
|
|
536
|
+
{ ctrlKey: true, altKey: false, metaKey: true, expected: 'meta+ctrl+8@altgraph' },
|
|
537
|
+
{ ctrlKey: false, altKey: true, metaKey: true, expected: 'meta+alt+8@altgraph' }
|
|
538
|
+
];
|
|
539
|
+
for (const { expected, ...modifiers } of cases) {
|
|
540
|
+
const input = { key: '[', code: 'Digit8', altGraph: true, ...modifiers };
|
|
541
|
+
const keyCode = new keys_1.KeyCode({
|
|
542
|
+
key: keys_1.Key.DIGIT8, character: '[', ctrl: input.ctrlKey, alt: input.altKey, meta: input.metaKey
|
|
543
|
+
});
|
|
544
|
+
const interpretations = service.getWindowsKeyCodeInterpretations(keyCode, input, 'altGraph');
|
|
545
|
+
chai.expect(interpretations).to.have.length(1);
|
|
546
|
+
chai.expect(interpretations[0].interpretation).to.equal('layoutModifiers');
|
|
547
|
+
chai.expect(interpretations[0].dispatchString()).to.equal(expected);
|
|
548
|
+
}
|
|
549
|
+
});
|
|
550
|
+
it('keeps legacy Windows AltGraph reporting typing-safe and preserves Meta', async () => {
|
|
551
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
552
|
+
const service = await setup(german, 'win');
|
|
553
|
+
for (const metaKey of [false, true]) {
|
|
554
|
+
const input = { key: '[', code: 'Digit8', ctrlKey: true, altKey: true, altGraph: true, metaKey };
|
|
555
|
+
const keyCode = new keys_1.KeyCode({ key: keys_1.Key.DIGIT8, character: '[', ctrl: true, alt: true, meta: metaKey });
|
|
556
|
+
const interpretations = service.getWindowsKeyCodeInterpretations(keyCode, input, 'altGraph');
|
|
557
|
+
const prefix = metaKey ? 'meta+' : '';
|
|
558
|
+
chai.expect(interpretations.map(code => code.interpretation)).to.deep.equal(['commandModifiers', 'layoutModifiers']);
|
|
559
|
+
chai.expect(interpretations[0].dispatchString()).to.equal(`${prefix}alt+ctrl+8`);
|
|
560
|
+
chai.expect(interpretations[1].dispatchString()).to.equal(`${prefix}8@altgraph`);
|
|
561
|
+
}
|
|
562
|
+
});
|
|
563
|
+
it('uses confirmed withAltGr output as Shift+AltGraph fallback when the shifted layer is absent', async () => {
|
|
564
|
+
const layout = {
|
|
565
|
+
info: { id: 'shift-altgraph-fallback', lang: 'en' },
|
|
566
|
+
mapping: {
|
|
567
|
+
Digit8: { value: '8', withShift: '*', withAltGr: '[', withShiftAltGr: '' }
|
|
568
|
+
}
|
|
569
|
+
};
|
|
570
|
+
const service = await setup(layout, 'linux');
|
|
571
|
+
chai.expect(service.detectLayoutModifiers({ key: '[', code: 'Digit8', shiftKey: true, altGraph: true }))
|
|
572
|
+
.to.deep.equal('shiftAltGraph');
|
|
573
|
+
chai.expect(service.detectLayoutModifiers({ key: '*', code: 'Digit8', shiftKey: true, altGraph: true }))
|
|
574
|
+
.to.equal('shift');
|
|
575
|
+
});
|
|
576
|
+
it('passes Linux AltGraph evidence to the key validator', async () => {
|
|
577
|
+
let validated;
|
|
578
|
+
const validator = { validateKey: validation => validated = validation };
|
|
579
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
580
|
+
const service = await setup(german, 'linux', undefined, validator);
|
|
581
|
+
const input = { key: '[', code: 'Digit8', ctrlKey: true, altGraph: true, shiftKey: false };
|
|
582
|
+
service.validateKeyCode(service.getKeyCodeInterpretations(input, 'code')[0], input);
|
|
583
|
+
chai.expect(validated?.altGraph).to.be.true;
|
|
584
|
+
});
|
|
585
|
+
it('passes macOS Option evidence to the key validator', async () => {
|
|
586
|
+
let validated;
|
|
587
|
+
const validator = { validateKey: validation => validated = validation };
|
|
588
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
589
|
+
const service = await setup(german, 'mac', undefined, validator);
|
|
590
|
+
const input = { key: '[', code: 'Digit8', altKey: true, shiftKey: false };
|
|
591
|
+
service.validateKeyCode(service.getKeyCodeInterpretations(input, 'code')[0], input);
|
|
592
|
+
chai.expect(validated?.altGraph).to.be.true;
|
|
593
|
+
});
|
|
594
|
+
it('passes emulated Windows AltGraph evidence to the key validator', async () => {
|
|
595
|
+
let validated;
|
|
596
|
+
const validator = { validateKey: validation => validated = validation };
|
|
597
|
+
const german = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
598
|
+
const service = await setup(german, 'win', undefined, validator);
|
|
599
|
+
const input = { key: '[', code: 'Digit8', ctrlKey: true, altKey: true, shiftKey: false };
|
|
600
|
+
service.validateKeyCode(service.getKeyCodeInterpretations(input, 'code')[0], input);
|
|
601
|
+
chai.expect(validated?.altGraph).to.be.true;
|
|
602
|
+
});
|
|
603
|
+
it('does not treat excluded or non-printable keys as layout modifier', async () => {
|
|
604
|
+
const layout = {
|
|
605
|
+
info: { id: 'native-shaped', lang: 'en' },
|
|
606
|
+
mapping: {
|
|
607
|
+
Space: { value: ' ', withShift: ' ', withAltGr: ' ', withShiftAltGr: ' ' },
|
|
608
|
+
Numpad1: { value: '1', withShift: '1', withAltGr: '¹', withShiftAltGr: '¹' }
|
|
609
|
+
}
|
|
610
|
+
};
|
|
611
|
+
const service = await setup(layout, 'linux');
|
|
612
|
+
chai.expect(service.detectLayoutModifiers({ key: ' ', code: 'Space', shiftKey: true })).to.be.undefined;
|
|
613
|
+
chai.expect(service.detectLayoutModifiers({ key: '¹', code: 'Numpad1', altGraph: true })).to.be.undefined;
|
|
614
|
+
});
|
|
615
|
+
it('ingests all Windows layout modifier layers across representative PC layouts', async () => {
|
|
616
|
+
const fixtures = [
|
|
617
|
+
{ layout: require('../../../src/common/keyboard/layouts/de-German-pc.json'), assertions: [['²', keys_1.Key.DIGIT2, false, true], ['ẞ', keys_1.Key.MINUS, true, true]] },
|
|
618
|
+
{ layout: require('../../../src/common/keyboard/layouts/fr-French-pc.json'), assertions: [['€', keys_1.Key.KEY_E, false, true]] },
|
|
619
|
+
{ layout: require('../../../src/common/keyboard/layouts/de-Swiss_German-pc.json'), assertions: [['@', keys_1.Key.DIGIT2, false, true]] },
|
|
620
|
+
{ layout: require('../../../src/common/keyboard/layouts/fr-Bepo-pc.json'), assertions: [['Æ', keys_1.Key.KEY_A, true, true]] }
|
|
621
|
+
];
|
|
622
|
+
for (const fixture of fixtures) {
|
|
623
|
+
const service = await setup(fixture.layout, 'win');
|
|
624
|
+
for (const [character, key, shift, altGraph] of fixture.assertions) {
|
|
625
|
+
const resolved = service.resolveKeyCode(keys_1.KeyCode.parse(character));
|
|
626
|
+
chai.expect(resolved.key).to.equal(key);
|
|
627
|
+
chai.expect(resolved.character).to.equal(character);
|
|
628
|
+
const expected = shift ? 'shiftAltGraph' : altGraph ? 'altGraph' : 'none';
|
|
629
|
+
chai.expect(resolved.layoutModifiers).to.equal(expected);
|
|
630
|
+
}
|
|
631
|
+
stubOSX.restore();
|
|
632
|
+
stubWindows.restore();
|
|
633
|
+
}
|
|
634
|
+
stubOSX = sinon.stub(os, 'isOSX').value(false);
|
|
635
|
+
stubWindows = sinon.stub(os, 'isWindows').value(false);
|
|
636
|
+
});
|
|
637
|
+
it('handles missing Windows layer values defensively', async () => {
|
|
638
|
+
const layout = {
|
|
639
|
+
info: { id: 'missing-windows-layers', lang: 'en' },
|
|
640
|
+
mapping: { KeyA: { vkey: 'VK_A', value: 'a' } }
|
|
641
|
+
};
|
|
642
|
+
const service = await setup(layout, 'win');
|
|
643
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('a')).supportedByLayout).to.be.true;
|
|
644
|
+
chai.expect(service.resolveKeyCode(keys_1.KeyCode.parse('§')).supportedByLayout).to.be.false;
|
|
645
|
+
});
|
|
646
|
+
it('resolves logical plus on US, German, and macOS layouts', async () => {
|
|
647
|
+
const fixtures = [
|
|
648
|
+
{ layout: require('../../../src/common/keyboard/layouts/en-US-pc.json'), system: 'win', key: keys_1.Key.EQUAL, shift: true },
|
|
649
|
+
{ layout: require('../../../src/common/keyboard/layouts/de-German-pc.json'), system: 'win', key: keys_1.Key.BRACKET_RIGHT, shift: false },
|
|
650
|
+
{ layout: require('../../../src/common/keyboard/layouts/en-US-mac.json'), system: 'mac', key: keys_1.Key.EQUAL, shift: true }
|
|
651
|
+
];
|
|
652
|
+
for (const fixture of fixtures) {
|
|
653
|
+
const service = await setup(fixture.layout, fixture.system);
|
|
654
|
+
const resolved = service.resolveKeyCode(keys_1.KeyCode.parse('[char:0x2B]'));
|
|
655
|
+
chai.expect(resolved.key).to.equal(fixture.key);
|
|
656
|
+
chai.expect(resolved.layoutModifiers === 'shift' || resolved.layoutModifiers === 'shiftAltGraph').to.equal(fixture.shift);
|
|
657
|
+
stubOSX.restore();
|
|
658
|
+
stubWindows.restore();
|
|
659
|
+
}
|
|
660
|
+
stubOSX = sinon.stub(os, 'isOSX').value(false);
|
|
661
|
+
stubWindows = sinon.stub(os, 'isWindows').value(false);
|
|
662
|
+
});
|
|
116
663
|
it('resolves correct key bindings with German Windows layout', async () => {
|
|
117
664
|
const winGerman = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
118
665
|
const service = await setup(winGerman, 'win');
|
|
119
666
|
const toggleComment = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('Slash+M1'));
|
|
120
|
-
chai.expect(toggleComment.toString()).to.equal('ctrl
|
|
121
|
-
chai.expect(
|
|
667
|
+
chai.expect(toggleComment.toString()).to.equal('ctrl+7');
|
|
668
|
+
chai.expect(toggleComment.character).to.equal('/');
|
|
669
|
+
chai.expect(toggleComment.layoutModifiers).to.deep.equal('shift');
|
|
670
|
+
chai.expect(service.getKeyboardCharacter(toggleComment.key)).to.equal('7');
|
|
122
671
|
const indentLine = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('BracketRight+M1'));
|
|
123
|
-
chai.expect(indentLine.toString()).to.equal('ctrl
|
|
124
|
-
chai.expect(
|
|
672
|
+
chai.expect(indentLine.toString()).to.equal('ctrl+9');
|
|
673
|
+
chai.expect(indentLine.character).to.equal(']');
|
|
674
|
+
chai.expect(indentLine.layoutModifiers).to.deep.equal('altGraph');
|
|
675
|
+
chai.expect(service.getKeyboardCharacter(indentLine.key)).to.equal('9');
|
|
125
676
|
});
|
|
126
677
|
it('resolves correct key bindings with French Windows layout', async () => {
|
|
127
678
|
const winFrench = require('../../../src/common/keyboard/layouts/fr-French-pc.json');
|
|
128
679
|
const service = await setup(winFrench, 'win');
|
|
129
680
|
const toggleComment = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('Slash+M1'));
|
|
130
681
|
chai.expect(toggleComment.toString()).to.equal('ctrl+.');
|
|
682
|
+
chai.expect(toggleComment.character).to.equal('/');
|
|
683
|
+
chai.expect(toggleComment.layoutModifiers).to.deep.equal('shift');
|
|
131
684
|
chai.expect(service.getKeyboardCharacter(toggleComment.key)).to.equal(':');
|
|
132
685
|
const indentLine = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('BracketRight+M1'));
|
|
133
|
-
chai.expect(indentLine.toString()).to.equal('ctrl
|
|
134
|
-
chai.expect(
|
|
686
|
+
chai.expect(indentLine.toString()).to.equal('ctrl+-');
|
|
687
|
+
chai.expect(indentLine.character).to.equal(']');
|
|
688
|
+
chai.expect(indentLine.layoutModifiers).to.deep.equal('altGraph');
|
|
689
|
+
chai.expect(service.getKeyboardCharacter(indentLine.key)).to.equal(')');
|
|
135
690
|
});
|
|
136
691
|
});
|
|
137
692
|
//# sourceMappingURL=keyboard-layout-service.spec.js.map
|