@theia/core 1.74.0-next.0 → 1.74.0-next.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/catalog.json +45 -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 +4 -4
- 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/lib/browser/catalog.json
CHANGED
|
@@ -2,6 +2,12 @@
|
|
|
2
2
|
"$schema": "https://www.schemastore.org/schema-catalog.json",
|
|
3
3
|
"version": 1,
|
|
4
4
|
"schemas": [
|
|
5
|
+
{
|
|
6
|
+
"name": "Specpin spec file",
|
|
7
|
+
"description": "Specpin business-spec file (.specs/*.spec.json): rules, descriptions, and acceptance criteria pinned to UI elements",
|
|
8
|
+
"fileMatch": ["**/.specs/*.spec.json"],
|
|
9
|
+
"url": "https://specpin.ohnice.app/schema/v1.json"
|
|
10
|
+
},
|
|
5
11
|
{
|
|
6
12
|
"name": "Burnless SRE config",
|
|
7
13
|
"description": "Burnless sre.yaml \u2014 SLOs, error budgets, runbooks, on-call, and dashboards as code",
|
|
@@ -552,12 +558,13 @@
|
|
|
552
558
|
"name": "Aurora Agile Meta-Framework",
|
|
553
559
|
"description": "Yaml for Aurora Agile Meta-Framework",
|
|
554
560
|
"fileMatch": ["*.aurora.yaml", "*.aurora.yml"],
|
|
555
|
-
"url": "https://www.schemastore.org/aurora-
|
|
561
|
+
"url": "https://www.schemastore.org/aurora-2.0.json",
|
|
556
562
|
"versions": {
|
|
557
563
|
"1.0": "https://www.schemastore.org/aurora-1.0.json",
|
|
558
564
|
"1.1": "https://www.schemastore.org/aurora-1.1.json",
|
|
559
565
|
"1.2": "https://www.schemastore.org/aurora-1.2.json",
|
|
560
|
-
"1.3": "https://www.schemastore.org/aurora-1.3.json"
|
|
566
|
+
"1.3": "https://www.schemastore.org/aurora-1.3.json",
|
|
567
|
+
"2.0": "https://www.schemastore.org/aurora-2.0.json"
|
|
561
568
|
}
|
|
562
569
|
},
|
|
563
570
|
{
|
|
@@ -2007,6 +2014,12 @@
|
|
|
2007
2014
|
"fileMatch": ["**/.codex/hooks.json"],
|
|
2008
2015
|
"url": "https://www.schemastore.org/codex-hooks.json"
|
|
2009
2016
|
},
|
|
2017
|
+
{
|
|
2018
|
+
"name": "Codex Plugin Manifest",
|
|
2019
|
+
"description": "OpenAI Codex plugin manifest file",
|
|
2020
|
+
"fileMatch": ["**/.codex-plugin/plugin.json"],
|
|
2021
|
+
"url": "https://www.schemastore.org/codex-plugin-manifest.json"
|
|
2022
|
+
},
|
|
2010
2023
|
{
|
|
2011
2024
|
"name": "Codex Skill Metadata",
|
|
2012
2025
|
"description": "OpenAI Codex skill metadata file",
|
|
@@ -4208,8 +4221,9 @@
|
|
|
4208
4221
|
"name": "JReleaser",
|
|
4209
4222
|
"description": "JReleaser config file",
|
|
4210
4223
|
"fileMatch": ["jreleaser.yml", "jreleaser.json"],
|
|
4211
|
-
"url": "https://www.schemastore.org/jreleaser-1.
|
|
4224
|
+
"url": "https://www.schemastore.org/jreleaser-1.25.0.json",
|
|
4212
4225
|
"versions": {
|
|
4226
|
+
"1.25.0": "https://www.schemastore.org/jreleaser-1.25.0.json",
|
|
4213
4227
|
"1.24.0": "https://www.schemastore.org/jreleaser-1.24.0.json",
|
|
4214
4228
|
"1.23.0": "https://www.schemastore.org/jreleaser-1.23.0.json",
|
|
4215
4229
|
"1.22.0": "https://www.schemastore.org/jreleaser-1.22.0.json",
|
|
@@ -4922,6 +4936,12 @@
|
|
|
4922
4936
|
],
|
|
4923
4937
|
"url": "https://raw.githubusercontent.com/compomics/ms2rescore/main/ms2rescore/package_data/config_schema.json"
|
|
4924
4938
|
},
|
|
4939
|
+
{
|
|
4940
|
+
"name": "MSTest testconfig.json",
|
|
4941
|
+
"description": "Configuration file for MSTest and Microsoft.Testing.Platform",
|
|
4942
|
+
"fileMatch": ["testconfig.json", "*.testconfig.json"],
|
|
4943
|
+
"url": "https://raw.githubusercontent.com/microsoft/testfx/main/docs/testconfig.schema.json"
|
|
4944
|
+
},
|
|
4925
4945
|
{
|
|
4926
4946
|
"name": "Mergify Configuration",
|
|
4927
4947
|
"description": "Mergify configuration file",
|
|
@@ -6544,6 +6564,12 @@
|
|
|
6544
6564
|
"2.0.0": "https://raw.githubusercontent.com/sdmx-twg/sdmx-json/master/data-message/tools/schemas/2.0.0/sdmx-json-data-schema.json"
|
|
6545
6565
|
}
|
|
6546
6566
|
},
|
|
6567
|
+
{
|
|
6568
|
+
"name": "Secure SDLC Evidence Bundle",
|
|
6569
|
+
"description": "Auditable release-readiness evidence bundle produced by the Secure SDLC Evidence Collector",
|
|
6570
|
+
"fileMatch": ["**/*.evidence-bundle.json"],
|
|
6571
|
+
"url": "https://www.schemastore.org/evidence-bundle.json"
|
|
6572
|
+
},
|
|
6547
6573
|
{
|
|
6548
6574
|
"name": "Semantic Data Fabric (SDF) file",
|
|
6549
6575
|
"description": "SDF blocks",
|
|
@@ -6896,6 +6922,19 @@
|
|
|
6896
6922
|
"fileMatch": ["*.mixins.json"],
|
|
6897
6923
|
"url": "https://www.schemastore.org/sponge-mixins.json"
|
|
6898
6924
|
},
|
|
6925
|
+
{
|
|
6926
|
+
"name": "Spotlight Ruleset",
|
|
6927
|
+
"description": "Spotlight (Spectral-compatible) ruleset for linting OpenAPI, AsyncAPI, Arazzo, APIs.json and other JSON/YAML API descriptions",
|
|
6928
|
+
"fileMatch": [
|
|
6929
|
+
"*.spotlight.json",
|
|
6930
|
+
"*.spotlight.yaml",
|
|
6931
|
+
"*.spotlight.yml",
|
|
6932
|
+
"spotlight-ruleset.json",
|
|
6933
|
+
"spotlight-ruleset.yaml",
|
|
6934
|
+
"spotlight-ruleset.yml"
|
|
6935
|
+
],
|
|
6936
|
+
"url": "https://api-commons.github.io/spotlight-spec/schema/v1/spotlight-ruleset.schema.json"
|
|
6937
|
+
},
|
|
6899
6938
|
{
|
|
6900
6939
|
"name": ".sprite files",
|
|
6901
6940
|
"description": "image sprite generation files",
|
|
@@ -8847,7 +8886,7 @@
|
|
|
8847
8886
|
"name": "Pantsbuild",
|
|
8848
8887
|
"description": "Pantsbuild configuration file",
|
|
8849
8888
|
"fileMatch": ["pants*.toml"],
|
|
8850
|
-
"url": "https://www.schemastore.org/pantsbuild-2.
|
|
8889
|
+
"url": "https://www.schemastore.org/pantsbuild-2.32.0.json",
|
|
8851
8890
|
"versions": {
|
|
8852
8891
|
"2.14.0": "https://www.schemastore.org/pantsbuild-2.14.0.json",
|
|
8853
8892
|
"2.15.0": "https://www.schemastore.org/pantsbuild-2.15.0.json",
|
|
@@ -8860,7 +8899,8 @@
|
|
|
8860
8899
|
"2.24.0": "https://www.schemastore.org/pantsbuild-2.24.0.json",
|
|
8861
8900
|
"2.26.0": "https://www.schemastore.org/pantsbuild-2.26.0.json",
|
|
8862
8901
|
"2.30.0": "https://www.schemastore.org/pantsbuild-2.30.0.json",
|
|
8863
|
-
"2.31.0": "https://www.schemastore.org/pantsbuild-2.
|
|
8902
|
+
"2.31.0": "https://www.schemastore.org/pantsbuild-2.31.0.json",
|
|
8903
|
+
"2.32.0": "https://www.schemastore.org/pantsbuild-2.32.0.json"
|
|
8864
8904
|
}
|
|
8865
8905
|
},
|
|
8866
8906
|
{
|
|
@@ -43,6 +43,8 @@ export declare class KeyboardLayoutService {
|
|
|
43
43
|
protected transformKeyCode(inCode: KeyCode, mappedCode: KeyCode, keyNeedsShift: boolean): KeyCode | undefined;
|
|
44
44
|
protected transformNativeLayout(nativeLayout: NativeKeyboardLayout): KeyboardLayout;
|
|
45
45
|
protected shouldIncludeKey(code: string): boolean;
|
|
46
|
+
private addKeyMappings;
|
|
47
|
+
private addMacKeyMappings;
|
|
46
48
|
private addKeyMapping;
|
|
47
49
|
private addWindowsKeyMapping;
|
|
48
50
|
protected getCharacterIndex(key: Key, shift?: boolean): number;
|
|
@@ -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;
|
|
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"}
|
|
@@ -127,19 +127,11 @@ let KeyboardLayoutService = class KeyboardLayoutService {
|
|
|
127
127
|
if (os_1.isWindows) {
|
|
128
128
|
this.addWindowsKeyMapping(key2KeyCode, mappedKey, keyMapping.vkey, keyMapping.value);
|
|
129
129
|
}
|
|
130
|
+
else if (os_1.isOSX) {
|
|
131
|
+
this.addMacKeyMappings(key2KeyCode, mappedKey, keyMapping);
|
|
132
|
+
}
|
|
130
133
|
else {
|
|
131
|
-
|
|
132
|
-
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
|
|
133
|
-
}
|
|
134
|
-
if (keyMapping.withShift) {
|
|
135
|
-
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
|
|
136
|
-
}
|
|
137
|
-
if (keyMapping.withAltGr) {
|
|
138
|
-
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
|
|
139
|
-
}
|
|
140
|
-
if (keyMapping.withShiftAltGr) {
|
|
141
|
-
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
|
|
142
|
-
}
|
|
134
|
+
this.addKeyMappings(key2KeyCode, mappedKey, keyMapping);
|
|
143
135
|
}
|
|
144
136
|
}
|
|
145
137
|
if (keyMapping.value) {
|
|
@@ -156,6 +148,37 @@ let KeyboardLayoutService = class KeyboardLayoutService {
|
|
|
156
148
|
// from typing `3` in an editor.
|
|
157
149
|
return !code.startsWith('Numpad');
|
|
158
150
|
}
|
|
151
|
+
addKeyMappings(key2KeyCode, mappedKey, keyMapping) {
|
|
152
|
+
if (keyMapping.value) {
|
|
153
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
|
|
154
|
+
}
|
|
155
|
+
if (keyMapping.withShift) {
|
|
156
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
|
|
157
|
+
}
|
|
158
|
+
if (keyMapping.withAltGr) {
|
|
159
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
|
|
160
|
+
}
|
|
161
|
+
if (keyMapping.withShiftAltGr) {
|
|
162
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
addMacKeyMappings(key2KeyCode, mappedKey, keyMapping) {
|
|
166
|
+
// Dead keys (e.g. the combining-accent layer of Option+E on macOS US) await a following keystroke to
|
|
167
|
+
// compose a glyph and so never produce a committed character. They must not be registered as if they
|
|
168
|
+
// produced their display glyph, which would otherwise collide with the real key for that glyph.
|
|
169
|
+
if (keyMapping.value && !keyMapping.valueIsDeadKey) {
|
|
170
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
|
|
171
|
+
}
|
|
172
|
+
if (keyMapping.withShift && !keyMapping.withShiftIsDeadKey) {
|
|
173
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
|
|
174
|
+
}
|
|
175
|
+
if (keyMapping.withAltGr && !keyMapping.withAltGrIsDeadKey) {
|
|
176
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
|
|
177
|
+
}
|
|
178
|
+
if (keyMapping.withShiftAltGr && !keyMapping.withShiftAltGrIsDeadKey) {
|
|
179
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
|
|
180
|
+
}
|
|
181
|
+
}
|
|
159
182
|
addKeyMapping(key2KeyCode, mappedKey, value, shift, alt) {
|
|
160
183
|
const key = VALUE_TO_KEY[value];
|
|
161
184
|
if (key) {
|
|
@@ -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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"}
|
|
@@ -87,6 +87,32 @@ describe('keyboard layout service', function () {
|
|
|
87
87
|
chai.expect(indentLine.toString()).to.equal('meta+shift+alt+ctrl+-');
|
|
88
88
|
chai.expect(service.getKeyboardCharacter(indentLine.key)).to.equal(')');
|
|
89
89
|
});
|
|
90
|
+
it('does not let a dead key hijack a keybinding on Mac (#17677)', async () => {
|
|
91
|
+
// On macOS US Extended, Option+P is the "combining comma below" dead key whose display glyph
|
|
92
|
+
// is reported as ',' by native-keymap. Since KeyP is reported before Comma, without honoring the
|
|
93
|
+
// dead-key flags it would claim the ',' slot and resolve ctrlcmd+, to Cmd+Ctrl+Option+P.
|
|
94
|
+
const macUSExtended = {
|
|
95
|
+
info: { id: 'com.apple.keylayout.USExtended', lang: 'en' },
|
|
96
|
+
mapping: {
|
|
97
|
+
KeyP: {
|
|
98
|
+
value: 'p', valueIsDeadKey: false,
|
|
99
|
+
withShift: 'P', withShiftIsDeadKey: false,
|
|
100
|
+
withAltGr: ',', withAltGrIsDeadKey: true,
|
|
101
|
+
withShiftAltGr: '̦', withShiftAltGrIsDeadKey: true
|
|
102
|
+
},
|
|
103
|
+
Comma: {
|
|
104
|
+
value: ',', valueIsDeadKey: false,
|
|
105
|
+
withShift: '<', withShiftIsDeadKey: false,
|
|
106
|
+
withAltGr: '≤', withAltGrIsDeadKey: false,
|
|
107
|
+
withShiftAltGr: '¯', withShiftAltGrIsDeadKey: false
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
};
|
|
111
|
+
const service = await setup(macUSExtended, 'mac');
|
|
112
|
+
const openSettings = service.resolveKeyCode(keys_1.KeyCode.createKeyCode('Comma+M1'));
|
|
113
|
+
chai.expect(openSettings.toString()).to.equal('meta+,');
|
|
114
|
+
chai.expect(service.getKeyboardCharacter(openSettings.key)).to.equal(',');
|
|
115
|
+
});
|
|
90
116
|
it('resolves correct key bindings with German Windows layout', async () => {
|
|
91
117
|
const winGerman = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
92
118
|
const service = await setup(winGerman, 'win');
|
|
@@ -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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"}
|
|
@@ -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;
|
|
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
|
@@ -46,6 +46,8 @@ function setRootLogger(aLogger) {
|
|
|
46
46
|
console.trace = log.bind(undefined, logger_protocol_1.LogLevel.TRACE);
|
|
47
47
|
console.log = log.bind(undefined, logger_protocol_1.LogLevel.INFO);
|
|
48
48
|
}
|
|
49
|
+
/** Shared no-op {@link Log} returned for a disabled level so that callers neither block nor emit. */
|
|
50
|
+
const nullLogger = () => { };
|
|
49
51
|
exports.LoggerFactory = Symbol('LoggerFactory');
|
|
50
52
|
exports.LoggerName = Symbol('LoggerName');
|
|
51
53
|
exports.ILogger = Symbol('ILogger');
|
|
@@ -104,6 +106,9 @@ let Logger = class Logger {
|
|
|
104
106
|
}
|
|
105
107
|
log(logLevel, arg2, ...params) {
|
|
106
108
|
return this.getLog(logLevel).then(log => {
|
|
109
|
+
if (log === nullLogger) {
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
107
112
|
if (typeof arg2 === 'function') {
|
|
108
113
|
const loggable = arg2;
|
|
109
114
|
loggable(log);
|
|
@@ -114,7 +119,12 @@ let Logger = class Logger {
|
|
|
114
119
|
});
|
|
115
120
|
}
|
|
116
121
|
getLog(logLevel) {
|
|
117
|
-
return this.
|
|
122
|
+
return this.isEnabled(logLevel).then(enabled => {
|
|
123
|
+
if (!enabled) {
|
|
124
|
+
return nullLogger;
|
|
125
|
+
}
|
|
126
|
+
return this.created.then(() => (message, ...params) => this.server.log(this.name, logLevel, this.format(message), params.map(p => this.format(p))));
|
|
127
|
+
});
|
|
118
128
|
}
|
|
119
129
|
format(value) {
|
|
120
130
|
switch (typeof value) {
|
package/lib/common/logger.js.map
CHANGED
|
@@ -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;
|
|
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;AAKD,qGAAqG;AACrG,MAAM,UAAU,GAAQ,GAAG,EAAE,GAAG,CAAC,CAAC;AAErB,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;IA2LjD,CAAC;IAxLa,IAAI;QACV,IAAI,IAAI,CAAC,IAAI,KAAK,gCAAc,EAAE,CAAC;YAC/B,+BAA+B;YAC/B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChD,CAAC;aAAM,CAAC;YACJ,+DAA+D;YAC/D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QACrC,CAAC;QAED,0DAA0D;QAC1D,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAE5E,wDAAwD;QACxD,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE;YACzC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnB,IAAI,KAAK,CAAC,UAAU,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;oBACjC,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;gBACxD,CAAC;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QAEH,6DAA6D;QAC7D,IAAI,CAAC,aAAa,CAAC,kBAAkB,CAAC,GAAG,EAAE;YACvC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;IACP,CAAC;IAED,WAAW,CAAC,QAAgB;QACxB,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;YAC/B,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;oBAC3B,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;wBACnD,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;wBAC3C,OAAO,EAAE,CAAC;oBACd,CAAC,CAAC,CAAC;gBACP,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IACD,WAAW;QACP,OAAO,IAAI,CAAC,SAAS,CAAC;IAC1B,CAAC;IAED,SAAS,CAAC,QAAgB;QACtB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC/B,QAAQ,IAAI,KAAK,CACpB,CAAC;IACN,CAAC;IACD,SAAS,CAAC,QAAgB;QACtB,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE,CAC/B,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACpC,IAAI,OAAO,EAAE,CAAC;gBACV,OAAO,EAAE,CAAC;YACd,CAAC;QACL,CAAC,CAAC,CACL,CAAC;IACN,CAAC;IACD,GAAG,CAAC,QAAgB,EAAE,IAAoB,EAAE,GAAG,MAAa;QACxD,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACpC,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;gBACrB,OAAO;YACX,CAAC;YACD,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;gBAC7B,MAAM,QAAQ,GAAG,IAAI,CAAC;gBACtB,QAAQ,CAAC,GAAG,CAAC,CAAC;YAClB,CAAC;iBAAM,IAAI,IAAI,EAAE,CAAC;gBACd,GAAG,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,CAAC;YACzB,CAAC;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IACS,MAAM,CAAC,QAAgB;QAC7B,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YAC3C,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,OAAO,UAAU,CAAC;YACtB,CAAC;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,CAC1B,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,CAAC;QACN,CAAC,CAAC,CAAC;IACP,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;AAzMY,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,CAyMlB"}
|
|
@@ -27,6 +27,7 @@ const logger_sanitizer_1 = require("./logger-sanitizer");
|
|
|
27
27
|
class TestableLogger extends logger_1.Logger {
|
|
28
28
|
constructor(sanitizer) {
|
|
29
29
|
super();
|
|
30
|
+
this.loggedMessages = [];
|
|
30
31
|
// Bypass dependency injection for testing
|
|
31
32
|
this.sanitizer = sanitizer;
|
|
32
33
|
}
|
|
@@ -36,6 +37,20 @@ class TestableLogger extends logger_1.Logger {
|
|
|
36
37
|
testSanitize(message) {
|
|
37
38
|
return this.sanitize(message);
|
|
38
39
|
}
|
|
40
|
+
testGetLog(logLevel) {
|
|
41
|
+
return this.getLog(logLevel);
|
|
42
|
+
}
|
|
43
|
+
/** Configure the logger to behave as if the backend reported the given current log level. */
|
|
44
|
+
configureLogLevel(level) {
|
|
45
|
+
this.created = Promise.resolve();
|
|
46
|
+
this._logLevel = Promise.resolve(level);
|
|
47
|
+
this.server = {
|
|
48
|
+
log: (...args) => {
|
|
49
|
+
this.loggedMessages.push(args);
|
|
50
|
+
return Promise.resolve();
|
|
51
|
+
}
|
|
52
|
+
};
|
|
53
|
+
}
|
|
39
54
|
}
|
|
40
55
|
describe('logger', () => {
|
|
41
56
|
it('window is not defined', () => {
|
|
@@ -57,6 +72,37 @@ describe('logger', () => {
|
|
|
57
72
|
}
|
|
58
73
|
}).to.not.throw(ReferenceError);
|
|
59
74
|
});
|
|
75
|
+
describe('log level gating', () => {
|
|
76
|
+
it('resolves debug() when the debug level is not enabled', async function () {
|
|
77
|
+
this.timeout(1000);
|
|
78
|
+
const logger = new TestableLogger();
|
|
79
|
+
logger.configureLogLevel(logger_1.LogLevel.INFO); // DEBUG is below INFO, so it is disabled
|
|
80
|
+
await logger.debug('this should not hang');
|
|
81
|
+
(0, chai_1.expect)(logger.loggedMessages).to.have.lengthOf(0);
|
|
82
|
+
});
|
|
83
|
+
it('resolves debug() and logs when the debug level is enabled', async () => {
|
|
84
|
+
const logger = new TestableLogger();
|
|
85
|
+
logger.configureLogLevel(logger_1.LogLevel.DEBUG);
|
|
86
|
+
await logger.debug('hello');
|
|
87
|
+
(0, chai_1.expect)(logger.loggedMessages).to.have.lengthOf(1);
|
|
88
|
+
});
|
|
89
|
+
it('does not invoke a loggable when the level is not enabled', async function () {
|
|
90
|
+
this.timeout(1000);
|
|
91
|
+
const logger = new TestableLogger();
|
|
92
|
+
logger.configureLogLevel(logger_1.LogLevel.INFO);
|
|
93
|
+
let invoked = false;
|
|
94
|
+
await logger.debug(() => { invoked = true; });
|
|
95
|
+
(0, chai_1.expect)(invoked).to.equal(false);
|
|
96
|
+
});
|
|
97
|
+
it('getLog() resolves to a no-op when the level is not enabled', async function () {
|
|
98
|
+
this.timeout(1000);
|
|
99
|
+
const logger = new TestableLogger();
|
|
100
|
+
logger.configureLogLevel(logger_1.LogLevel.INFO);
|
|
101
|
+
const log = await logger.testGetLog(logger_1.LogLevel.DEBUG);
|
|
102
|
+
log('this should be ignored');
|
|
103
|
+
(0, chai_1.expect)(logger.loggedMessages).to.have.lengthOf(0);
|
|
104
|
+
});
|
|
105
|
+
});
|
|
60
106
|
describe('Logger sanitization', () => {
|
|
61
107
|
let loggerWithSanitizer;
|
|
62
108
|
let loggerWithoutSanitizer;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"logger.spec.js","sourceRoot":"","sources":["../../src/common/logger.spec.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/core",
|
|
3
|
-
"version": "1.74.0-next.
|
|
3
|
+
"version": "1.74.0-next.5+afc1eefc5",
|
|
4
4
|
"description": "Theia is a cloud & desktop IDE framework implemented in TypeScript.",
|
|
5
5
|
"main": "lib/common/index.js",
|
|
6
6
|
"typings": "lib/common/index.d.ts",
|
|
@@ -17,8 +17,8 @@
|
|
|
17
17
|
"@lumino/virtualdom": "^2.0.4",
|
|
18
18
|
"@lumino/widgets": "2.7.5",
|
|
19
19
|
"@parcel/watcher": "^2.5.6",
|
|
20
|
-
"@theia/application-package": "1.74.0-next.
|
|
21
|
-
"@theia/request": "1.74.0-next.
|
|
20
|
+
"@theia/application-package": "1.74.0-next.5+afc1eefc5",
|
|
21
|
+
"@theia/request": "1.74.0-next.5+afc1eefc5",
|
|
22
22
|
"@types/body-parser": "^1.19.6",
|
|
23
23
|
"@types/express": "^4.17.25",
|
|
24
24
|
"@types/fs-extra": "^4.0.15",
|
|
@@ -230,5 +230,5 @@
|
|
|
230
230
|
"nyc": {
|
|
231
231
|
"extends": "../../configs/nyc.json"
|
|
232
232
|
},
|
|
233
|
-
"gitHead": "
|
|
233
|
+
"gitHead": "afc1eefc56e9b67b67e13f4d71b35162d5f126ea"
|
|
234
234
|
}
|
|
@@ -92,6 +92,34 @@ describe('keyboard layout service', function (): void {
|
|
|
92
92
|
chai.expect(service.getKeyboardCharacter(indentLine.key!)).to.equal(')');
|
|
93
93
|
});
|
|
94
94
|
|
|
95
|
+
it('does not let a dead key hijack a keybinding on Mac (#17677)', async () => {
|
|
96
|
+
// On macOS US Extended, Option+P is the "combining comma below" dead key whose display glyph
|
|
97
|
+
// is reported as ',' by native-keymap. Since KeyP is reported before Comma, without honoring the
|
|
98
|
+
// dead-key flags it would claim the ',' slot and resolve ctrlcmd+, to Cmd+Ctrl+Option+P.
|
|
99
|
+
const macUSExtended: NativeKeyboardLayout = {
|
|
100
|
+
info: { id: 'com.apple.keylayout.USExtended', lang: 'en' },
|
|
101
|
+
mapping: {
|
|
102
|
+
KeyP: {
|
|
103
|
+
value: 'p', valueIsDeadKey: false,
|
|
104
|
+
withShift: 'P', withShiftIsDeadKey: false,
|
|
105
|
+
withAltGr: ',', withAltGrIsDeadKey: true,
|
|
106
|
+
withShiftAltGr: '̦', withShiftAltGrIsDeadKey: true
|
|
107
|
+
},
|
|
108
|
+
Comma: {
|
|
109
|
+
value: ',', valueIsDeadKey: false,
|
|
110
|
+
withShift: '<', withShiftIsDeadKey: false,
|
|
111
|
+
withAltGr: '≤', withAltGrIsDeadKey: false,
|
|
112
|
+
withShiftAltGr: '¯', withShiftAltGrIsDeadKey: false
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
};
|
|
116
|
+
const service = await setup(macUSExtended, 'mac');
|
|
117
|
+
|
|
118
|
+
const openSettings = service.resolveKeyCode(KeyCode.createKeyCode('Comma+M1'));
|
|
119
|
+
chai.expect(openSettings.toString()).to.equal('meta+,');
|
|
120
|
+
chai.expect(service.getKeyboardCharacter(openSettings.key!)).to.equal(',');
|
|
121
|
+
});
|
|
122
|
+
|
|
95
123
|
it('resolves correct key bindings with German Windows layout', async () => {
|
|
96
124
|
const winGerman = require('../../../src/common/keyboard/layouts/de-German-pc.json');
|
|
97
125
|
const service = await setup(winGerman, 'win');
|
|
@@ -15,8 +15,8 @@
|
|
|
15
15
|
// *****************************************************************************
|
|
16
16
|
|
|
17
17
|
import { injectable, inject, optional } from 'inversify';
|
|
18
|
-
import type { IWindowsKeyMapping } from 'native-keymap';
|
|
19
|
-
import { isWindows } from '../../common/os';
|
|
18
|
+
import type { ILinuxKeyMapping, IMacKeyMapping, IWindowsKeyMapping } from 'native-keymap';
|
|
19
|
+
import { isOSX, isWindows } from '../../common/os';
|
|
20
20
|
import {
|
|
21
21
|
NativeKeyboardLayout, KeyboardLayoutProvider, KeyboardLayoutChangeNotifier, KeyValidator
|
|
22
22
|
} from '../../common/keyboard/keyboard-layout-provider';
|
|
@@ -159,19 +159,10 @@ export class KeyboardLayoutService {
|
|
|
159
159
|
if (mappedKey && this.shouldIncludeKey(code)) {
|
|
160
160
|
if (isWindows) {
|
|
161
161
|
this.addWindowsKeyMapping(key2KeyCode, mappedKey, (keyMapping as IWindowsKeyMapping).vkey, keyMapping.value);
|
|
162
|
+
} else if (isOSX) {
|
|
163
|
+
this.addMacKeyMappings(key2KeyCode, mappedKey, keyMapping as IMacKeyMapping);
|
|
162
164
|
} else {
|
|
163
|
-
|
|
164
|
-
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
|
|
165
|
-
}
|
|
166
|
-
if (keyMapping.withShift) {
|
|
167
|
-
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
|
|
168
|
-
}
|
|
169
|
-
if (keyMapping.withAltGr) {
|
|
170
|
-
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
|
|
171
|
-
}
|
|
172
|
-
if (keyMapping.withShiftAltGr) {
|
|
173
|
-
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
|
|
174
|
-
}
|
|
165
|
+
this.addKeyMappings(key2KeyCode, mappedKey, keyMapping);
|
|
175
166
|
}
|
|
176
167
|
}
|
|
177
168
|
if (keyMapping.value) {
|
|
@@ -190,6 +181,39 @@ export class KeyboardLayoutService {
|
|
|
190
181
|
return !code.startsWith('Numpad');
|
|
191
182
|
}
|
|
192
183
|
|
|
184
|
+
private addKeyMappings(key2KeyCode: KeyCode[], mappedKey: Key, keyMapping: ILinuxKeyMapping): void {
|
|
185
|
+
if (keyMapping.value) {
|
|
186
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
|
|
187
|
+
}
|
|
188
|
+
if (keyMapping.withShift) {
|
|
189
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
|
|
190
|
+
}
|
|
191
|
+
if (keyMapping.withAltGr) {
|
|
192
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
|
|
193
|
+
}
|
|
194
|
+
if (keyMapping.withShiftAltGr) {
|
|
195
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
|
|
196
|
+
}
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
private addMacKeyMappings(key2KeyCode: KeyCode[], mappedKey: Key, keyMapping: IMacKeyMapping): void {
|
|
200
|
+
// Dead keys (e.g. the combining-accent layer of Option+E on macOS US) await a following keystroke to
|
|
201
|
+
// compose a glyph and so never produce a committed character. They must not be registered as if they
|
|
202
|
+
// produced their display glyph, which would otherwise collide with the real key for that glyph.
|
|
203
|
+
if (keyMapping.value && !keyMapping.valueIsDeadKey) {
|
|
204
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.value, false, false);
|
|
205
|
+
}
|
|
206
|
+
if (keyMapping.withShift && !keyMapping.withShiftIsDeadKey) {
|
|
207
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShift, true, false);
|
|
208
|
+
}
|
|
209
|
+
if (keyMapping.withAltGr && !keyMapping.withAltGrIsDeadKey) {
|
|
210
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withAltGr, false, true);
|
|
211
|
+
}
|
|
212
|
+
if (keyMapping.withShiftAltGr && !keyMapping.withShiftAltGrIsDeadKey) {
|
|
213
|
+
this.addKeyMapping(key2KeyCode, mappedKey, keyMapping.withShiftAltGr, true, true);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
|
|
193
217
|
private addKeyMapping(key2KeyCode: KeyCode[], mappedKey: Key, value: string, shift: boolean, alt: boolean): void {
|
|
194
218
|
const key = VALUE_TO_KEY[value];
|
|
195
219
|
if (key) {
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { expect } from 'chai';
|
|
18
18
|
import { MockLogger } from './test/mock-logger';
|
|
19
|
-
import { setRootLogger, unsetRootLogger, Logger } from './logger';
|
|
19
|
+
import { setRootLogger, unsetRootLogger, Logger, LogLevel, Log } from './logger';
|
|
20
20
|
import { DefaultLoggerSanitizer, LoggerSanitizer } from './logger-sanitizer';
|
|
21
21
|
|
|
22
22
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
@@ -39,6 +39,24 @@ class TestableLogger extends Logger {
|
|
|
39
39
|
public testSanitize(message: string): string {
|
|
40
40
|
return this.sanitize(message);
|
|
41
41
|
}
|
|
42
|
+
|
|
43
|
+
public testGetLog(logLevel: LogLevel): Promise<Log> {
|
|
44
|
+
return this.getLog(logLevel);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
/** Configure the logger to behave as if the backend reported the given current log level. */
|
|
48
|
+
public configureLogLevel(level: LogLevel): void {
|
|
49
|
+
(this as any).created = Promise.resolve();
|
|
50
|
+
(this as any)._logLevel = Promise.resolve(level);
|
|
51
|
+
(this as any).server = {
|
|
52
|
+
log: (...args: any[]) => {
|
|
53
|
+
this.loggedMessages.push(args);
|
|
54
|
+
return Promise.resolve();
|
|
55
|
+
}
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
public readonly loggedMessages: any[][] = [];
|
|
42
60
|
}
|
|
43
61
|
|
|
44
62
|
describe('logger', () => {
|
|
@@ -66,6 +84,49 @@ describe('logger', () => {
|
|
|
66
84
|
).to.not.throw(ReferenceError);
|
|
67
85
|
});
|
|
68
86
|
|
|
87
|
+
describe('log level gating', () => {
|
|
88
|
+
it('resolves debug() when the debug level is not enabled', async function (): Promise<void> {
|
|
89
|
+
this.timeout(1000);
|
|
90
|
+
const logger = new TestableLogger();
|
|
91
|
+
logger.configureLogLevel(LogLevel.INFO); // DEBUG is below INFO, so it is disabled
|
|
92
|
+
|
|
93
|
+
await logger.debug('this should not hang');
|
|
94
|
+
|
|
95
|
+
expect(logger.loggedMessages).to.have.lengthOf(0);
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
it('resolves debug() and logs when the debug level is enabled', async () => {
|
|
99
|
+
const logger = new TestableLogger();
|
|
100
|
+
logger.configureLogLevel(LogLevel.DEBUG);
|
|
101
|
+
|
|
102
|
+
await logger.debug('hello');
|
|
103
|
+
|
|
104
|
+
expect(logger.loggedMessages).to.have.lengthOf(1);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it('does not invoke a loggable when the level is not enabled', async function (): Promise<void> {
|
|
108
|
+
this.timeout(1000);
|
|
109
|
+
const logger = new TestableLogger();
|
|
110
|
+
logger.configureLogLevel(LogLevel.INFO);
|
|
111
|
+
let invoked = false;
|
|
112
|
+
|
|
113
|
+
await logger.debug(() => { invoked = true; });
|
|
114
|
+
|
|
115
|
+
expect(invoked).to.equal(false);
|
|
116
|
+
});
|
|
117
|
+
|
|
118
|
+
it('getLog() resolves to a no-op when the level is not enabled', async function (): Promise<void> {
|
|
119
|
+
this.timeout(1000);
|
|
120
|
+
const logger = new TestableLogger();
|
|
121
|
+
logger.configureLogLevel(LogLevel.INFO);
|
|
122
|
+
|
|
123
|
+
const log = await logger.testGetLog(LogLevel.DEBUG);
|
|
124
|
+
log('this should be ignored');
|
|
125
|
+
|
|
126
|
+
expect(logger.loggedMessages).to.have.lengthOf(0);
|
|
127
|
+
});
|
|
128
|
+
});
|
|
129
|
+
|
|
69
130
|
describe('Logger sanitization', () => {
|
|
70
131
|
let loggerWithSanitizer: TestableLogger;
|
|
71
132
|
let loggerWithoutSanitizer: TestableLogger;
|
package/src/common/logger.ts
CHANGED
|
@@ -56,6 +56,9 @@ export function setRootLogger(aLogger: ILogger): void {
|
|
|
56
56
|
export type Log = (message: any, ...params: any[]) => void;
|
|
57
57
|
export type Loggable = (log: Log) => void;
|
|
58
58
|
|
|
59
|
+
/** Shared no-op {@link Log} returned for a disabled level so that callers neither block nor emit. */
|
|
60
|
+
const nullLogger: Log = () => { };
|
|
61
|
+
|
|
59
62
|
export const LoggerFactory = Symbol('LoggerFactory');
|
|
60
63
|
export type LoggerFactory = (name: string) => ILogger;
|
|
61
64
|
|
|
@@ -304,6 +307,9 @@ export class Logger implements ILogger {
|
|
|
304
307
|
}
|
|
305
308
|
log(logLevel: number, arg2: any | Loggable, ...params: any[]): Promise<void> {
|
|
306
309
|
return this.getLog(logLevel).then(log => {
|
|
310
|
+
if (log === nullLogger) {
|
|
311
|
+
return;
|
|
312
|
+
}
|
|
307
313
|
if (typeof arg2 === 'function') {
|
|
308
314
|
const loggable = arg2;
|
|
309
315
|
loggable(log);
|
|
@@ -313,12 +319,15 @@ export class Logger implements ILogger {
|
|
|
313
319
|
});
|
|
314
320
|
}
|
|
315
321
|
protected getLog(logLevel: number): Promise<Log> {
|
|
316
|
-
return this.
|
|
317
|
-
|
|
322
|
+
return this.isEnabled(logLevel).then(enabled => {
|
|
323
|
+
if (!enabled) {
|
|
324
|
+
return nullLogger;
|
|
325
|
+
}
|
|
326
|
+
return this.created.then(() =>
|
|
318
327
|
(message: any, ...params: any[]) =>
|
|
319
328
|
this.server.log(this.name, logLevel, this.format(message), params.map(p => this.format(p)))
|
|
320
|
-
)
|
|
321
|
-
);
|
|
329
|
+
);
|
|
330
|
+
});
|
|
322
331
|
}
|
|
323
332
|
protected format(value: any): any {
|
|
324
333
|
switch (typeof value) {
|