npm - @theia/core - Versions diffs - 1.73.0 → 1.73.1 - Mend

@theia/core 1.73.0 → 1.73.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (33) hide show

package/README.md +6 -6
package/i18n/nls.cs.json +6 -1
package/i18n/nls.de.json +6 -1
package/i18n/nls.es.json +6 -1
package/i18n/nls.fr.json +6 -1
package/i18n/nls.hu.json +6 -1
package/i18n/nls.it.json +6 -1
package/i18n/nls.ja.json +6 -1
package/i18n/nls.json +6 -1
package/i18n/nls.ko.json +6 -1
package/i18n/nls.pl.json +6 -1
package/i18n/nls.pt-br.json +6 -1
package/i18n/nls.ru.json +6 -1
package/i18n/nls.tr.json +6 -1
package/i18n/nls.zh-cn.json +6 -1
package/i18n/nls.zh-tw.json +6 -1
package/lib/browser/catalog.json +63 -5
package/lib/browser/keyboard/keyboard-layout-service.d.ts +2 -0
package/lib/browser/keyboard/keyboard-layout-service.d.ts.map +1 -1
package/lib/browser/keyboard/keyboard-layout-service.js +35 -12
package/lib/browser/keyboard/keyboard-layout-service.js.map +1 -1
package/lib/browser/keyboard/keyboard-layout-service.spec.js +26 -0
package/lib/browser/keyboard/keyboard-layout-service.spec.js.map +1 -1
package/lib/common/logger.d.ts.map +1 -1
package/lib/common/logger.js +11 -1
package/lib/common/logger.js.map +1 -1
package/lib/common/logger.spec.js +46 -0
package/lib/common/logger.spec.js.map +1 -1
package/package.json +6 -6
package/src/browser/keyboard/keyboard-layout-service.spec.ts +28 -0
package/src/browser/keyboard/keyboard-layout-service.ts +38 -14
package/src/common/logger.spec.ts +62 -1
package/src/common/logger.ts +13 -4

package/README.md CHANGED Viewed

@@ -85,12 +85,12 @@ export class SomeClass {
   - `@lumino/signaling` (from [`@lumino/signaling@^2.1.5`](https://www.npmjs.com/package/@lumino/signaling))
   - `@lumino/virtualdom` (from [`@lumino/virtualdom@^2.0.4`](https://www.npmjs.com/package/@lumino/virtualdom))
   - `@lumino/widgets` (from [`@lumino/widgets@2.7.5`](https://www.npmjs.com/package/@lumino/widgets/v/2.7.5))
-  - `@theia/application-package` (from [`@theia/application-package@1.73.0`](https://www.npmjs.com/package/@theia/application-package/v/1.73.0))
-  - `@theia/application-package/lib/api` (from [`@theia/application-package@1.73.0`](https://www.npmjs.com/package/@theia/application-package/v/1.73.0))
-  - `@theia/application-package/lib/environment` (from [`@theia/application-package@1.73.0`](https://www.npmjs.com/package/@theia/application-package/v/1.73.0))
-  - `@theia/request` (from [`@theia/request@1.73.0`](https://www.npmjs.com/package/@theia/request/v/1.73.0))
-  - `@theia/request/lib/proxy` (from [`@theia/request@1.73.0`](https://www.npmjs.com/package/@theia/request/v/1.73.0))
-  - `@theia/request/lib/node-request-service` (from [`@theia/request@1.73.0`](https://www.npmjs.com/package/@theia/request/v/1.73.0))
+  - `@theia/application-package` (from [`@theia/application-package@1.73.1`](https://www.npmjs.com/package/@theia/application-package/v/1.73.1))
+  - `@theia/application-package/lib/api` (from [`@theia/application-package@1.73.1`](https://www.npmjs.com/package/@theia/application-package/v/1.73.1))
+  - `@theia/application-package/lib/environment` (from [`@theia/application-package@1.73.1`](https://www.npmjs.com/package/@theia/application-package/v/1.73.1))
+  - `@theia/request` (from [`@theia/request@1.73.1`](https://www.npmjs.com/package/@theia/request/v/1.73.1))
+  - `@theia/request/lib/proxy` (from [`@theia/request@1.73.1`](https://www.npmjs.com/package/@theia/request/v/1.73.1))
+  - `@theia/request/lib/node-request-service` (from [`@theia/request@1.73.1`](https://www.npmjs.com/package/@theia/request/v/1.73.1))
   - `fs-extra` (from [`fs-extra@^4.0.3`](https://www.npmjs.com/package/fs-extra))
   - `fuzzy` (from [`fuzzy@^0.1.3`](https://www.npmjs.com/package/fuzzy))
   - `inversify` (from [`inversify@^6.2.2`](https://www.npmjs.com/package/inversify))

package/i18n/nls.cs.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Nebylo možné najít odpovídající jazykový model. Zkontrolujte prosím nastavení!",
         "couldNotFindReadyLMforAgent": "Nenašel jsem připravený jazykový model pro agent {0}. Zkontrolujte prosím nastavení!",
         "customAgents": {
-          "migrationResult": "Migrace vlastních agentů: {0} migrováno, {1} selhalo, {2} starší soubor customAgents.yml zálohován do souboru .bak, {3} přepsání výzev začleněno do souboru agent.md.",
+          "migratePrompt": {
+            "message": "Vaši vlastní agenti stále používají starší formát `customAgents.yml`. Doporučujeme je převést do nového formátu pro jednotlivé agenty (`agents/<id>/agent.md`), který bude v budoucnu používat {0}. Každý agent dostane svůj vlastní soubor vedle vašeho souboru `customAgents.yml` a původní soubor zůstane zachován jako záloha `customAgents.yml.bak`."
+          },
+          "migrationResult": {
+            "empty": "Migrace vlastního agenta: není co migrovat."
+          },
           "rerunMigration": "Znovu spustit migraci vlastního agenta"
         },
         "defaultAgent": {

package/i18n/nls.de.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Es konnte kein passendes Sprachmodell gefunden werden. Bitte überprüfen Sie Ihre Einstellungen!",
         "couldNotFindReadyLMforAgent": "Es konnte kein fertiges Sprachmodell für die Agenten {0} gefunden werden. Bitte überprüfen Sie Ihre Einstellungen!",
         "customAgents": {
-          "migrationResult": "Migration der benutzerdefinierten Agenten: {0} wurde migriert, {1} schlug fehl, {2} die alte Datei „customAgents.yml“ wurde als .bak-Datei gesichert, {3} die Eingabeaufforderungs-Überschreibungen wurden in „agent.md“ integriert.",
+          "migratePrompt": {
+            "message": "Ihre benutzerdefinierten Agenten verwenden weiterhin das ältere Format `customAgents.yml`. Wir empfehlen, sie auf das neue, agentenspezifische Format (`agents/<id>/agent.md`) zu migrieren, das {0} künftig verwendet. Jeder Agent erhält eine eigene Datei neben Ihrer `customAgents.yml`, und das Original wird als Sicherungskopie unter dem Namen `customAgents.yml.bak` beibehalten."
+          },
+          "migrationResult": {
+            "empty": "Migration des benutzerdefinierten Agenten: Es gibt nichts zu migrieren."
+          },
           "rerunMigration": "Migration des benutzerdefinierten Agenten erneut ausführen"
         },
         "defaultAgent": {

package/i18n/nls.es.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "No se ha encontrado un modelo de idioma coincidente. ¡Comprueba tu configuración!",
         "couldNotFindReadyLMforAgent": "No se ha encontrado un modelo de idioma listo para el agente {0}. ¡Comprueba tu configuración!",
         "customAgents": {
-          "migrationResult": "Migración de agentes personalizados: {0} migrado, {1} fallido, {2} el archivo legacy customAgents.yml copiado en .bak, {3} las modificaciones de las indicaciones integradas en agent.md.",
+          "migratePrompt": {
+            "message": "Tus agentes personalizados siguen utilizando el formato antiguo `customAgents.yml`. Recomendamos migrarlos al nuevo formato por agente (`agents/<id>/agent.md`), que {0} utilizará en adelante. Cada agente tiene su propio archivo junto a tu `customAgents.yml`, y el original se conserva como copia de seguridad con el nombre `customAgents.yml.bak`."
+          },
+          "migrationResult": {
+            "empty": "Migración de agentes personalizados: no hay nada que migrar."
+          },
           "rerunMigration": "Volver a ejecutar la migración de custom-agent"
         },
         "defaultAgent": {

package/i18n/nls.fr.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Impossible de trouver un modèle linguistique correspondant. Veuillez vérifier votre configuration !",
         "couldNotFindReadyLMforAgent": "Impossible de trouver un modèle linguistique prêt à l'emploi pour l'{0} de l'agent. Veuillez vérifier votre configuration !",
         "customAgents": {
-          "migrationResult": "Migration des agents personnalisés : {0} migré, {1} a échoué, {2} le fichier legacy customAgents.yml a été sauvegardé dans .bak, {3} les remplacements d'invite ont été intégrés dans agent.md.",
+          "migratePrompt": {
+            "message": "Vos agents personnalisés utilisent toujours l'ancien format `customAgents.yml`. Nous vous recommandons de les migrer vers le nouveau format par agent (`agents/<id>/agent.md`), que {0} utilisera désormais. Chaque agent dispose de son propre fichier à côté de votre fichier `customAgents.yml`, et l'original est conservé sous forme de sauvegarde dans le fichier `customAgents.yml.bak`."
+          },
+          "migrationResult": {
+            "empty": "Migration de l'agent personnalisé : rien à migrer."
+          },
           "rerunMigration": "Relancer la migration de l'agent personnalisé"
         },
         "defaultAgent": {

package/i18n/nls.hu.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Nem találtunk megfelelő nyelvi modellt. Kérjük, ellenőrizze a beállításokat!",
         "couldNotFindReadyLMforAgent": "Nem találtunk kész nyelvi modellt az agent {0}hez. Kérjük, ellenőrizze a beállításokat!",
         "customAgents": {
-          "migrationResult": "Egyéni ügynökök áttelepítése: {0} áttelepítve, {1} sikertelen, {2} a régi customAgents.yml fájl .bak kiterjesztéssel mentve, {3} a parancssori felugró ablakok felülírásai beépítve az agent.md fájlba.",
+          "migratePrompt": {
+            "message": "Az egyéni ügynökei továbbra is a régebbi `customAgents.yml` formátumot használják. Javasoljuk, hogy migrálja őket az új, ügynökönkénti formátumra (`agents/<id>/agent.md`), amelyet a {0} a jövőben fog használni. Minden ügynök saját fájlt kap a `customAgents.yml` fájl mellett, az eredeti pedig `customAgents.yml.bak` néven biztonsági másolatként megmarad."
+          },
+          "migrationResult": {
+            "empty": "Egyéni ügynök áttelepítése: nincs mit áttelepíteni."
+          },
           "rerunMigration": "A custom-agent migráció újbóli futtatása"
         },
         "defaultAgent": {

package/i18n/nls.it.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Impossibile trovare un modello linguistico corrispondente. Controlla la tua configurazione!",
         "couldNotFindReadyLMforAgent": "Impossibile trovare un modello linguistico pronto per l'{0} dell'agente. Controlla la tua configurazione!",
         "customAgents": {
-          "migrationResult": "Migrazione degli agenti personalizzati: {0} migrato, {1} non riuscito, {2} file legacy customAgents.yml salvato in formato .bak, {3} le sostituzioni dei prompt integrate in agent.md.",
+          "migratePrompt": {
+            "message": "I tuoi agenti personalizzati utilizzano ancora il vecchio formato `customAgents.yml`. Si consiglia di migrarli al nuovo formato per singolo agente (`agents/<id>/agent.md`), che {0} utilizzerà d'ora in poi. Ogni agente avrà il proprio file accanto al file `customAgents.yml`, mentre l'originale verrà conservato come backup con il nome `customAgents.yml.bak`."
+          },
+          "migrationResult": {
+            "empty": "Migrazione dell’agente personalizzato: nulla da migrare."
+          },
           "rerunMigration": "Esegui nuovamente la migrazione di custom-agent"
         },
         "defaultAgent": {

package/i18n/nls.ja.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "一致する言語モデルが見つかりませんでした。設定を確認してください！",
         "couldNotFindReadyLMforAgent": "エージェント{0}用の既製言語モデルが見つかりませんでした。設定を確認してください！",
         "customAgents": {
-          "migrationResult": "カスタムエージェントの移行:{0} が移行済み、{1} が失敗、{2} のレガシー版 customAgents.yml が .bak にバックアップ済み、{3} のプロンプトのオーバーライドが agent.md に統合済み。",
+          "migratePrompt": {
+            "message": "カスタムエージェントは、依然として旧形式の `customAgents.yml` を使用しています。 {0}が今後採用する、エージェントごとの新しい形式(`agents/<id>/agent.md`)への移行をお勧めします。各エージェントには、`customAgents.yml`の隣に個別のファイルが作成され、元のファイルは`customAgents.yml.bak`としてバックアップとして保持されます。"
+          },
+          "migrationResult": {
+            "empty": "カスタムエージェントの移行:移行対象はありません。"
+          },
           "rerunMigration": "カスタムエージェントの移行を再実行する"
         },
         "defaultAgent": {

package/i18n/nls.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Couldn't find a matching language model. Please check your setup!",
         "couldNotFindReadyLMforAgent": "Couldn't find a ready language model for agent {0}. Please check your setup!",
         "customAgents": {
-          "migrationResult": "Custom-agent migration: {0} migrated, {1} failed, {2} legacy customAgents.yml backed up to .bak, {3} prompt overrides folded into agent.md.",
+          "migratePrompt": {
+            "message": "Your custom agents still use the older `customAgents.yml` format. We recommend migrating them to the new per-agent format (`agents/<id>/agent.md`), which {0} uses going forward. Each agent gets its own file next to your `customAgents.yml`, and the original is kept as a `customAgents.yml.bak` backup."
+          },
+          "migrationResult": {
+            "empty": "Custom-agent migration: nothing to migrate."
+          },
           "rerunMigration": "Re-run custom-agent migration"
         },
         "defaultAgent": {

package/i18n/nls.ko.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "일치하는 언어 모델을 찾을 수 없습니다. 설정을 확인해 주세요!",
         "couldNotFindReadyLMforAgent": "에이전트{0}용 준비된 언어 모델을 찾을 수 없습니다. 설정을 확인해 주세요!",
         "customAgents": {
-          "migrationResult": "커스텀 에이전트 마이그레이션: {0} 마이그레이션 완료, {1} 실패, {2} 기존 customAgents.yml 파일을 .bak로 백업, {3} 프롬프트 재정의 내용이 agent.md에 통합됨.",
+          "migratePrompt": {
+            "message": "사용자 정의 에이전트는 여전히 기존의 `customAgents.yml` 형식을 사용합니다. {0}에서 앞으로 사용할 새로운 에이전트별 형식(`agents/<id>/agent.md`)으로 마이그레이션하는 것을 권장합니다. 각 에이전트는 `customAgents.yml` 파일 옆에 별도의 파일을 갖게 되며, 원본 파일은 `customAgents.yml.bak`라는 이름으로 백업으로 보관됩니다."
+          },
+          "migrationResult": {
+            "empty": "사용자 지정 에이전트 마이그레이션: 마이그레이션할 항목이 없습니다."
+          },
           "rerunMigration": "사용자 지정 에이전트 마이그레이션 다시 실행"
         },
         "defaultAgent": {

package/i18n/nls.pl.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Nie znaleziono pasującego modelu językowego. Sprawdź ustawienia!",
         "couldNotFindReadyLMforAgent": "Nie można znaleźć gotowego modelu językowego dla agenta {0}. Sprawdź swoją konfigurację!",
         "customAgents": {
-          "migrationResult": "Migracja niestandardowych agentów: {0} – migracja zakończona sukcesem, {1} – migracja nie powiodła się, {2} – kopia zapasowa starego pliku customAgents.yml zapisana w formacie .bak, {3} – nadpisania monitów włączone do pliku agent.md.",
+          "migratePrompt": {
+            "message": "Twoje niestandardowe agenty nadal korzystają ze starszego formatu `customAgents.yml`. Zalecamy migrację do nowego formatu dla poszczególnych agentów (`agents/<id>/agent.md`), z którego od tej pory korzysta {0}. Każdy agent otrzymuje własny plik umieszczony obok pliku `customAgents.yml`, a oryginał jest zachowywany jako kopia zapasowa o nazwie `customAgents.yml.bak`."
+          },
+          "migrationResult": {
+            "empty": "Migracja niestandardowego agenta: nie ma nic do migracji."
+          },
           "rerunMigration": "Ponowne uruchomienie migracji niestandardowego agenta"
         },
         "defaultAgent": {

package/i18n/nls.pt-br.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Não foi possível encontrar um modelo de idioma correspondente. Verifique sua configuração!",
         "couldNotFindReadyLMforAgent": "Não foi possível encontrar um modelo de idioma pronto para o agente {0}. Verifique sua configuração!",
         "customAgents": {
-          "migrationResult": "Migração do custom-agent: {0} migrado, {1} falhou, {2} o arquivo customAgents.yml legado foi copiado para .bak, {3} as substituições de prompt foram incorporadas ao agent.md.",
+          "migratePrompt": {
+            "message": "Seus agentes personalizados ainda utilizam o formato antigo `customAgents.yml`. Recomendamos migrá-los para o novo formato por agente (`agents/<id>/agent.md`), que o {0} passará a utilizar daqui para frente. Cada agente recebe seu próprio arquivo ao lado do seu `customAgents.yml`, e o original é mantido como um backup `customAgents.yml.bak`."
+          },
+          "migrationResult": {
+            "empty": "Migração de agente personalizado: nada a ser migrado."
+          },
           "rerunMigration": "Reexecutar a migração do agente personalizado"
         },
         "defaultAgent": {

package/i18n/nls.ru.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Не удалось найти подходящую языковую модель. Проверьте настройки!",
         "couldNotFindReadyLMforAgent": "Не удалось найти готовую языковую модель для агента {0}. Проверьте настройки!",
         "customAgents": {
-          "migrationResult": "Миграция пользовательских агентов: {0} — миграция выполнена, {1} — сбой, {2} — резервная копия устаревшего файла customAgents.yml сохранена в формате .bak, {3} — переопределения командной строки включены в файл agent.md.",
+          "migratePrompt": {
+            "message": "Ваши пользовательские агенты по-прежнему используют старый формат `customAgents.yml`. Мы рекомендуем перенести их в новый формат, отдельный для каждого агента (`agents/<id>/agent.md`), который в дальнейшем будет использоваться в {0}. Каждому агенту выделяется собственный файл, расположенный рядом с вашим файлом `customAgents.yml`, а исходный файл сохраняется в качестве резервной копии с именем `customAgents.yml.bak`."
+          },
+          "migrationResult": {
+            "empty": "Миграция пользовательских агентов: мигрировать нечего."
+          },
           "rerunMigration": "Повторный запуск миграции с помощью пользовательского агента"
         },
         "defaultAgent": {

package/i18n/nls.tr.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "Eşleşen bir dil modeli bulunamadı. Lütfen ayarlarınızı kontrol edin!",
         "couldNotFindReadyLMforAgent": "{0} ajanı için hazır bir dil modeli bulunamadı. Lütfen ayarlarınızı kontrol edin!",
         "customAgents": {
-          "migrationResult": "Özel ajan geçişi: {0} geçişi tamamlandı, {1} başarısız oldu, {2} eski customAgents.yml dosyası .bak uzantısıyla yedeklendi, {3} komut istemi geçersiz kılmaları agent.md dosyasına aktarıldı.",
+          "migratePrompt": {
+            "message": "Özel ajanlarınız hâlâ eski `customAgents.yml` biçimini kullanmaktadır. {0}'ın bundan sonra kullanacağı yeni ajan başına biçime (`agents/<id>/agent.md`) geçmenizi öneririz. Her ajan, `customAgents.yml` dosyanızın yanında kendine ait bir dosya alır ve orijinal dosya `customAgents.yml.bak` adıyla yedek olarak saklanır."
+          },
+          "migrationResult": {
+            "empty": "Özel ajan geçişi: geçirilecek hiçbir şey yoktur."
+          },
           "rerunMigration": "Özel ajan geçişini yeniden çalıştır"
         },
         "defaultAgent": {

package/i18n/nls.zh-cn.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "未找到匹配的语言模型。请检查您的设置！",
         "couldNotFindReadyLMforAgent": "未能为代理{0}找到现成的语言模型。请检查您的设置！",
         "customAgents": {
-          "migrationResult": "自定义代理迁移:{0} 已迁移,{1} 迁移失败,{2} 旧版 customAgents.yml 已备份至 .bak,{3} 提示信息覆盖内容已合并到 agent.md 中。",
+          "migratePrompt": {
+            "message": "您的自定义代理仍使用旧版 `customAgents.yml` 格式。 我们建议将其迁移到新的按代理分隔的格式(`agents/<id>/agent.md`),{0} 今后将采用该格式。每个代理都会在您的 `customAgents.yml` 文件旁边拥有自己的文件,而原始文件将作为 `customAgents.yml.bak` 备份保留下来。"
+          },
+          "migrationResult": {
+            "empty": "自定义代理迁移:无需迁移。"
+          },
           "rerunMigration": "重新运行自定义代理迁移"
         },
         "defaultAgent": {

package/i18n/nls.zh-tw.json CHANGED Viewed

@@ -142,7 +142,12 @@
         "couldNotFindMatchingLM": "未能找到相符的語言模型。請檢查您的設定！",
         "couldNotFindReadyLMforAgent": "無法為代理程式{0}找到現成的語言模型。請檢查您的設定！",
         "customAgents": {
-          "migrationResult": "自訂代理程式遷移:{0} 已遷移,{1} 失敗,{2} 舊版 customAgents.yml 已備份至 .bak,{3} 提示覆寫內容已整合至 agent.md。",
+          "migratePrompt": {
+            "message": "您的自訂代理程式仍使用舊版的 `customAgents.yml` 格式。 我們建議將它們遷移至新的「單一代理程式」格式(`agents/<id>/agent.md`),此為 {0} 未來將採用的格式。每個代理程式都會在您的 `customAgents.yml` 旁邊擁有專屬檔案,而原始檔案則會保留為 `customAgents.yml.bak` 備份。"
+          },
+          "migrationResult": {
+            "empty": "自訂代理程式遷移:無需遷移的項目。"
+          },
           "rerunMigration": "重新執行自訂代理程式遷移"
         },
         "defaultAgent": {

package/lib/browser/catalog.json CHANGED Viewed

@@ -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",
@@ -552,12 +558,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 +2014,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",
@@ -4208,8 +4221,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",
@@ -4922,6 +4936,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",
@@ -5009,6 +5029,24 @@
       "fileMatch": ["**/nextest/config.toml"],
       "url": "https://nexte.st/schemas/user-config.json"
     },
+    {
+      "name": "nf-core module environment.yml",
+      "description": "Conda environment file for an nf-core Nextflow module",
+      "fileMatch": ["**/modules/nf-core/**/environment.yml"],
+      "url": "https://raw.githubusercontent.com/nf-core/modules/master/modules/environment-schema.json"
+    },
+    {
+      "name": "nf-core module meta.yml",
+      "description": "Metadata file for an nf-core Nextflow module",
+      "fileMatch": ["**/modules/nf-core/**/meta.yml"],
+      "url": "https://raw.githubusercontent.com/nf-core/modules/master/modules/meta-schema.json"
+    },
+    {
+      "name": "nf-core subworkflow meta.yml",
+      "description": "Metadata file for an nf-core Nextflow subworkflow",
+      "fileMatch": ["**/subworkflows/nf-core/**/meta.yml"],
+      "url": "https://raw.githubusercontent.com/nf-core/modules/master/subworkflows/yaml-schema.json"
+    },
     {
       "name": "nFPM",
       "description": "nFPM configuration file",
@@ -6526,6 +6564,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",
@@ -6878,6 +6922,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",
@@ -8829,7 +8886,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",
@@ -8842,7 +8899,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"
       }
     },
     {

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

@@ -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 CHANGED Viewed

	@@ -1 +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"}
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;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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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,EAA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"}
1	+ {"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 CHANGED Viewed

@@ -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 CHANGED Viewed

	@@ -1 +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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"}
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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"}

package/lib/common/logger.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAiB,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAC3F,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAIrD,OAAO,EACH,QAAQ,EAAE,cAAc,EAC3B,CAAC;AAGF,eAAO,IAAI,MAAM,EAAE,OAAO,CAAC;AAE3B;;;;GAIG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAKtC;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAWpD;AAED,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,IAAI,CAAC;AAC3D,MAAM,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;~~AAE1C~~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~~IAU5E~~,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;~~IAQhD~~,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,GAAG,GAAG,GAAG;IA6BjC,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAI3C,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAG3B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAGxB,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAG3B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAGxB,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAG1B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAGvB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IAG1B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAGvB,IAAI,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1D,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAG3B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAGxB,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC;IAG3B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAGxB,KAAK,CAAC,GAAG,EAAE,GAAG,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI3D,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;CAU/B"}
1	+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":"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"}

package/lib/common/logger.js CHANGED Viewed

@@ -46,6 +46,8 @@ function setRootLogger(aLogger) {
     console.trace = log.bind(undefined, logger_protocol_1.LogLevel.TRACE);
     console.log = log.bind(undefined, logger_protocol_1.LogLevel.INFO);
 }
+/** Shared no-op {@link Log} returned for a disabled level so that callers neither block nor emit. */
+const nullLogger = () => { };
 exports.LoggerFactory = Symbol('LoggerFactory');
 exports.LoggerName = Symbol('LoggerName');
 exports.ILogger = Symbol('ILogger');
@@ -104,6 +106,9 @@ let Logger = class Logger {
     }
     log(logLevel, arg2, ...params) {
         return this.getLog(logLevel).then(log => {
+            if (log === nullLogger) {
+                return;
+            }
             if (typeof arg2 === 'function') {
                 const loggable = arg2;
                 loggable(log);
@@ -114,7 +119,12 @@ let Logger = class Logger {
         });
     }
     getLog(logLevel) {
-        return this.ifEnabled(logLevel).then(() => this.created.then(() => (message, ...params) => this.server.log(this.name, logLevel, this.format(message), params.map(p => this.format(p)))));
+        return this.isEnabled(logLevel).then(enabled => {
+            if (!enabled) {
+                return nullLogger;
+            }
+            return this.created.then(() => (message, ...params) => this.server.log(this.name, logLevel, this.format(message), params.map(p => this.format(p))));
+        });
     }
     format(value) {
         switch (typeof value) {

package/lib/common/logger.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.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;;;AAqBhF,0CAKC;AAED,sCAWC;;AArCD,yCAAwE;AACxE,qDAAiD;AACjD,uDAA2F;AAMvF,yFANoB,0BAAQ,OAMpB;AAAE,+FANmC,gCAAc,OAMnC;AAL5B,yDAAqD;AAWrD;;;;GAIG;AACH,SAAgB,eAAe;IAC3B,IAAI,cAAM,KAAK,SAAS,EAAE,CAAC;QACvB,+BAAa,CAAC,KAAK,EAAE,CAAC;QAChB,cAAO,GAAG,SAAS,CAAC;IAC9B,CAAC;AACL,CAAC;AAED,SAAgB,aAAa,CAAC,OAAgB;IAC1C,cAAM,GAAG,OAAO,CAAC;IACjB,MAAM,GAAG,GAAG,CAAC,QAAgB,EAAE,OAAa,EAAE,GAAG,cAAqB,EAAE,EAAE,CACtE,cAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,CAAC;IAErD,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,IAAI,CAAC,CAAC;IAClD,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,KAAK,CAAC,CAAC;IACpD,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,EAAE,0BAAQ,CAAC,IAAI,CAAC,CAAC;AACrD,CAAC;~~AAKY~~,QAAA,aAAa,GAAG,MAAM,CAAC,eAAe,CAAC,CAAC;AAGxC,QAAA,UAAU,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AAElC,QAAA,OAAO,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;AAuKlC,IAAM,MAAM,GAAZ,MAAM,MAAM;IAAZ;QAcO,UAAK,GAAG,IAAI,GAAG,EAAmB,CAAC;~~IAqLjD~~,CAAC;~~IAlLa~~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~~GAAG~~,EAAE,~~CACtC~~,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,~~CACnB~~,CAAC,OAAY,EAAE,GAAG,MAAa,EAAE,EAAE,CAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAClG,~~CACJ~~,CAAC;~~IACN~~,CAAC;IACS,MAAM,CAAC,KAAU;QACvB,QAAQ,OAAO,KAAK,EAAE,CAAC;YACnB,KAAK,QAAQ;gBACT,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;oBACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAC1D,CAAC;qBAAM,IAAI,CAAC,KAAK,EAAE,CAAC;oBAChB,OAAO,KAAK,CAAC;gBACjB,CAAC;qBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC9B,OAAO,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC;wBACD,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;wBAC1C,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;wBAC7C,IAAI,CAAC;4BACD,OAAO,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;wBACjC,CAAC;wBAAC,MAAM,CAAC;4BACL,OAAO,SAAS,CAAC;wBACrB,CAAC;oBACL,CAAC;oBAAC,MAAM,CAAC;wBACL,OAAO,KAAK,CAAC;oBACjB,CAAC;gBACL,CAAC;YACL,KAAK,QAAQ;gBACT,OAAO,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAChC;gBACI,OAAO,KAAK,CAAC;QACrB,CAAC;IACL,CAAC;IAES,QAAQ,CAAC,OAAe;QAC9B,OAAO,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC;IACxD,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,KAAK,CAAC,GAAmB,EAAE,GAAG,MAAa;QACvC,OAAO,IAAI,CAAC,GAAG,CAAC,0BAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,KAAK,CAAC,GAAmB,EAAE,GAAG,MAAa;QACvC,OAAO,IAAI,CAAC,GAAG,CAAC,0BAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,MAAM;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,CAAC,GAAmB,EAAE,GAAG,MAAa;QACtC,OAAO,IAAI,CAAC,GAAG,CAAC,0BAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,MAAM;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,MAAM;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,CAAC,GAAmB,EAAE,GAAG,MAAa;QACtC,OAAO,IAAI,CAAC,GAAG,CAAC,0BAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,KAAK,CAAC,GAAmB,EAAE,GAAG,MAAa;QACvC,OAAO,IAAI,CAAC,GAAG,CAAC,0BAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO;QACH,OAAO,IAAI,CAAC,SAAS,CAAC,0BAAQ,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC;IACD,KAAK,CAAC,GAAmB,EAAE,GAAG,MAAa;QACvC,OAAO,IAAI,CAAC,GAAG,CAAC,0BAAQ,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,IAAY;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACtC,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,QAAQ,CAAC;QACpB,CAAC;aAAM,CAAC;YACJ,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC5B,OAAO,KAAK,CAAC;QACjB,CAAC;IACL,CAAC;CACJ,CAAA;~~AAnMY~~,wBAAM;AAQ2B;IAAzC,IAAA,kBAAM,EAAC,+BAAa,CAAC;;sCAA0C;AACtB;IAAzC,IAAA,kBAAM,EAAC,8BAAa,CAAC;sCAAmC,8BAAa;6CAAC;AAC7B;IAAzC,IAAA,kBAAM,EAAC,qBAAa,CAAC;;uCAA2C;AACnC;IAA7B,IAAA,kBAAM,EAAC,kBAAU,CAAC;;oCAAwB;AACa;IAAvD,IAAA,kBAAM,EAAC,kCAAe,CAAC;IAAE,IAAA,oBAAQ,GAAE;;yCAA2D;AAKrF;IADT,IAAA,yBAAa,GAAE;;;;kCA0Bf;iBA1CQ,MAAM;IADlB,IAAA,sBAAU,GAAE;GACA,MAAM,~~CAmMlB~~"}
1	+ {"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/common/logger.ts"],"names":[],"mappings":"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"}

package/lib/common/logger.spec.js CHANGED Viewed

@@ -27,6 +27,7 @@ const logger_sanitizer_1 = require("./logger-sanitizer");
 class TestableLogger extends logger_1.Logger {
     constructor(sanitizer) {
         super();
+        this.loggedMessages = [];
         // Bypass dependency injection for testing
         this.sanitizer = sanitizer;
     }
@@ -36,6 +37,20 @@ class TestableLogger extends logger_1.Logger {
     testSanitize(message) {
         return this.sanitize(message);
     }
+    testGetLog(logLevel) {
+        return this.getLog(logLevel);
+    }
+    /** Configure the logger to behave as if the backend reported the given current log level. */
+    configureLogLevel(level) {
+        this.created = Promise.resolve();
+        this._logLevel = Promise.resolve(level);
+        this.server = {
+            log: (...args) => {
+                this.loggedMessages.push(args);
+                return Promise.resolve();
+            }
+        };
+    }
 }
 describe('logger', () => {
     it('window is not defined', () => {
@@ -57,6 +72,37 @@ describe('logger', () => {
             }
         }).to.not.throw(ReferenceError);
     });
+    describe('log level gating', () => {
+        it('resolves debug() when the debug level is not enabled', async function () {
+            this.timeout(1000);
+            const logger = new TestableLogger();
+            logger.configureLogLevel(logger_1.LogLevel.INFO); // DEBUG is below INFO, so it is disabled
+            await logger.debug('this should not hang');
+            (0, chai_1.expect)(logger.loggedMessages).to.have.lengthOf(0);
+        });
+        it('resolves debug() and logs when the debug level is enabled', async () => {
+            const logger = new TestableLogger();
+            logger.configureLogLevel(logger_1.LogLevel.DEBUG);
+            await logger.debug('hello');
+            (0, chai_1.expect)(logger.loggedMessages).to.have.lengthOf(1);
+        });
+        it('does not invoke a loggable when the level is not enabled', async function () {
+            this.timeout(1000);
+            const logger = new TestableLogger();
+            logger.configureLogLevel(logger_1.LogLevel.INFO);
+            let invoked = false;
+            await logger.debug(() => { invoked = true; });
+            (0, chai_1.expect)(invoked).to.equal(false);
+        });
+        it('getLog() resolves to a no-op when the level is not enabled', async function () {
+            this.timeout(1000);
+            const logger = new TestableLogger();
+            logger.configureLogLevel(logger_1.LogLevel.INFO);
+            const log = await logger.testGetLog(logger_1.LogLevel.DEBUG);
+            log('this should be ignored');
+            (0, chai_1.expect)(logger.loggedMessages).to.have.lengthOf(0);
+        });
+    });
     describe('Logger sanitization', () => {
         let loggerWithSanitizer;
         let loggerWithoutSanitizer;

package/lib/common/logger.spec.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"logger.spec.js","sourceRoot":"","sources":["../../src/common/logger.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,+BAA8B;AAC9B,oDAAgD;AAChD,~~qCAAkE~~;~~AAClE~~,yDAA6E;AAE7E,uDAAuD;AACvD,oCAAoC;AAEpC;;GAEG;AACH,MAAM,cAAe,SAAQ,eAAM;IAC/B,YAAY,SAA2B;QACnC,KAAK,EAAE,CAAC;~~QACR~~,0CAA0C;QACzC,IAAY,CAAC,SAAS,GAAG,SAAS,CAAC;IACxC,CAAC;IAEM,UAAU,CAAC,KAAU;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEM,YAAY,CAAC,OAAe;QAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;~~CACJ~~;AAED,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IAEpB,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;QAC7B,IAAA,aAAM,EAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QACxD,IAAA,aAAM,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,IAAA,aAAM,EAAC,GAAG,EAAE,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,GAAG,EAAE;QACxF,IAAA,aAAM,EAAC,GAAG,EAAE;YACR,IAAI,CAAC;gBACD,IAAA,sBAAa,EAAC,IAAI,wBAAU,EAAE,CAAC,CAAC;YACpC,CAAC;oBAAS,CAAC;gBACP,IAAA,wBAAe,GAAE,CAAC;YACtB,CAAC;QACL,CAAC,CACA,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACjC,IAAI,mBAAmC,CAAC;QACxC,IAAI,sBAAsC,CAAC;QAE3C,UAAU,CAAC,GAAG,EAAE;YACZ,mBAAmB,GAAG,IAAI,cAAc,CAAC,IAAI,yCAAsB,EAAE,CAAC,CAAC;YACvE,sBAAsB,GAAG,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;gBACxD,MAAM,OAAO,GAAG,+CAA+C,CAAC;gBAChE,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC1D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAChF,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;gBAC3D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBAC/E,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACxD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;gBAC1D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;gBACtC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACxD,IAAA,aAAM,EAAC,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;gBACxD,MAAM,GAAG,GAAG;oBACR,KAAK,EAAE,IAAI,KAAK,CAAC,6BAA6B,CAAC;oBAC/C,OAAO,EAAE,kBAAkB;iBAC9B,CAAC;gBACF,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;gBACrC,IAAA,aAAM,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;gBACnD,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,4BAA4B,EAAE,CAAC;gBAClD,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,4BAA4B,EAAE,CAAC,CAAC;YAC3E,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;gBAC1D,MAAM,GAAG,GAAG;oBACR,OAAO,EAAE,CAAC;4BACN,IAAI,EAAE,sDAAsD;yBAC/D,CAAC;oBACF,MAAM,EAAE;wBACJ,WAAW,EAAE,kCAAkC;qBAClD;iBACJ,CAAC;gBACF,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAA,aAAM,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBAC5F,IAAA,aAAM,EAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACjF,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;gBACpC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACvD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;gBACzC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;gBACvC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBACrD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;gBAClD,MAAM,OAAO,GAAG,oBAAoB,CAAC;gBACrC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC1D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACxC,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;gBACrE,MAAM,OAAO,GAAG,iCAAiC,CAAC;gBAClD,MAAM,SAAS,GAAG,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;YAC7C,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;gBACvC,MAAM,OAAO,GAAG,iCAAiC,CAAC;gBAClD,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YAClE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;gBACrD,MAAM,OAAO,GAAG,sEAAsE,CAAC;gBACvF,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;YAC/G,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;gBACrD,MAAM,OAAO,GAAG,yDAAyD,CAAC;gBAC1E,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;YAC9F,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;gBAC1D,MAAM,OAAO,GAAG,2EAA2E,CAAC;gBAC5F,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6FAA6F,CAAC,CAAC;YAC9H,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;gBACvF,MAAM,OAAO,GAAG,oGAAoG,CAAC;gBACrH,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;YACjH,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;gBAC7E,MAAM,OAAO,GAAG,uDAAuD,CAAC;gBACxE,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAChF,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;YAC9B,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;gBACpD,MAAM,eAAe,GAAoB;oBACrC,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;iBAC5D,CAAC;gBACF,MAAM,yBAAyB,GAAG,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;gBAEtE,MAAM,OAAO,GAAG,2BAA2B,CAAC;gBAC5C,MAAM,SAAS,GAAG,yBAAyB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAClE,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;gBACzE,MAAM,eAAe,GAAoB;oBACrC,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;iBACpF,CAAC;gBACF,MAAM,yBAAyB,GAAG,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;gBAEtE,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;gBAC7C,MAAM,SAAS,GAAG,yBAAyB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YAClE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"logger.spec.js","sourceRoot":"","sources":["../../src/common/logger.spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,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,+BAA8B;AAC9B,oDAAgD;AAChD,qCAAiF;AACjF,yDAA6E;AAE7E,uDAAuD;AACvD,oCAAoC;AAEpC;;GAEG;AACH,MAAM,cAAe,SAAQ,eAAM;IAC/B,YAAY,SAA2B;QACnC,KAAK,EAAE,CAAC;QA6BI,mBAAc,GAAY,EAAE,CAAC;QA5BzC,0CAA0C;QACzC,IAAY,CAAC,SAAS,GAAG,SAAS,CAAC;IACxC,CAAC;IAEM,UAAU,CAAC,KAAU;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;IAEM,YAAY,CAAC,OAAe;QAC/B,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAEM,UAAU,CAAC,QAAkB;QAChC,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACjC,CAAC;IAED,6FAA6F;IACtF,iBAAiB,CAAC,KAAe;QACnC,IAAY,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACzC,IAAY,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,IAAY,CAAC,MAAM,GAAG;YACnB,GAAG,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE;gBACpB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC/B,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;YAC7B,CAAC;SACJ,CAAC;IACN,CAAC;CAGJ;AAED,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;IAEpB,EAAE,CAAC,uBAAuB,EAAE,GAAG,EAAE;QAC7B,IAAA,aAAM,EAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC;IAChF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;QACxD,IAAA,aAAM,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,EAAE,uBAAuB,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4BAA4B,EAAE,GAAG,EAAE;QAClC,IAAA,aAAM,EAAC,GAAG,EAAE,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAClF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,GAAG,EAAE;QACxF,IAAA,aAAM,EAAC,GAAG,EAAE;YACR,IAAI,CAAC;gBACD,IAAA,sBAAa,EAAC,IAAI,wBAAU,EAAE,CAAC,CAAC;YACpC,CAAC;oBAAS,CAAC;gBACP,IAAA,wBAAe,GAAE,CAAC;YACtB,CAAC;QACL,CAAC,CACA,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,sDAAsD,EAAE,KAAK;YAC5D,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,iBAAiB,CAAC,iBAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,yCAAyC;YAElF,MAAM,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAE3C,IAAA,aAAM,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,iBAAiB,CAAC,iBAAQ,CAAC,KAAK,CAAC,CAAC;YAEzC,MAAM,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAE5B,IAAA,aAAM,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK;YAChE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,iBAAiB,CAAC,iBAAQ,CAAC,IAAI,CAAC,CAAC;YACxC,IAAI,OAAO,GAAG,KAAK,CAAC;YAEpB,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;YAE9C,IAAA,aAAM,EAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK;YAClE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACnB,MAAM,MAAM,GAAG,IAAI,cAAc,EAAE,CAAC;YACpC,MAAM,CAAC,iBAAiB,CAAC,iBAAQ,CAAC,IAAI,CAAC,CAAC;YAExC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,iBAAQ,CAAC,KAAK,CAAC,CAAC;YACpD,GAAG,CAAC,wBAAwB,CAAC,CAAC;YAE9B,IAAA,aAAM,EAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;QACjC,IAAI,mBAAmC,CAAC;QACxC,IAAI,sBAAsC,CAAC;QAE3C,UAAU,CAAC,GAAG,EAAE;YACZ,mBAAmB,GAAG,IAAI,cAAc,CAAC,IAAI,yCAAsB,EAAE,CAAC,CAAC;YACvE,sBAAsB,GAAG,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;YACpB,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;gBACxD,MAAM,OAAO,GAAG,+CAA+C,CAAC;gBAChE,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC1D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAChF,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,qDAAqD,EAAE,GAAG,EAAE;gBAC3D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBAC/E,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACxD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;gBAC1D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;gBACtC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;gBACxD,IAAA,aAAM,EAAC,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;gBAC5C,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,kDAAkD,EAAE,GAAG,EAAE;gBACxD,MAAM,GAAG,GAAG;oBACR,KAAK,EAAE,IAAI,KAAK,CAAC,6BAA6B,CAAC;oBAC/C,OAAO,EAAE,kBAAkB;iBAC9B,CAAC;gBACF,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;gBACrC,IAAA,aAAM,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,6CAA6C,EAAE,GAAG,EAAE;gBACnD,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,4BAA4B,EAAE,CAAC;gBAClD,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,4BAA4B,EAAE,CAAC,CAAC;YAC3E,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;gBAC1D,MAAM,GAAG,GAAG;oBACR,OAAO,EAAE,CAAC;4BACN,IAAI,EAAE,sDAAsD;yBAC/D,CAAC;oBACF,MAAM,EAAE;wBACJ,WAAW,EAAE,kCAAkC;qBAClD;iBACJ,CAAC;gBACF,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBACtD,IAAA,aAAM,EAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;gBAC5F,IAAA,aAAM,EAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;YACjF,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;gBACpC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBACvD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;gBACzC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;YAC1C,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;gBACvC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;gBACrD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;gBAClD,MAAM,OAAO,GAAG,oBAAoB,CAAC;gBACrC,MAAM,SAAS,GAAG,mBAAmB,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBAC1D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;YACrD,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;YACxC,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;gBACrE,MAAM,OAAO,GAAG,iCAAiC,CAAC;gBAClD,MAAM,SAAS,GAAG,sBAAsB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC/D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACxC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,iCAAiC,EAAE,GAAG,EAAE;YAC7C,EAAE,CAAC,iCAAiC,EAAE,GAAG,EAAE;gBACvC,MAAM,OAAO,GAAG,iCAAiC,CAAC;gBAClD,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YAClE,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;gBACrD,MAAM,OAAO,GAAG,sEAAsE,CAAC;gBACvF,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;YAC/G,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;gBACrD,MAAM,OAAO,GAAG,yDAAyD,CAAC;gBAC1E,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;YAC9F,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,oDAAoD,EAAE,GAAG,EAAE;gBAC1D,MAAM,OAAO,GAAG,2EAA2E,CAAC;gBAC5F,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,6FAA6F,CAAC,CAAC;YAC9H,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,iFAAiF,EAAE,GAAG,EAAE;gBACvF,MAAM,OAAO,GAAG,oGAAoG,CAAC;gBACrH,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;YACjH,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;gBAC7E,MAAM,OAAO,GAAG,uDAAuD,CAAC;gBACxE,MAAM,SAAS,GAAG,mBAAmB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;YAChF,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,kBAAkB,EAAE,GAAG,EAAE;YAC9B,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;gBACpD,MAAM,eAAe,GAAoB;oBACrC,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;iBAC5D,CAAC;gBACF,MAAM,yBAAyB,GAAG,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;gBAEtE,MAAM,OAAO,GAAG,2BAA2B,CAAC;gBAC5C,MAAM,SAAS,GAAG,yBAAyB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAClE,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACtD,CAAC,CAAC,CAAC;YAEH,EAAE,CAAC,mEAAmE,EAAE,GAAG,EAAE;gBACzE,MAAM,eAAe,GAAoB;oBACrC,QAAQ,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,qBAAqB,EAAE,kBAAkB,CAAC;iBACpF,CAAC;gBACF,MAAM,yBAAyB,GAAG,IAAI,cAAc,CAAC,eAAe,CAAC,CAAC;gBAEtE,MAAM,GAAG,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;gBAC7C,MAAM,SAAS,GAAG,yBAAyB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;gBAC5D,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;YAClE,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@theia/core",
-  "version": "1.73.0",
+  "version": "1.73.1",
   "description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
   "main": "lib/common/index.js",
   "typings": "lib/common/index.d.ts",
@@ -17,8 +17,8 @@
     "@lumino/virtualdom": "^2.0.4",
     "@lumino/widgets": "2.7.5",
     "@parcel/watcher": "^2.5.6",
-    "@theia/application-package": "1.73.0",
-    "@theia/request": "1.73.0",
+    "@theia/application-package": "1.73.1",
+    "@theia/request": "1.73.1",
     "@types/body-parser": "^1.19.6",
     "@types/express": "^4.17.25",
     "@types/fs-extra": "^4.0.15",
@@ -218,8 +218,8 @@
     "watch": "theiaext watch"
   },
   "devDependencies": {
-    "@theia/ext-scripts": "1.73.0",
-    "@theia/re-exports": "1.73.0",
+    "@theia/ext-scripts": "1.73.1",
+    "@theia/re-exports": "1.73.1",
     "@types/react": "^18.3.28",
     "@types/react-dom": "^18.3.7",
     "minimist": "^1.2.8",
@@ -230,5 +230,5 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   },
-  "gitHead": "25e1b7fdf4c39ecea7066e1c8be3af1cc02e4d2e"
+  "gitHead": "08e93b2cbdc03c5c8ecf58d3e8ecb9716fd11339"
 }

package/src/browser/keyboard/keyboard-layout-service.spec.ts CHANGED Viewed

@@ -92,6 +92,34 @@ describe('keyboard layout service', function (): void {
         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: NativeKeyboardLayout = {
+            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(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/src/browser/keyboard/keyboard-layout-service.ts CHANGED Viewed

@@ -15,8 +15,8 @@
 // *****************************************************************************
 import { injectable, inject, optional } from 'inversify';
-import type { IWindowsKeyMapping } from 'native-keymap';
-import { isWindows } from '../../common/os';
+import type { ILinuxKeyMapping, IMacKeyMapping, IWindowsKeyMapping } from 'native-keymap';
+import { isOSX, isWindows } from '../../common/os';
 import {
     NativeKeyboardLayout, KeyboardLayoutProvider, KeyboardLayoutChangeNotifier, KeyValidator
 } from '../../common/keyboard/keyboard-layout-provider';
@@ -159,19 +159,10 @@ export class KeyboardLayoutService {
                 if (mappedKey && this.shouldIncludeKey(code)) {
                     if (isWindows) {
                         this.addWindowsKeyMapping(key2KeyCode, mappedKey, (keyMapping as IWindowsKeyMapping).vkey, keyMapping.value);
+                    } else if (isOSX) {
+                        this.addMacKeyMappings(key2KeyCode, mappedKey, keyMapping as IMacKeyMapping);
                     } 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) {
@@ -190,6 +181,39 @@ export class KeyboardLayoutService {
         return !code.startsWith('Numpad');
     }
+    private addKeyMappings(key2KeyCode: KeyCode[], mappedKey: Key, keyMapping: ILinuxKeyMapping): void {
+        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);
+        }
+    }
+    private addMacKeyMappings(key2KeyCode: KeyCode[], mappedKey: Key, keyMapping: IMacKeyMapping): void {
+        // 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);
+        }
+    }
     private addKeyMapping(key2KeyCode: KeyCode[], mappedKey: Key, value: string, shift: boolean, alt: boolean): void {
         const key = VALUE_TO_KEY[value];
         if (key) {

package/src/common/logger.spec.ts CHANGED Viewed

@@ -16,7 +16,7 @@
 import { expect } from 'chai';
 import { MockLogger } from './test/mock-logger';
-import { setRootLogger, unsetRootLogger, Logger } from './logger';
+import { setRootLogger, unsetRootLogger, Logger, LogLevel, Log } from './logger';
 import { DefaultLoggerSanitizer, LoggerSanitizer } from './logger-sanitizer';
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -39,6 +39,24 @@ class TestableLogger extends Logger {
     public testSanitize(message: string): string {
         return this.sanitize(message);
     }
+    public testGetLog(logLevel: LogLevel): Promise<Log> {
+        return this.getLog(logLevel);
+    }
+    /** Configure the logger to behave as if the backend reported the given current log level. */
+    public configureLogLevel(level: LogLevel): void {
+        (this as any).created = Promise.resolve();
+        (this as any)._logLevel = Promise.resolve(level);
+        (this as any).server = {
+            log: (...args: any[]) => {
+                this.loggedMessages.push(args);
+                return Promise.resolve();
+            }
+        };
+    }
+    public readonly loggedMessages: any[][] = [];
 }
 describe('logger', () => {
@@ -66,6 +84,49 @@ describe('logger', () => {
         ).to.not.throw(ReferenceError);
     });
+    describe('log level gating', () => {
+        it('resolves debug() when the debug level is not enabled', async function (): Promise<void> {
+            this.timeout(1000);
+            const logger = new TestableLogger();
+            logger.configureLogLevel(LogLevel.INFO); // DEBUG is below INFO, so it is disabled
+            await logger.debug('this should not hang');
+            expect(logger.loggedMessages).to.have.lengthOf(0);
+        });
+        it('resolves debug() and logs when the debug level is enabled', async () => {
+            const logger = new TestableLogger();
+            logger.configureLogLevel(LogLevel.DEBUG);
+            await logger.debug('hello');
+            expect(logger.loggedMessages).to.have.lengthOf(1);
+        });
+        it('does not invoke a loggable when the level is not enabled', async function (): Promise<void> {
+            this.timeout(1000);
+            const logger = new TestableLogger();
+            logger.configureLogLevel(LogLevel.INFO);
+            let invoked = false;
+            await logger.debug(() => { invoked = true; });
+            expect(invoked).to.equal(false);
+        });
+        it('getLog() resolves to a no-op when the level is not enabled', async function (): Promise<void> {
+            this.timeout(1000);
+            const logger = new TestableLogger();
+            logger.configureLogLevel(LogLevel.INFO);
+            const log = await logger.testGetLog(LogLevel.DEBUG);
+            log('this should be ignored');
+            expect(logger.loggedMessages).to.have.lengthOf(0);
+        });
+    });
     describe('Logger sanitization', () => {
         let loggerWithSanitizer: TestableLogger;
         let loggerWithoutSanitizer: TestableLogger;

package/src/common/logger.ts CHANGED Viewed

@@ -56,6 +56,9 @@ export function setRootLogger(aLogger: ILogger): void {
 export type Log = (message: any, ...params: any[]) => void;
 export type Loggable = (log: Log) => void;
+/** Shared no-op {@link Log} returned for a disabled level so that callers neither block nor emit. */
+const nullLogger: Log = () => { };
 export const LoggerFactory = Symbol('LoggerFactory');
 export type LoggerFactory = (name: string) => ILogger;
@@ -304,6 +307,9 @@ export class Logger implements ILogger {
     }
     log(logLevel: number, arg2: any | Loggable, ...params: any[]): Promise<void> {
         return this.getLog(logLevel).then(log => {
+            if (log === nullLogger) {
+                return;
+            }
             if (typeof arg2 === 'function') {
                 const loggable = arg2;
                 loggable(log);
@@ -313,12 +319,15 @@ export class Logger implements ILogger {
         });
     }
     protected getLog(logLevel: number): Promise<Log> {
-        return this.ifEnabled(logLevel).then(() =>
-            this.created.then(() =>
+        return this.isEnabled(logLevel).then(enabled => {
+            if (!enabled) {
+                return nullLogger;
+            }
+            return this.created.then(() =>
                 (message: any, ...params: any[]) =>
                     this.server.log(this.name, logLevel, this.format(message), params.map(p => this.format(p)))
-            )
-        );
+            );
+        });
     }
     protected format(value: any): any {
         switch (typeof value) {