@codingame/monaco-vscode-keybindings-service-override 16.1.1 → 17.0.0
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/package.json +10 -10
- package/vscode/src/vs/platform/keyboardLayout/common/keyboardConfig.js +3 -3
- package/vscode/src/vs/workbench/browser/contextkeys.js +6 -6
- package/vscode/src/vs/workbench/contrib/commands/common/commands.contribution.js +5 -5
- package/vscode/src/vs/workbench/contrib/keybindings/browser/keybindings.contribution.js +1 -1
- package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.js +4 -4
- package/vscode/src/vs/workbench/services/actions/common/menusExtensionPoint.js +136 -136
- package/vscode/src/vs/workbench/services/keybinding/browser/keybindingService.js +24 -24
- package/vscode/src/vs/workbench/services/keybinding/browser/keyboardLayoutService.js +2 -2
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@codingame/monaco-vscode-keybindings-service-override",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "17.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "VSCode public API plugged on the monaco editor - keybindings service-override",
|
|
6
6
|
"keywords": [],
|
|
@@ -15,15 +15,15 @@
|
|
|
15
15
|
},
|
|
16
16
|
"type": "module",
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "
|
|
19
|
-
"@codingame/monaco-vscode-
|
|
20
|
-
"@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "
|
|
21
|
-
"@codingame/monaco-vscode-
|
|
22
|
-
"@codingame/monaco-vscode-
|
|
23
|
-
"@codingame/monaco-vscode-
|
|
24
|
-
"@codingame/monaco-vscode-
|
|
25
|
-
"@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "
|
|
26
|
-
"@codingame/monaco-vscode-files-service-override": "
|
|
18
|
+
"@codingame/monaco-vscode-2a22c7b4-b906-5914-8cd1-3ed912fb738f-common": "17.0.0",
|
|
19
|
+
"@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common": "17.0.0",
|
|
20
|
+
"@codingame/monaco-vscode-40cada32-7e9c-528a-81fc-766e4da54147-common": "17.0.0",
|
|
21
|
+
"@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common": "17.0.0",
|
|
22
|
+
"@codingame/monaco-vscode-a3eaa464-944c-5b8f-8886-213068ba4897-common": "17.0.0",
|
|
23
|
+
"@codingame/monaco-vscode-api": "17.0.0",
|
|
24
|
+
"@codingame/monaco-vscode-c8227507-8e59-53d6-b50b-71c0ab384cf4-common": "17.0.0",
|
|
25
|
+
"@codingame/monaco-vscode-d609a7d3-bf87-551a-884f-550a8b327ec5-common": "17.0.0",
|
|
26
|
+
"@codingame/monaco-vscode-files-service-override": "17.0.0"
|
|
27
27
|
},
|
|
28
28
|
"main": "index.js",
|
|
29
29
|
"module": "index.js",
|
|
@@ -20,7 +20,7 @@ const keyboardConfiguration = {
|
|
|
20
20
|
'id': 'keyboard',
|
|
21
21
|
'order': 15,
|
|
22
22
|
'type': 'object',
|
|
23
|
-
'title': ( localize(
|
|
23
|
+
'title': ( localize(1889, "Keyboard")),
|
|
24
24
|
'properties': {
|
|
25
25
|
'keyboard.dispatch': {
|
|
26
26
|
scope: ConfigurationScope.APPLICATION,
|
|
@@ -28,7 +28,7 @@ const keyboardConfiguration = {
|
|
|
28
28
|
enum: ['code', 'keyCode'],
|
|
29
29
|
default: 'code',
|
|
30
30
|
markdownDescription: ( localize(
|
|
31
|
-
|
|
31
|
+
1890,
|
|
32
32
|
"Controls the dispatching logic for key presses to use either `code` (recommended) or `keyCode`."
|
|
33
33
|
)),
|
|
34
34
|
included: OS === OperatingSystem.Macintosh || OS === OperatingSystem.Linux
|
|
@@ -37,7 +37,7 @@ const keyboardConfiguration = {
|
|
|
37
37
|
scope: ConfigurationScope.APPLICATION,
|
|
38
38
|
type: 'boolean',
|
|
39
39
|
default: false,
|
|
40
|
-
markdownDescription: ( localize(
|
|
40
|
+
markdownDescription: ( localize(1891, "Controls if the AltGraph+ modifier should be treated as Ctrl+Alt+.")),
|
|
41
41
|
included: OS === OperatingSystem.Windows
|
|
42
42
|
}
|
|
43
43
|
}
|
|
@@ -13,10 +13,10 @@ import { IConfigurationService } from '@codingame/monaco-vscode-api/vscode/vs/pl
|
|
|
13
13
|
import { IWorkbenchEnvironmentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/environment/common/environmentService.service';
|
|
14
14
|
import { WorkbenchState, isTemporaryWorkspace } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace';
|
|
15
15
|
import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
|
|
16
|
-
import { positionToString, Parts } from '@codingame/monaco-vscode-
|
|
16
|
+
import { positionToString, Parts } from '@codingame/monaco-vscode-c8227507-8e59-53d6-b50b-71c0ab384cf4-common/vscode/vs/workbench/services/layout/browser/layoutService';
|
|
17
17
|
import { IWorkbenchLayoutService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/layout/browser/layoutService.service';
|
|
18
18
|
import { getRemoteName } from '@codingame/monaco-vscode-api/vscode/vs/platform/remote/common/remoteHosts';
|
|
19
|
-
import { getVirtualWorkspaceScheme } from '@codingame/monaco-vscode-
|
|
19
|
+
import { getVirtualWorkspaceScheme } from '@codingame/monaco-vscode-2cbab29e-9393-5de6-b701-9a9555360b6b-common/vscode/vs/platform/workspace/common/virtualWorkspace';
|
|
20
20
|
import { IWorkingCopyService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/workingCopy/common/workingCopyService.service';
|
|
21
21
|
import { isNative } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
|
|
22
22
|
import { IPaneCompositePartService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/panecomposite/browser/panecomposite.service';
|
|
@@ -113,7 +113,7 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
|
|
|
113
113
|
this._register(this.editorGroupService.onDidChangeGroupIndex(() => this.updateActiveEditorGroupContextKeys()));
|
|
114
114
|
this._register(this.editorGroupService.onDidChangeGroupLocked(() => this.updateActiveEditorGroupContextKeys()));
|
|
115
115
|
this._register(this.editorGroupService.onDidChangeEditorPartOptions(() => this.updateEditorAreaContextKeys()));
|
|
116
|
-
this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => disposables.add(addDisposableListener(window, EventType.FOCUS_IN, () => this.updateInputContextKeys(window.document), true)), { window: mainWindow, disposables: this._store }));
|
|
116
|
+
this._register(Event.runAndSubscribe(onDidRegisterWindow, ({ window, disposables }) => disposables.add(addDisposableListener(window, EventType.FOCUS_IN, () => this.updateInputContextKeys(window.document, disposables), true)), { window: mainWindow, disposables: this._store }));
|
|
117
117
|
this._register(this.contextService.onDidChangeWorkbenchState(() => this.updateWorkbenchStateContextKey()));
|
|
118
118
|
this._register(this.contextService.onDidChangeWorkspaceFolders(() => {
|
|
119
119
|
this.updateWorkspaceFolderCountContextKey();
|
|
@@ -180,20 +180,20 @@ let WorkbenchContextKeysHandler = class WorkbenchContextKeysHandler extends Disp
|
|
|
180
180
|
updateEditorAreaContextKeys() {
|
|
181
181
|
this.editorTabsVisibleContext.set(this.editorGroupService.partOptions.showTabs === 'multiple');
|
|
182
182
|
}
|
|
183
|
-
updateInputContextKeys(ownerDocument) {
|
|
183
|
+
updateInputContextKeys(ownerDocument, disposables) {
|
|
184
184
|
function activeElementIsInput() {
|
|
185
185
|
return !!ownerDocument.activeElement && isEditableElement(ownerDocument.activeElement);
|
|
186
186
|
}
|
|
187
187
|
const isInputFocused = activeElementIsInput();
|
|
188
188
|
this.inputFocusedContext.set(isInputFocused);
|
|
189
189
|
if (isInputFocused) {
|
|
190
|
-
const tracker = trackFocus(ownerDocument.activeElement);
|
|
190
|
+
const tracker = disposables.add(trackFocus(ownerDocument.activeElement));
|
|
191
191
|
Event.once(tracker.onDidBlur)(() => {
|
|
192
192
|
if (getActiveWindow().document === ownerDocument) {
|
|
193
193
|
this.inputFocusedContext.set(activeElementIsInput());
|
|
194
194
|
}
|
|
195
195
|
tracker.dispose();
|
|
196
|
-
});
|
|
196
|
+
}, undefined, disposables);
|
|
197
197
|
}
|
|
198
198
|
}
|
|
199
199
|
updateWorkbenchStateContextKey() {
|
|
@@ -10,10 +10,10 @@ class RunCommands extends Action2 {
|
|
|
10
10
|
constructor() {
|
|
11
11
|
super({
|
|
12
12
|
id: 'runCommands',
|
|
13
|
-
title: ( localize2(
|
|
13
|
+
title: ( localize2(5254, "Run Commands")),
|
|
14
14
|
f1: false,
|
|
15
15
|
metadata: {
|
|
16
|
-
description: ( localize(
|
|
16
|
+
description: ( localize(5255, "Run several commands")),
|
|
17
17
|
args: [
|
|
18
18
|
{
|
|
19
19
|
name: 'args',
|
|
@@ -23,7 +23,7 @@ class RunCommands extends Action2 {
|
|
|
23
23
|
properties: {
|
|
24
24
|
commands: {
|
|
25
25
|
type: 'array',
|
|
26
|
-
description: ( localize(
|
|
26
|
+
description: ( localize(5256, "Commands to run")),
|
|
27
27
|
items: {
|
|
28
28
|
anyOf: [
|
|
29
29
|
{
|
|
@@ -63,14 +63,14 @@ class RunCommands extends Action2 {
|
|
|
63
63
|
const notificationService = accessor.get(INotificationService);
|
|
64
64
|
if (!this._isCommandArgs(args)) {
|
|
65
65
|
notificationService.error(( localize(
|
|
66
|
-
|
|
66
|
+
5257,
|
|
67
67
|
"'runCommands' has received an argument with incorrect type. Please, review the argument passed to the command."
|
|
68
68
|
)));
|
|
69
69
|
return;
|
|
70
70
|
}
|
|
71
71
|
if (args.commands.length === 0) {
|
|
72
72
|
notificationService.warn(( localize(
|
|
73
|
-
|
|
73
|
+
5258,
|
|
74
74
|
"'runCommands' has not received commands to run. Did you forget to pass commands in the 'runCommands' argument?"
|
|
75
75
|
)));
|
|
76
76
|
return;
|
|
@@ -16,7 +16,7 @@ class ToggleKeybindingsLogAction extends Action2 {
|
|
|
16
16
|
constructor() {
|
|
17
17
|
super({
|
|
18
18
|
id: 'workbench.action.toggleKeybindingsLog',
|
|
19
|
-
title: ( localize2(
|
|
19
|
+
title: ( localize2(7420, "Toggle Keyboard Shortcuts Troubleshooting")),
|
|
20
20
|
category: Categories.Developer,
|
|
21
21
|
f1: true
|
|
22
22
|
});
|
package/vscode/src/vs/workbench/contrib/preferences/browser/keybindingsEditorContribution.js
CHANGED
|
@@ -20,11 +20,11 @@ import { KeybindingParser } from '@codingame/monaco-vscode-2a22c7b4-b906-5914-8c
|
|
|
20
20
|
import { assertIsDefined } from '@codingame/monaco-vscode-api/vscode/vs/base/common/types';
|
|
21
21
|
import { isEqual } from '@codingame/monaco-vscode-api/vscode/vs/base/common/resources';
|
|
22
22
|
import { IUserDataProfileService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/userDataProfile/common/userDataProfile.service';
|
|
23
|
-
import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID } from '@codingame/monaco-vscode-
|
|
23
|
+
import { DEFINE_KEYBINDING_EDITOR_CONTRIB_ID } from '@codingame/monaco-vscode-4a0e04a7-c3bd-5fb7-9d3b-4fd047cc9e59-common/vscode/vs/workbench/services/preferences/common/preferences';
|
|
24
24
|
|
|
25
25
|
var KeybindingEditorDecorationsRenderer_1;
|
|
26
26
|
const NLS_KB_LAYOUT_ERROR_MESSAGE = ( localize(
|
|
27
|
-
|
|
27
|
+
8573,
|
|
28
28
|
"You won't be able to produce this key combination under your current keyboard layout."
|
|
29
29
|
));
|
|
30
30
|
let DefineKeybindingEditorContribution = class DefineKeybindingEditorContribution extends Disposable {
|
|
@@ -182,14 +182,14 @@ let KeybindingEditorDecorationsRenderer = KeybindingEditorDecorationsRenderer_1
|
|
|
182
182
|
else {
|
|
183
183
|
if (usLabel && uiLabel !== usLabel) {
|
|
184
184
|
msg = ( new MarkdownString(( localize(
|
|
185
|
-
|
|
185
|
+
8574,
|
|
186
186
|
"**{0}** for your current keyboard layout (**{1}** for US standard).",
|
|
187
187
|
uiLabel,
|
|
188
188
|
usLabel
|
|
189
189
|
))));
|
|
190
190
|
}
|
|
191
191
|
else {
|
|
192
|
-
msg = ( new MarkdownString(( localize(
|
|
192
|
+
msg = ( new MarkdownString(( localize(8575, "**{0}** for your current keyboard layout.", uiLabel))));
|
|
193
193
|
}
|
|
194
194
|
className = 'keybindingInfo';
|
|
195
195
|
overviewRulerColor = themeColorFromId(overviewRulerInfo);
|