@theia/core 1.74.0-next.0 → 1.74.0-next.15

package/lib/browser/catalog.json

@@ -2,6 +2,12 @@
   "$schema": "https://www.schemastore.org/schema-catalog.json",
   "version": 1,
   "schemas": [
+    {
+      "name": "Specpin spec file",
+      "description": "Specpin business-spec file (.specs/*.spec.json): rules, descriptions, and acceptance criteria pinned to UI elements",
+      "fileMatch": ["**/.specs/*.spec.json"],
+      "url": "https://specpin.ohnice.app/schema/v1.json"
+    },
     {
       "name": "Burnless SRE config",
       "description": "Burnless sre.yaml \u2014 SLOs, error budgets, runbooks, on-call, and dashboards as code",
@@ -213,7 +219,7 @@
       "name": ".aiproj.json",
       "description": "Settings for project analysis by the Application Inspector",
       "fileMatch": [".aiproj.json"],
-      "url": "https://www.schemastore.org/aiproj-1.10.json",
+      "url": "https://www.schemastore.org/aiproj-1.11.json",
       "versions": {
         "1.0": "https://www.schemastore.org/aiproj-1.0.json",
         "1.1": "https://www.schemastore.org/aiproj-1.1.json",
@@ -225,9 +231,16 @@
         "1.7": "https://www.schemastore.org/aiproj-1.7.json",
         "1.8": "https://www.schemastore.org/aiproj-1.8.json",
         "1.9": "https://www.schemastore.org/aiproj-1.9.json",
-        "1.10": "https://www.schemastore.org/aiproj-1.10.json"
+        "1.10": "https://www.schemastore.org/aiproj-1.10.json",
+        "1.11": "https://www.schemastore.org/aiproj-1.11.json"
       }
     },
+    {
+      "name": "abtop",
+      "description": "abtop configuration file",
+      "fileMatch": ["**/abtop/config.toml"],
+      "url": "https://www.schemastore.org/abtop.json"
+    },
     {
       "name": "ABCInventoryModuleData",
       "description": "ABCInventoryModuleData defining the structure of ABCInventoryModuleData including Principal Data, inventory, and transaction data in ABC-Plan's Inventory Management Module",
@@ -325,6 +338,18 @@
       "fileMatch": ["actionlint.yaml", "actionlint.yml"],
       "url": "https://www.schemastore.org/actionlint.json"
     },
+    {
+      "name": "AI Harness config",
+      "description": "Repository bootstrap-intent marker for ai-harness, including context directory, resolved AI coding targets, and posture",
+      "fileMatch": [".aih-config.json"],
+      "url": "https://www.schemastore.org/aih-config.json"
+    },
+    {
+      "name": "AI Harness org policy",
+      "description": "Repository governance policy for ai-harness command guardrails, MCP policy, and trust gates",
+      "fileMatch": ["aih-org-policy.json"],
+      "url": "https://www.schemastore.org/aih-org-policy.json"
+    },
     {
       "name": "AIConfig",
       "description": "AIConfig that is used to store generative AI prompts, models and model parameters",
@@ -552,12 +577,13 @@
       "name": "Aurora Agile Meta-Framework",
       "description": "Yaml for Aurora Agile Meta-Framework",
       "fileMatch": ["*.aurora.yaml", "*.aurora.yml"],
-      "url": "https://www.schemastore.org/aurora-1.3.json",
+      "url": "https://www.schemastore.org/aurora-2.0.json",
       "versions": {
         "1.0": "https://www.schemastore.org/aurora-1.0.json",
         "1.1": "https://www.schemastore.org/aurora-1.1.json",
         "1.2": "https://www.schemastore.org/aurora-1.2.json",
-        "1.3": "https://www.schemastore.org/aurora-1.3.json"
+        "1.3": "https://www.schemastore.org/aurora-1.3.json",
+        "2.0": "https://www.schemastore.org/aurora-2.0.json"
       }
     },
     {
@@ -2007,6 +2033,12 @@
       "fileMatch": ["**/.codex/hooks.json"],
       "url": "https://www.schemastore.org/codex-hooks.json"
     },
+    {
+      "name": "Codex Plugin Manifest",
+      "description": "OpenAI Codex plugin manifest file",
+      "fileMatch": ["**/.codex-plugin/plugin.json"],
+      "url": "https://www.schemastore.org/codex-plugin-manifest.json"
+    },
     {
       "name": "Codex Skill Metadata",
       "description": "OpenAI Codex skill metadata file",
@@ -3393,6 +3425,12 @@
         "2.3": "https://raw.githubusercontent.com/roedoejet/g2p/main/g2p/mappings/.schema/g2p-config-schema-2.3.json"
       }
     },
+    {
+      "name": "GAMA",
+      "description": "GAMA configuration file",
+      "fileMatch": ["**/gama/config.yaml", ".gama.yaml"],
+      "url": "https://www.schemastore.org/gama.json"
+    },
     {
       "name": "Gaspar",
       "description": "Configuration for Gaspar",
@@ -3470,7 +3508,7 @@
         ".gitversion.yml",
         ".gitversion.yaml"
       ],
-      "url": "https://gitversion.net/schemas/6.7/GitVersion.configuration.json",
+      "url": "https://gitversion.net/schemas/6.8/GitVersion.configuration.json",
       "versions": {
         "5.12": "https://gitversion.net/schemas/5.12/GitVersion.configuration.json",
         "6.0": "https://gitversion.net/schemas/6.0/GitVersion.configuration.json",
@@ -3480,9 +3518,32 @@
         "6.4": "https://gitversion.net/schemas/6.4/GitVersion.configuration.json",
         "6.5": "https://gitversion.net/schemas/6.5/GitVersion.configuration.json",
         "6.6": "https://gitversion.net/schemas/6.6/GitVersion.configuration.json",
-        "6.7": "https://gitversion.net/schemas/6.7/GitVersion.configuration.json"
+        "6.7": "https://gitversion.net/schemas/6.7/GitVersion.configuration.json",
+        "6.8": "https://gitversion.net/schemas/6.8/GitVersion.configuration.json"
       }
     },
+    {
+      "name": "Gitleaks",
+      "description": "Gitleaks configuration file",
+      "fileMatch": ["gitleaks.toml", ".gitleaks.toml"],
+      "url": "https://www.schemastore.org/gitleaks.json"
+    },
+    {
+      "name": "git-cliff",
+      "description": "git-cliff configuration file",
+      "fileMatch": [
+        "cliff.toml",
+        ".cliff.toml",
+        "**/.config/cliff.toml",
+        "cliff.yaml",
+        "cliff.yml",
+        ".cliff.yaml",
+        ".cliff.yml",
+        "**/.config/cliff.yaml",
+        "**/.config/cliff.yml"
+      ],
+      "url": "https://www.schemastore.org/git-cliff.json"
+    },
     {
       "name": "Gitea Issue Template configuration",
       "description": "YAML configuring Gitea Issue Templates",
@@ -3607,6 +3668,17 @@
       "fileMatch": [".gitpod.yml"],
       "url": "https://gitpod.io/schemas/gitpod-schema.json"
     },
+    {
+      "name": "GitResume",
+      "description": "GitResume resume-as-code definition file",
+      "fileMatch": [
+        "gitresume.yaml",
+        "gitresume.yml",
+        "*.gitresume.yaml",
+        "*.gitresume.yml"
+      ],
+      "url": "https://gitresume.co/schema/resume.schema.json"
+    },
     {
       "name": "Ansible Execution Environment",
       "description": "Ansible execution-environment.yml file",
@@ -3738,6 +3810,12 @@
       "fileMatch": [".custom-gcl.yml", ".custom-gcl.yaml"],
       "url": "https://golangci-lint.run/jsonschema/custom-gcl.jsonschema.json"
     },
+    {
+      "name": "gollama",
+      "description": "gollama configuration file",
+      "fileMatch": ["**/gollama/config.json"],
+      "url": "https://www.schemastore.org/gollama.json"
+    },
     {
       "name": "go-feature-flag Flag Configuration",
       "description": "go-feature-flag flag configuration file",
@@ -3912,6 +3990,12 @@
       ],
       "url": "https://hazelcast.com/schema/config/hazelcast-config-5.7.json"
     },
+    {
+      "name": "hassette.toml",
+      "description": "Configuration file for Hassette, an async Python framework for Home Assistant automations",
+      "fileMatch": ["hassette.toml"],
+      "url": "https://raw.githubusercontent.com/NodeJSmith/hassette/main/hassette.schema.json"
+    },
     {
       "name": "Home Assistant Integration Manifest",
       "description": "Home Assistant integration manifest file. Documentation: https://developers.home-assistant.io/docs/creating_integration_manifest/",
@@ -4208,8 +4292,9 @@
       "name": "JReleaser",
       "description": "JReleaser config file",
       "fileMatch": ["jreleaser.yml", "jreleaser.json"],
-      "url": "https://www.schemastore.org/jreleaser-1.24.0.json",
+      "url": "https://www.schemastore.org/jreleaser-1.25.0.json",
       "versions": {
+        "1.25.0": "https://www.schemastore.org/jreleaser-1.25.0.json",
         "1.24.0": "https://www.schemastore.org/jreleaser-1.24.0.json",
         "1.23.0": "https://www.schemastore.org/jreleaser-1.23.0.json",
         "1.22.0": "https://www.schemastore.org/jreleaser-1.22.0.json",
@@ -4891,6 +4976,11 @@
       "fileMatch": [],
       "url": "https://www.schemastore.org/modelparams.json"
     },
+    {
+      "name": "models CLI",
+      "description": "models CLI configuration file",
+      "url": "https://www.schemastore.org/modelsdev.json"
+    },
     {
       "name": "monospace.yml",
       "description": "MonoSpace configuration file",
@@ -4922,6 +5012,12 @@
       ],
       "url": "https://raw.githubusercontent.com/compomics/ms2rescore/main/ms2rescore/package_data/config_schema.json"
     },
+    {
+      "name": "MSTest testconfig.json",
+      "description": "Configuration file for MSTest and Microsoft.Testing.Platform",
+      "fileMatch": ["testconfig.json", "*.testconfig.json"],
+      "url": "https://raw.githubusercontent.com/microsoft/testfx/main/docs/testconfig.schema.json"
+    },
     {
       "name": "Mergify Configuration",
       "description": "Mergify configuration file",
@@ -5075,6 +5171,12 @@
       "fileMatch": [".nodehawkrc"],
       "url": "https://www.schemastore.org/nodehawkrc.json"
     },
+    {
+      "name": "Nika workflow",
+      "description": "Nika workflow language (*.nika.yaml) · the nika: v1 envelope, four verbs, stdlib builtins",
+      "fileMatch": ["*.nika.yaml", "*.nika.yml"],
+      "url": "https://raw.githubusercontent.com/supernovae-st/nika-spec/main/schemas/workflow.schema.json"
+    },
     {
       "name": "nodemon.json",
       "description": "nodemon.json configuration files",
@@ -6544,6 +6646,12 @@
         "2.0.0": "https://raw.githubusercontent.com/sdmx-twg/sdmx-json/master/data-message/tools/schemas/2.0.0/sdmx-json-data-schema.json"
       }
     },
+    {
+      "name": "Secure SDLC Evidence Bundle",
+      "description": "Auditable release-readiness evidence bundle produced by the Secure SDLC Evidence Collector",
+      "fileMatch": ["**/*.evidence-bundle.json"],
+      "url": "https://www.schemastore.org/evidence-bundle.json"
+    },
     {
       "name": "Semantic Data Fabric (SDF) file",
       "description": "SDF blocks",
@@ -6896,6 +7004,19 @@
       "fileMatch": ["*.mixins.json"],
       "url": "https://www.schemastore.org/sponge-mixins.json"
     },
+    {
+      "name": "Spotlight Ruleset",
+      "description": "Spotlight (Spectral-compatible) ruleset for linting OpenAPI, AsyncAPI, Arazzo, APIs.json and other JSON/YAML API descriptions",
+      "fileMatch": [
+        "*.spotlight.json",
+        "*.spotlight.yaml",
+        "*.spotlight.yml",
+        "spotlight-ruleset.json",
+        "spotlight-ruleset.yaml",
+        "spotlight-ruleset.yml"
+      ],
+      "url": "https://api-commons.github.io/spotlight-spec/schema/v1/spotlight-ruleset.schema.json"
+    },
     {
       "name": ".sprite files",
       "description": "image sprite generation files",
@@ -7752,6 +7873,12 @@
       "fileMatch": [".huskyrc", ".huskyrc.json"],
       "url": "https://www.schemastore.org/huskyrc.json"
     },
+    {
+      "name": "lychee",
+      "description": "lychee link checker configuration file",
+      "fileMatch": ["lychee.toml", ".lychee.toml"],
+      "url": "https://www.schemastore.org/lychee.json"
+    },
     {
       "name": "lint-staged (.lintstagedrc)",
       "description": "lint-staged config",
@@ -8118,7 +8245,7 @@
       "name": "Gradle Enterprise",
       "description": "Gradle Enterprise configuration",
       "fileMatch": ["*gradle-enterprise.yml", "*gradle-enterprise.yaml"],
-      "url": "https://docs.gradle.com/downloads/gradle-enterprise-config-schema/gradle-enterprise-config-schema-15.json",
+      "url": "https://docs.gradle.com/downloads/gradle-enterprise-config-schema/gradle-enterprise-config-schema-16.json",
       "versions": {
         "1.0": "https://docs.gradle.com/develocity/helm-admin/schema/gradle-enterprise-config-schema-1.json",
         "2.0": "https://docs.gradle.com/develocity/helm-admin/schema/gradle-enterprise-config-schema-2.json",
@@ -8134,7 +8261,8 @@
         "12.0": "https://docs.gradle.com/develocity/helm-admin/schema/gradle-enterprise-config-schema-12.json",
         "13.0": "https://docs.gradle.com/downloads/gradle-enterprise-config-schema/gradle-enterprise-config-schema-13.json",
         "14.0": "https://docs.gradle.com/downloads/gradle-enterprise-config-schema/gradle-enterprise-config-schema-14.json",
-        "15.0": "https://docs.gradle.com/downloads/gradle-enterprise-config-schema/gradle-enterprise-config-schema-15.json"
+        "15.0": "https://docs.gradle.com/downloads/gradle-enterprise-config-schema/gradle-enterprise-config-schema-15.json",
+        "16.0": "https://docs.gradle.com/downloads/gradle-enterprise-config-schema/gradle-enterprise-config-schema-16.json"
       }
     },
     {
@@ -8847,7 +8975,7 @@
       "name": "Pantsbuild",
       "description": "Pantsbuild configuration file",
       "fileMatch": ["pants*.toml"],
-      "url": "https://www.schemastore.org/pantsbuild-2.31.0.json",
+      "url": "https://www.schemastore.org/pantsbuild-2.32.0.json",
       "versions": {
         "2.14.0": "https://www.schemastore.org/pantsbuild-2.14.0.json",
         "2.15.0": "https://www.schemastore.org/pantsbuild-2.15.0.json",
@@ -8860,7 +8988,8 @@
         "2.24.0": "https://www.schemastore.org/pantsbuild-2.24.0.json",
         "2.26.0": "https://www.schemastore.org/pantsbuild-2.26.0.json",
         "2.30.0": "https://www.schemastore.org/pantsbuild-2.30.0.json",
-        "2.31.0": "https://www.schemastore.org/pantsbuild-2.30.0.json"
+        "2.31.0": "https://www.schemastore.org/pantsbuild-2.31.0.json",
+        "2.32.0": "https://www.schemastore.org/pantsbuild-2.32.0.json"
       }
     },
     {
@@ -10411,7 +10540,7 @@
       "name": "Qlik Talend Cloud Pipeline - Transformation Rules",
       "description": "Transformation rules definition for QTCP tasks",
       "fileMatch": ["**/qtcp_tasks/*/transformationRules.yaml"],
-      "url": "https://raw.githubusercontent.com/qlik-oss/schemas/refs/heads/main/qtcp/task.transformation.rules.schema.json"
+      "url": "https://raw.githubusercontent.com/qlik-oss/schemas/refs/heads/main/qtcp/task.transformationrules.schema.json"
     },
     {
       "name": "Qlik Talend Cloud Pipeline - Transformation Data Flow",
@@ -10457,6 +10586,21 @@
         "1.27": "https://www.schemastore.org/podman-desktop-extension-1.27.json"
       }
     },
+    {
+      "name": "index.toml (packwiz)",
+      "description": "The index file of the modpack, storing references to every file to be downloaded in the pack",
+      "url": "https://www.schemastore.org/packwiz-index.json"
+    },
+    {
+      "name": "mod.pw.toml (packwiz)",
+      "description": "A metadata file which references an external file from a URL",
+      "url": "https://www.schemastore.org/packwiz-mod.json"
+    },
+    {
+      "name": "pack.toml (packwiz)",
+      "description": "The main modpack file for a packwiz modpack",
+      "url": "https://www.schemastore.org/packwiz-pack.json"
+    },
     {
       "name": "Slang Server Configuration",
       "description": "Configuration file for the slang-server SystemVerilog language server. Documentation: https://hudson-trading.github.io/slang-server",

package/lib/browser/keyboard/keyboard-layout-service.d.ts

@@ -43,6 +43,8 @@ export declare class KeyboardLayoutService {
     protected transformKeyCode(inCode: KeyCode, mappedCode: KeyCode, keyNeedsShift: boolean): KeyCode | undefined;
     protected transformNativeLayout(nativeLayout: NativeKeyboardLayout): KeyboardLayout;
     protected shouldIncludeKey(code: string): boolean;
+    private addKeyMappings;
+    private addMacKeyMappings;
     private addKeyMapping;
     private addWindowsKeyMapping;
     protected getCharacterIndex(key: Key, shift?: boolean): number;

package/lib/browser/keyboard/keyboard-layout-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keyboard-layout-service.d.ts","sourceRoot":"","sources":["../../../src/browser/keyboard/keyboard-layout-service.ts"],"names":[],"mappings":"AAmBA,OAAO,EACH,oBAAoB,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,YAAY,EAC3F,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,WAAW,cAAc;IAC3B;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;IAChC;;;OAGG;IACH,QAAQ,CAAC,cAAc,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACvD;AAED,qBACa,qBAAqB;IAG9B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;IAGtE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE/C,OAAO,CAAC,aAAa,CAAC,CAAiB;IAEvC,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE,oBAAoB,GAAG,cAAc;IAOvE,SAAS,CAAC,qBAAqB,0BAAiC;IAEhE,IAAI,uBAAuB,IAAI,KAAK,CAAC,cAAc,CAAC,CAEnD;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC;;;;OAIG;IACH,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;IAiBxC;;;OAGG;IACH,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAqBtC;;;OAGG;IACH,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAYvC,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;IAgB7G,SAAS,CAAC,qBAAqB,CAAC,YAAY,EAAE,oBAAoB,GAAG,cAAc;IAkCnF,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQjD,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,oBAAoB;IAa5B,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM;CAQjE"}
+{"version":3,"file":"keyboard-layout-service.d.ts","sourceRoot":"","sources":["../../../src/browser/keyboard/keyboard-layout-service.ts"],"names":[],"mappings":"AAmBA,OAAO,EACH,oBAAoB,EAAE,sBAAsB,EAAE,4BAA4B,EAAE,YAAY,EAC3F,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,WAAW,cAAc;IAC3B;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC;IAChC;;;OAGG;IACH,QAAQ,CAAC,cAAc,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACvD;AAED,qBACa,qBAAqB;IAG9B,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,sBAAsB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,oBAAoB,EAAE,4BAA4B,CAAC;IAGtE,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC;IAE/C,OAAO,CAAC,aAAa,CAAC,CAAiB;IAEvC,SAAS,CAAC,YAAY,CAAC,SAAS,EAAE,oBAAoB,GAAG,cAAc;IAOvE,SAAS,CAAC,qBAAqB,0BAAiC;IAEhE,IAAI,uBAAuB,IAAI,KAAK,CAAC,cAAc,CAAC,CAEnD;IAEK,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC;;;;OAIG;IACH,cAAc,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;IAiBxC;;;OAGG;IACH,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM;IAqBtC;;;OAGG;IACH,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAYvC,SAAS,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,GAAG,OAAO,GAAG,SAAS;IAgB7G,SAAS,CAAC,qBAAqB,CAAC,YAAY,EAAE,oBAAoB,GAAG,cAAc;IAyBnF,SAAS,CAAC,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAQjD,OAAO,CAAC,cAAc;IAetB,OAAO,CAAC,iBAAiB;IAkBzB,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,oBAAoB;IAa5B,SAAS,CAAC,iBAAiB,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM;CAQjE"}

package/lib/browser/keyboard/keyboard-layout-service.js

@@ -127,19 +127,11 @@ let KeyboardLayoutService = class KeyboardLayoutService {
                     if (os_1.isWindows) {
                         this.addWindowsKeyMapping(key2KeyCode, mappedKey, keyMapping.vkey, keyMapping.value);
                     }
+                    else if (os_1.isOSX) {
+                        this.addMacKeyMappings(key2KeyCode, mappedKey, keyMapping);
+                    }
                     else {
-                        if (keyMapping.value) {
-                            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
-                        }
-                        if (keyMapping.withShift) {
-                            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
-                        }
-                        if (keyMapping.withAltGr) {
-                            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
-                        }
-                        if (keyMapping.withShiftAltGr) {
-                            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
-                        }
+                        this.addKeyMappings(key2KeyCode, mappedKey, keyMapping);
                     }
                 }
                 if (keyMapping.value) {
@@ -156,6 +148,37 @@ let KeyboardLayoutService = class KeyboardLayoutService {
         // from typing `3` in an editor.
         return !code.startsWith('Numpad');
     }
+    addKeyMappings(key2KeyCode, mappedKey, keyMapping) {
+        if (keyMapping.value) {
+            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
+        }
+        if (keyMapping.withShift) {
+            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
+        }
+        if (keyMapping.withAltGr) {
+            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
+        }
+        if (keyMapping.withShiftAltGr) {
+            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
+        }
+    }
+    addMacKeyMappings(key2KeyCode, mappedKey, keyMapping) {
+        // Dead keys (e.g. the combining-accent layer of Option+E on macOS US) await a following keystroke to
+        // compose a glyph and so never produce a committed character. They must not be registered as if they
+        // produced their display glyph, which would otherwise collide with the real key for that glyph.
+        if (keyMapping.value && !keyMapping.valueIsDeadKey) {
+            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
+        }
+        if (keyMapping.withShift && !keyMapping.withShiftIsDeadKey) {
+            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
+        }
+        if (keyMapping.withAltGr && !keyMapping.withAltGrIsDeadKey) {
+            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
+        }
+        if (keyMapping.withShiftAltGr && !keyMapping.withShiftAltGrIsDeadKey) {
+            this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
+        }
+    }
     addKeyMapping(key2KeyCode, mappedKey, value, shift, alt) {
         const key = VALUE_TO_KEY[value];
         if (key) {

package/lib/browser/keyboard/keyboard-layout-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboard-layout-service.js","sourceRoot":"","sources":["../../../src/browser/keyboard/keyboard-layout-service.ts"],"names":[],"mappings":"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E,IAAI,EAAE;IAEpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IAEpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,YAAY,EAAE;IAC9B,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE;IAC3C,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,aAAa,EAAE;IAC/B,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE;IAC5C,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,SAAS,EAAE;IAC3B,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE;IACxC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,MAAM,EAAE;IACxB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE;IACrC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,IAAI,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,SAAS,EAAE;IAC5B,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE;IAExC,IAAI,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,GAAG,EAAE;IACtB,IAAI,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACxB,IAAI,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACxB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;CAC1B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,GAA6B;IAC1C,QAAQ,EAAE,UAAG,CAAC,UAAU;IACxB,SAAS,EAAE,UAAG,CAAC,UAAU;IACzB,SAAS,EAAE,UAAG,CAAC,WAAW;IAC1B,UAAU,EAAE,UAAG,CAAC,YAAY;IAC5B,WAAW,EAAE,UAAG,CAAC,YAAY;IAC7B,WAAW,EAAE,UAAG,CAAC,aAAa;IAC9B,OAAO,EAAE,UAAG,CAAC,QAAQ;IACrB,UAAU,EAAE,UAAG,CAAC,OAAO;IACvB,OAAO,EAAE,UAAG,CAAC,OAAO;IACpB,OAAO,EAAE,UAAG,CAAC,QAAQ;IAErB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,MAAM;IAChB,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IACf,IAAI,EAAE,UAAG,CAAC,KAAK;IAEf,QAAQ,EAAE,UAAG,CAAC,SAAS;IACvB,QAAQ,EAAE,UAAG,CAAC,KAAK;IACnB,QAAQ,EAAE,UAAG,CAAC,SAAS;IACvB,QAAQ,EAAE,UAAG,CAAC,YAAY;IAC1B,QAAQ,EAAE,UAAG,CAAC,SAAS;IACvB,QAAQ,EAAE,UAAG,CAAC,aAAa;IAC3B,QAAQ,EAAE,UAAG,CAAC,KAAK;IACnB,WAAW,EAAE,UAAG,CAAC,KAAK;IACtB,YAAY,EAAE,UAAG,CAAC,KAAK;IACvB,YAAY,EAAE,UAAG,CAAC,KAAK;IACvB,aAAa,EAAE,UAAG,CAAC,MAAM;IAEzB,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,KAAK,EAAE,UAAG,CAAC,EAAE;IACb,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,MAAM,EAAE,UAAG,CAAC,GAAG;IAEf,OAAO,EAAE,UAAG,CAAC,SAAS;IACtB,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,SAAS,EAAE,UAAG,CAAC,KAAK;IACpB,UAAU,EAAE,UAAG,CAAC,SAAS;IACzB,SAAS,EAAE,UAAG,CAAC,MAAM;IACrB,QAAQ,EAAE,UAAG,CAAC,KAAK;IACnB,QAAQ,EAAE,UAAG,CAAC,OAAO;IACrB,OAAO,EAAE,UAAG,CAAC,SAAS;IACtB,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,OAAO,EAAE,UAAG,CAAC,IAAI;IACjB,SAAS,EAAE,UAAG,CAAC,MAAM;IACrB,SAAS,EAAE,UAAG,CAAC,MAAM;IACrB,OAAO,EAAE,UAAG,CAAC,UAAU;IACvB,KAAK,EAAE,UAAG,CAAC,QAAQ;IACnB,QAAQ,EAAE,UAAG,CAAC,WAAW;IACzB,OAAO,EAAE,UAAG,CAAC,UAAU;IAEvB,UAAU,EAAE,UAAG,CAAC,QAAQ;IACxB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,UAAU,EAAE,UAAG,CAAC,MAAM;IACtB,WAAW,EAAE,UAAG,CAAC,QAAQ;IACzB,MAAM,EAAE,UAAG,CAAC,GAAG;IACf,WAAW,EAAE,UAAG,CAAC,QAAQ;IACzB,UAAU,EAAE,UAAG,CAAC,OAAO;IACvB,SAAS,EAAE,UAAG,CAAC,MAAM;CACxB,CAAC"}
+{"version":3,"file":"keyboard-layout-service.js","sourceRoot":"","sources":["../../../src/browser/keyboard/keyboard-layout-service.ts"],"names":[],"mappings":"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AAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;IACpC,GAAG,EAAE,EAAE,GAAG,EAAE,UAAG,CAAC,KAAK,EAAE;IACvB,GAAG,EAAE,EAAE,G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"}

package/lib/browser/keyboard/keyboard-layout-service.spec.js

@@ -87,6 +87,32 @@ describe('keyboard layout service', function () {
         chai.expect(indentLine.toString()).to.equal('meta+shift+alt+ctrl+-');
         chai.expect(service.getKeyboardCharacter(indentLine.key)).to.equal(')');
     });
+    it('does not let a dead key hijack a keybinding on Mac (#17677)', async () => {
+        // On macOS US Extended, Option+P is the "combining comma below" dead key whose display glyph
+        // is reported as ',' by native-keymap. Since KeyP is reported before Comma, without honoring the
+        // dead-key flags it would claim the ',' slot and resolve ctrlcmd+, to Cmd+Ctrl+Option+P.
+        const macUSExtended = {
+            info: { id: 'com.apple.keylayout.USExtended', lang: 'en' },
+            mapping: {
+                KeyP: {
+                    value: 'p', valueIsDeadKey: false,
+                    withShift: 'P', withShiftIsDeadKey: false,
+                    withAltGr: ',', withAltGrIsDeadKey: true,
+                    withShiftAltGr: '̦', withShiftAltGrIsDeadKey: true
+                },
+                Comma: {
+                    value: ',', valueIsDeadKey: false,
+                    withShift: '<', withShiftIsDeadKey: false,
+                    withAltGr: '≤', withAltGrIsDeadKey: false,
+                    withShiftAltGr: '¯', withShiftAltGrIsDeadKey: false
+                }
+            }
+        };
+        const service = await setup(macUSExtended, 'mac');
+        const openSettings = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('Comma+M1'));
+        chai.expect(openSettings.toString()).to.equal('meta+,');
+        chai.expect(service.getKeyboardCharacter(openSettings.key)).to.equal(',');
+    });
     it('resolves correct key bindings with German Windows layout', async () => {
         const winGerman = require('../../../src/common/keyboard/layouts/de-German-pc.json');
         const service = await setup(winGerman, 'win');

package/lib/browser/keyboard/keyboard-layout-service.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"keyboard-layout-service.spec.js","sourceRoot":"","sources":["../../../src/browser/keyboard/keyboard-layout-service.spec.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"keyboard-layout-service.spec.js","sourceRoot":"","sources":["../../../src/browser/keyboard/keyboard-layout-service.spec.ts"],"names":[],"mappings":"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"}

package/lib/browser/preferences/preference-contribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"preference-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/preferences/preference-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAS7F,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CASxE;AAED;;;GAGG;AACH,MAAM,WAAW,mCAAoC,SAAQ,yBAAyB;IAClF,WAAW,EAAE;QAET,CAAC,cAAc,EAAE,MAAM,GAAG,GAAG,CAAA;KAChC,CAAA;CACJ;AACD,yBAAiB,mCAAmC,CAAC;IACjD,SAAgB,EAAE,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,IAAI,mCAAmC,CAEnG;CACJ"}
+{"version":3,"file":"preference-contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/preferences/preference-contribution.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAGvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAC;AAU7F,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,GAAG,IAAI,CAgBxE;AAED;;;GAGG;AACH,MAAM,WAAW,mCAAoC,SAAQ,yBAAyB;IAClF,WAAW,EAAE;QAET,CAAC,cAAc,EAAE,MAAM,GAAG,GAAG,CAAA;KAChC,CAAA;CACJ;AACD,yBAAiB,mCAAmC,CAAC;IACjD,SAAgB,EAAE,CAAC,MAAM,EAAE,yBAAyB,GAAG,MAAM,IAAI,mCAAmC,CAEnG;CACJ"}

package/lib/browser/preferences/preference-contribution.js

@@ -23,15 +23,23 @@ const types_1 = require("../../common/types");
 const preference_schema_service_1 = require("../../common/preferences/preference-schema-service");
 const preference_schema_1 = require("../../common/preferences/preference-schema");
 const defaults_preference_provider_1 = require("../../common/preferences/defaults-preference-provider");
+const session_preference_provider_1 = require("../../common/preferences/session-preference-provider");
 const preference_language_override_service_1 = require("../../common/preferences/preference-language-override-service");
 const frontend_config_preference_contributions_1 = require("./frontend-config-preference-contributions");
 const preference_configurations_1 = require("../../common/preferences/preference-configurations");
 function bindPreferenceSchemaProvider(bind) {
     (0, preference_configurations_1.bindPreferenceConfigurations)(bind);
-    bind(preference_scope_1.ValidPreferenceScopes).toConstantValue([preference_scope_1.PreferenceScope.Default, preference_scope_1.PreferenceScope.User, preference_scope_1.PreferenceScope.Workspace, preference_scope_1.PreferenceScope.Folder]);
+    bind(preference_scope_1.ValidPreferenceScopes).toConstantValue([
+        preference_scope_1.PreferenceScope.Default,
+        preference_scope_1.PreferenceScope.User,
+        preference_scope_1.PreferenceScope.Workspace,
+        preference_scope_1.PreferenceScope.Folder,
+        preference_scope_1.PreferenceScope.Session
+    ]);
     bind(preference_schema_service_1.PreferenceSchemaServiceImpl).toSelf().inSingletonScope();
     bind(preference_schema_1.PreferenceSchemaService).toService(preference_schema_service_1.PreferenceSchemaServiceImpl);
     bind(common_1.PreferenceProvider).to(defaults_preference_provider_1.DefaultsPreferenceProvider).inSingletonScope().whenTargetNamed(preference_scope_1.PreferenceScope.Default);
+    bind(common_1.PreferenceProvider).to(session_preference_provider_1.SessionPreferenceProvider).inSingletonScope().whenTargetNamed(preference_scope_1.PreferenceScope.Session);
     bind(preference_language_override_service_1.PreferenceLanguageOverrideService).toSelf().inSingletonScope();
     (0, common_1.bindRootContributionProvider)(bind, preference_schema_1.PreferenceContribution);
     bind(preference_schema_1.PreferenceContribution).to(frontend_config_preference_contributions_1.FrontendConfigPreferenceContribution).inSingletonScope();

package/lib/browser/preferences/preference-contribution.js.map

@@ -1 +1 @@
-{"version":3,"file":"preference-contribution.js","sourceRoot":"","sources":["../../../src/browser/preferences/preference-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAchF,oEASC;AApBD,yCAAgF;AAChF,gFAAmG;AAEnG,8CAA8C;AAC9C,kGAAiG;AACjG,kFAA6G;AAC7G,wGAAmG;AACnG,wHAAkH;AAClH,yGAAkG;AAClG,kGAAkG;AAElG,SAAgB,4BAA4B,CAAC,IAAqB;IAC9D,IAAA,wDAA4B,EAAC,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,wCAAqB,CAAC,CAAC,eAAe,CAAC,CAAC,kCAAe,CAAC,OAAO,EAAE,kCAAe,CAAC,IAAI,EAAE,kCAAe,CAAC,SAAS,EAAE,kCAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IAChJ,IAAI,CAAC,uDAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,2CAAuB,CAAC,CAAC,SAAS,CAAC,uDAA2B,CAAC,CAAC;IACrE,IAAI,CAAC,2BAAkB,CAAC,CAAC,EAAE,CAAC,yDAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC,eAAe,CAAC,kCAAe,CAAC,OAAO,CAAC,CAAC;IACpH,IAAI,CAAC,wEAAiC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAA,qCAA4B,EAAC,IAAI,EAAE,0CAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,0CAAsB,CAAC,CAAC,EAAE,CAAC,+EAAoC,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC7F,CAAC;AAYD,IAAiB,mCAAmC,CAInD;AAJD,WAAiB,mCAAmC;IAChD,SAAgB,EAAE,CAAC,MAAiC;QAChD,OAAO,IAAA,gBAAQ,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAFe,sCAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,mCAAmC,mDAAnC,mCAAmC,QAInD"}
+{"version":3,"file":"preference-contribution.js","sourceRoot":"","sources":["../../../src/browser/preferences/preference-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAehF,oEAgBC;AA5BD,yCAAgF;AAChF,gFAAmG;AAEnG,8CAA8C;AAC9C,kGAAiG;AACjG,kFAA6G;AAC7G,wGAAmG;AACnG,sGAAiG;AACjG,wHAAkH;AAClH,yGAAkG;AAClG,kGAAkG;AAElG,SAAgB,4BAA4B,CAAC,IAAqB;IAC9D,IAAA,wDAA4B,EAAC,IAAI,CAAC,CAAC;IACnC,IAAI,CAAC,wCAAqB,CAAC,CAAC,eAAe,CAAC;QACxC,kCAAe,CAAC,OAAO;QACvB,kCAAe,CAAC,IAAI;QACpB,kCAAe,CAAC,SAAS;QACzB,kCAAe,CAAC,MAAM;QACtB,kCAAe,CAAC,OAAO;KAC1B,CAAC,CAAC;IACH,IAAI,CAAC,uDAA2B,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IAC9D,IAAI,CAAC,2CAAuB,CAAC,CAAC,SAAS,CAAC,uDAA2B,CAAC,CAAC;IACrE,IAAI,CAAC,2BAAkB,CAAC,CAAC,EAAE,CAAC,yDAA0B,CAAC,CAAC,gBAAgB,EAAE,CAAC,eAAe,CAAC,kCAAe,CAAC,OAAO,CAAC,CAAC;IACpH,IAAI,CAAC,2BAAkB,CAAC,CAAC,EAAE,CAAC,uDAAyB,CAAC,CAAC,gBAAgB,EAAE,CAAC,eAAe,CAAC,kCAAe,CAAC,OAAO,CAAC,CAAC;IACnH,IAAI,CAAC,wEAAiC,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;IACpE,IAAA,qCAA4B,EAAC,IAAI,EAAE,0CAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,0CAAsB,CAAC,CAAC,EAAE,CAAC,+EAAoC,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC7F,CAAC;AAYD,IAAiB,mCAAmC,CAInD;AAJD,WAAiB,mCAAmC;IAChD,SAAgB,EAAE,CAAC,MAAiC;QAChD,OAAO,IAAA,gBAAQ,EAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IACxC,CAAC;IAFe,sCAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,mCAAmC,mDAAnC,mCAAmC,QAInD"}