@theia/keymaps 1.42.1 → 1.43.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.
@@ -28,8 +28,10 @@ exports.KeymapsFrontendContribution = exports.KeymapsCommands = void 0;
28
28
  const inversify_1 = require("@theia/core/shared/inversify");
29
29
  const common_1 = require("@theia/core/lib/common");
30
30
  const browser_1 = require("@theia/core/lib/browser");
31
+ const clipboard_service_1 = require("@theia/core/lib/browser/clipboard-service");
31
32
  const common_frontend_contribution_1 = require("@theia/core/lib/browser/common-frontend-contribution");
32
33
  const keymaps_service_1 = require("./keymaps-service");
34
+ const keybinding_1 = require("@theia/core/lib/common/keybinding");
33
35
  const keybindings_widget_1 = require("./keybindings-widget");
34
36
  const nls_1 = require("@theia/core/lib/common/nls");
35
37
  var KeymapsCommands;
@@ -52,6 +54,51 @@ var KeymapsCommands;
52
54
  id: 'keymaps.clearSearch',
53
55
  iconClass: (0, browser_1.codicon)('clear-all')
54
56
  };
57
+ KeymapsCommands.COPY_KEYBINDING = common_1.Command.toLocalizedCommand({
58
+ id: 'keymaps:keybinding.copy',
59
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
60
+ label: 'Copy Keybinding'
61
+ }, 'theia/keymaps/keybinding/copy', common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY_KEY);
62
+ KeymapsCommands.COPY_COMMAND_ID = common_1.Command.toLocalizedCommand({
63
+ id: 'keymaps:keybinding.copyCommandId',
64
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
65
+ label: 'Copy Keybinding Command ID'
66
+ }, 'theia/keymaps/keybinding/copyCommandId', common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY_KEY);
67
+ KeymapsCommands.COPY_COMMAND_TITLE = common_1.Command.toLocalizedCommand({
68
+ id: 'keymaps:keybinding.copyCommandTitle',
69
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
70
+ label: 'Copy Keybinding Command Title'
71
+ }, 'theia/keymaps/keybinding/copyCommandTitle', common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY_KEY);
72
+ KeymapsCommands.EDIT_KEYBINDING = common_1.Command.toLocalizedCommand({
73
+ id: 'keymaps:keybinding.edit',
74
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
75
+ label: 'Edit Keybinding...'
76
+ }, 'theia/keymaps/keybinding/edit', common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY_KEY);
77
+ KeymapsCommands.EDIT_WHEN_EXPRESSION = common_1.Command.toLocalizedCommand({
78
+ id: 'keymaps:keybinding.editWhenExpression',
79
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
80
+ label: 'Edit Keybinding When Expression...'
81
+ }, 'theia/keymaps/keybinding/editWhenExpression', common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY_KEY);
82
+ KeymapsCommands.ADD_KEYBINDING = common_1.Command.toDefaultLocalizedCommand({
83
+ id: 'keymaps:keybinding.add',
84
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
85
+ label: 'Add Keybinding...'
86
+ });
87
+ KeymapsCommands.REMOVE_KEYBINDING = common_1.Command.toDefaultLocalizedCommand({
88
+ id: 'keymaps:keybinding.remove',
89
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
90
+ label: 'Remove Keybinding'
91
+ });
92
+ KeymapsCommands.RESET_KEYBINDING = common_1.Command.toDefaultLocalizedCommand({
93
+ id: 'keymaps:keybinding.reset',
94
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
95
+ label: 'Reset Keybinding'
96
+ });
97
+ KeymapsCommands.SHOW_SAME = common_1.Command.toDefaultLocalizedCommand({
98
+ id: 'keymaps:keybinding.showSame',
99
+ category: common_frontend_contribution_1.CommonCommands.PREFERENCES_CATEGORY,
100
+ label: 'Show Same Keybindings'
101
+ });
55
102
  })(KeymapsCommands = exports.KeymapsCommands || (exports.KeymapsCommands = {}));
56
103
  let KeymapsFrontendContribution = class KeymapsFrontendContribution extends browser_1.AbstractViewContribution {
57
104
  constructor() {
@@ -82,6 +129,51 @@ let KeymapsFrontendContribution = class KeymapsFrontendContribution extends brow
82
129
  isVisible: w => this.withWidget(w, () => true),
83
130
  execute: w => this.withWidget(w, widget => widget.clearSearch()),
84
131
  });
132
+ commands.registerCommand(KeymapsCommands.COPY_KEYBINDING, {
133
+ isEnabled: (...args) => this.withItem(() => true, ...args),
134
+ isVisible: (...args) => this.withItem(() => true, ...args),
135
+ execute: (...args) => this.withItem(item => this.clipboard.writeText(JSON.stringify(keybinding_1.Keybinding.apiObjectify(keybindings_widget_1.KeybindingItem.keybinding(item)), undefined, ' ')), ...args)
136
+ });
137
+ commands.registerCommand(KeymapsCommands.COPY_COMMAND_ID, {
138
+ isEnabled: (...args) => this.withItem(() => true, ...args),
139
+ isVisible: (...args) => this.withItem(() => true, ...args),
140
+ execute: (...args) => this.withItem(item => this.clipboard.writeText(item.command.id), ...args)
141
+ });
142
+ commands.registerCommand(KeymapsCommands.COPY_COMMAND_TITLE, {
143
+ isEnabled: (...args) => this.withItem(item => !!item.command.label, ...args),
144
+ isVisible: (...args) => this.withItem(() => true, ...args),
145
+ execute: (...args) => this.withItem(item => this.clipboard.writeText(item.command.label), ...args)
146
+ });
147
+ commands.registerCommand(KeymapsCommands.EDIT_KEYBINDING, {
148
+ isEnabled: (...args) => this.withWidgetItem(() => true, ...args),
149
+ isVisible: (...args) => this.withWidgetItem(() => true, ...args),
150
+ execute: (...args) => this.withWidgetItem((item, widget) => widget.editKeybinding(item), ...args)
151
+ });
152
+ commands.registerCommand(KeymapsCommands.EDIT_WHEN_EXPRESSION, {
153
+ isEnabled: (...args) => this.withWidgetItem(item => !!item.keybinding, ...args),
154
+ isVisible: (...args) => this.withWidgetItem(() => true, ...args),
155
+ execute: (...args) => this.withWidgetItem((item, widget) => widget.editWhenExpression(item), ...args)
156
+ });
157
+ commands.registerCommand(KeymapsCommands.ADD_KEYBINDING, {
158
+ isEnabled: (...args) => this.withWidgetItem(item => !!item.keybinding, ...args),
159
+ isVisible: (...args) => this.withWidgetItem(item => !!item.keybinding, ...args),
160
+ execute: (...args) => this.withWidgetItem((item, widget) => widget.addKeybinding(item), ...args)
161
+ });
162
+ commands.registerCommand(KeymapsCommands.REMOVE_KEYBINDING, {
163
+ isEnabled: (...args) => this.withItem(item => !!item.keybinding, ...args),
164
+ isVisible: (...args) => this.withItem(() => true, ...args),
165
+ execute: (...args) => this.withItem(item => this.keymaps.unsetKeybinding(item.keybinding), ...args)
166
+ });
167
+ commands.registerCommand(KeymapsCommands.RESET_KEYBINDING, {
168
+ isEnabled: (...args) => this.withWidgetItem((item, widget) => widget.canResetKeybinding(item), ...args),
169
+ isVisible: (...args) => this.withWidgetItem(() => true, ...args),
170
+ execute: (...args) => this.withWidgetItem((item, widget) => widget.resetKeybinding(item), ...args)
171
+ });
172
+ commands.registerCommand(KeymapsCommands.SHOW_SAME, {
173
+ isEnabled: (...args) => this.withWidgetItem(item => !!item.keybinding, ...args),
174
+ isVisible: (...args) => this.withWidgetItem(() => true, ...args),
175
+ execute: (...args) => this.withWidgetItem((item, widget) => widget.showSameKeybindings(item), ...args)
176
+ });
85
177
  }
86
178
  registerMenus(menus) {
87
179
  menus.registerMenuAction(common_frontend_contribution_1.CommonMenus.FILE_SETTINGS_SUBMENU_OPEN, {
@@ -89,10 +181,55 @@ let KeymapsFrontendContribution = class KeymapsFrontendContribution extends brow
89
181
  label: nls_1.nls.localizeByDefault('Keyboard Shortcuts'),
90
182
  order: 'a20'
91
183
  });
92
- menus.registerMenuAction(common_frontend_contribution_1.CommonMenus.SETTINGS_OPEN, {
184
+ menus.registerMenuAction(common_frontend_contribution_1.CommonMenus.MANAGE_SETTINGS, {
93
185
  commandId: KeymapsCommands.OPEN_KEYMAPS.id,
94
186
  label: nls_1.nls.localizeByDefault('Keyboard Shortcuts'),
95
- order: 'a20'
187
+ order: 'a30'
188
+ });
189
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.COPY_MENU, {
190
+ commandId: KeymapsCommands.COPY_KEYBINDING.id,
191
+ label: nls_1.nls.localizeByDefault('Copy'),
192
+ order: 'a'
193
+ });
194
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.COPY_MENU, {
195
+ commandId: KeymapsCommands.COPY_COMMAND_ID.id,
196
+ label: nls_1.nls.localizeByDefault('Copy Command ID'),
197
+ order: 'b'
198
+ });
199
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.COPY_MENU, {
200
+ commandId: KeymapsCommands.COPY_COMMAND_TITLE.id,
201
+ label: nls_1.nls.localizeByDefault('Copy Command Title'),
202
+ order: 'c'
203
+ });
204
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.EDIT_MENU, {
205
+ commandId: KeymapsCommands.EDIT_KEYBINDING.id,
206
+ label: nls_1.nls.localize('theia/keymaps/editKeybinding', 'Edit Keybinding...'),
207
+ order: 'a'
208
+ });
209
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.EDIT_MENU, {
210
+ commandId: KeymapsCommands.EDIT_WHEN_EXPRESSION.id,
211
+ label: nls_1.nls.localize('theia/keymaps/editWhenExpression', 'Edit When Expression...'),
212
+ order: 'b'
213
+ });
214
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.ADD_MENU, {
215
+ commandId: KeymapsCommands.ADD_KEYBINDING.id,
216
+ label: nls_1.nls.localizeByDefault('Add Keybinding...'),
217
+ order: 'a'
218
+ });
219
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.REMOVE_MENU, {
220
+ commandId: KeymapsCommands.REMOVE_KEYBINDING.id,
221
+ label: nls_1.nls.localizeByDefault('Remove Keybinding'),
222
+ order: 'a'
223
+ });
224
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.REMOVE_MENU, {
225
+ commandId: KeymapsCommands.RESET_KEYBINDING.id,
226
+ label: nls_1.nls.localizeByDefault('Reset Keybinding'),
227
+ order: 'b'
228
+ });
229
+ menus.registerMenuAction(keybindings_widget_1.KeybindingWidget.SHOW_MENU, {
230
+ commandId: KeymapsCommands.SHOW_SAME.id,
231
+ label: nls_1.nls.localizeByDefault('Show Same Keybindings'),
232
+ order: 'a'
96
233
  });
97
234
  }
98
235
  registerKeybindings(keybindings) {
@@ -127,11 +264,29 @@ let KeymapsFrontendContribution = class KeymapsFrontendContribution extends brow
127
264
  }
128
265
  return false;
129
266
  }
267
+ withItem(fn, ...args) {
268
+ const [item] = args;
269
+ if (keybindings_widget_1.KeybindingItem.is(item)) {
270
+ return fn(item, args.slice(1));
271
+ }
272
+ return false;
273
+ }
274
+ withWidgetItem(fn, ...args) {
275
+ const [item, widget] = args;
276
+ if (widget instanceof keybindings_widget_1.KeybindingWidget && widget.id === keybindings_widget_1.KeybindingWidget.ID && keybindings_widget_1.KeybindingItem.is(item)) {
277
+ return fn(item, widget, args.slice(2));
278
+ }
279
+ return false;
280
+ }
130
281
  };
131
282
  __decorate([
132
283
  (0, inversify_1.inject)(keymaps_service_1.KeymapsService),
133
284
  __metadata("design:type", keymaps_service_1.KeymapsService)
134
285
  ], KeymapsFrontendContribution.prototype, "keymaps", void 0);
286
+ __decorate([
287
+ (0, inversify_1.inject)(clipboard_service_1.ClipboardService),
288
+ __metadata("design:type", Object)
289
+ ], KeymapsFrontendContribution.prototype, "clipboard", void 0);
135
290
  KeymapsFrontendContribution = __decorate([
136
291
  (0, inversify_1.injectable)(),
137
292
  __metadata("design:paramtypes", [])
@@ -1 +1 @@
1
- {"version":3,"file":"keymaps-frontend-contribution.js","sourceRoot":"","sources":["../../src/browser/keymaps-frontend-contribution.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keymaps-frontend-contribution.js","sourceRoot":"","sources":["../../src/browser/keymaps-frontend-contribution.ts"],"names":[],"mappings":"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"}
@@ -40,7 +40,20 @@ export declare class KeymapsService {
40
40
  */
41
41
  setKeybinding(newKeybinding: Keybinding, oldKeybinding: ScopedKeybinding | undefined): Promise<void>;
42
42
  /**
43
- * Remove the given keybinding with the given command id from the JSON.
43
+ * Unset the given keybinding in the JSON.
44
+ * If the given keybinding has a default scope, it will be disabled in the JSON.
45
+ * Otherwise, it will be removed from the JSON.
46
+ * @param keybinding the keybinding to unset
47
+ */
48
+ unsetKeybinding(keybinding: ScopedKeybinding): Promise<void>;
49
+ /**
50
+ * Whether there is a keybinding with the given command id in the JSON.
51
+ * @param commandId the keybinding command id
52
+ */
53
+ hasKeybinding(commandId: string): boolean;
54
+ /**
55
+ * Remove the keybindings with the given command id from the JSON.
56
+ * This includes disabled keybindings.
44
57
  * @param commandId the keybinding command id.
45
58
  */
46
59
  removeKeybinding(commandId: string): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"keymaps-service.d.ts","sourceRoot":"","sources":["../../src/browser/keymaps-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAA6B,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAmB,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAiB,MAAM,mCAAmC,CAAC;AAG9E,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAEvF,qBACa,cAAc;IAGvB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IAG9C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAGzC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,gBAAuB;IAC7D,QAAQ,CAAC,kBAAkB,qDAAkC;IAE7D,SAAS,CAAC,KAAK,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,aAAa,8BAAqC;IAErE;;OAEG;IAEH,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;OAEG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IA0B3B;;;OAGG;IACG,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;OAIG;IACG,aAAa,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,gBAAgB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAwD1G;;;OAGG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAWlC,YAAY,CAAC,EAAE,EAAE,MAAM,UAAU,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CAc7E"}
1
+ {"version":3,"file":"keymaps-service.d.ts","sourceRoot":"","sources":["../../src/browser/keymaps-service.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAA6B,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,kBAAkB,EAAmB,gBAAgB,EAAE,MAAM,oCAAoC,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAiB,MAAM,mCAAmC,CAAC;AAG9E,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAE/D,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,oDAAoD,CAAC;AAEvF,qBACa,cAAc;IAGvB,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IAG9C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,sBAAsB,CAAC;IAG5D,SAAS,CAAC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAG1D,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAC;IAGzC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAGlD,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,iBAAiB,CAAC;IAElD,SAAS,CAAC,QAAQ,CAAC,mBAAmB,gBAAuB;IAC7D,QAAQ,CAAC,kBAAkB,qDAAkC;IAE7D,SAAS,CAAC,KAAK,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC/C,SAAS,CAAC,QAAQ,CAAC,aAAa,8BAAqC;IAErE;;OAEG;IAEH,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAYvC;;OAEG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IA0B3B;;;OAGG;IACG,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvC;;;;OAIG;IACG,aAAa,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,gBAAgB,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB1G;;;;;OAKG;IACH,eAAe,CAAC,UAAU,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoB5D;;;OAGG;IACH,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO;IAKzC;;;;OAIG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;cAWlC,YAAY,CAAC,EAAE,EAAE,MAAM,UAAU,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;CAc7E"}
@@ -112,60 +112,62 @@ let KeymapsService = class KeymapsService {
112
112
  */
113
113
  async setKeybinding(newKeybinding, oldKeybinding) {
114
114
  return this.updateKeymap(() => {
115
- let newAdded = false;
116
- let isOldKeybindingDisabled = false;
117
- let addedDisabledEntry = false;
118
- const keybindings = [];
119
- for (let keybinding of this.keybindingRegistry.getKeybindingsByScope(keybinding_1.KeybindingScope.USER)) {
120
- // search for the old keybinding and modify it
121
- if (oldKeybinding && keybinding_2.Keybinding.equals(keybinding, oldKeybinding, false, true)) {
122
- newAdded = true;
123
- keybinding = {
124
- ...keybinding,
125
- keybinding: newKeybinding.keybinding
126
- };
127
- }
128
- // we have an disabled entry for the same command and the oldKeybinding
129
- if ((oldKeybinding === null || oldKeybinding === void 0 ? void 0 : oldKeybinding.keybinding) &&
130
- keybinding_2.Keybinding.equals(keybinding, { ...newKeybinding, keybinding: oldKeybinding.keybinding, command: '-' + newKeybinding.command }, false, true)) {
131
- isOldKeybindingDisabled = true;
132
- }
133
- keybindings.push(keybinding);
134
- }
135
- if (!newAdded) {
136
- keybindings.push({
137
- command: newKeybinding.command,
138
- keybinding: newKeybinding.keybinding,
139
- context: newKeybinding.context,
140
- when: newKeybinding.when,
141
- args: newKeybinding.args
142
- });
143
- newAdded = true;
115
+ const keybindings = [...this.keybindingRegistry.getKeybindingsByScope(keybinding_1.KeybindingScope.USER)];
116
+ if (!oldKeybinding) {
117
+ keybinding_2.Keybinding.addKeybinding(keybindings, newKeybinding);
118
+ return keybindings;
144
119
  }
145
- // we want to add a disabled entry for the old keybinding only when we are modifying the default value
146
- if (!isOldKeybindingDisabled && (oldKeybinding === null || oldKeybinding === void 0 ? void 0 : oldKeybinding.scope) === keybinding_1.KeybindingScope.DEFAULT) {
120
+ else if (oldKeybinding.scope === keybinding_1.KeybindingScope.DEFAULT) {
121
+ keybinding_2.Keybinding.addKeybinding(keybindings, newKeybinding);
147
122
  const disabledBinding = {
148
- command: '-' + newKeybinding.command,
149
- // TODO key: oldKeybinding, see https://github.com/eclipse-theia/theia/issues/6879
150
- keybinding: oldKeybinding.keybinding,
151
- context: newKeybinding.context,
152
- when: newKeybinding.when,
153
- args: newKeybinding.args
123
+ ...oldKeybinding,
124
+ command: '-' + oldKeybinding.command
154
125
  };
155
- // Add disablement of the old keybinding if it isn't already disabled in the list to avoid duplicate disabled entries
156
- if (!keybindings.some(binding => keybinding_2.Keybinding.equals(binding, disabledBinding, false, true))) {
157
- keybindings.push(disabledBinding);
158
- }
159
- isOldKeybindingDisabled = true;
160
- addedDisabledEntry = true;
126
+ keybinding_2.Keybinding.addKeybinding(keybindings, disabledBinding);
127
+ return keybindings;
161
128
  }
162
- if (newAdded || addedDisabledEntry) {
129
+ else if (keybinding_2.Keybinding.replaceKeybinding(keybindings, oldKeybinding, newKeybinding)) {
163
130
  return keybindings;
164
131
  }
165
132
  });
166
133
  }
167
134
  /**
168
- * Remove the given keybinding with the given command id from the JSON.
135
+ * Unset the given keybinding in the JSON.
136
+ * If the given keybinding has a default scope, it will be disabled in the JSON.
137
+ * Otherwise, it will be removed from the JSON.
138
+ * @param keybinding the keybinding to unset
139
+ */
140
+ unsetKeybinding(keybinding) {
141
+ return this.updateKeymap(() => {
142
+ const keybindings = this.keybindingRegistry.getKeybindingsByScope(keybinding_1.KeybindingScope.USER);
143
+ if (keybinding.scope === keybinding_1.KeybindingScope.DEFAULT) {
144
+ const result = [...keybindings];
145
+ const disabledBinding = {
146
+ ...keybinding,
147
+ command: '-' + keybinding.command
148
+ };
149
+ keybinding_2.Keybinding.addKeybinding(result, disabledBinding);
150
+ return result;
151
+ }
152
+ else {
153
+ const filtered = keybindings.filter(a => !keybinding_2.Keybinding.equals(a, keybinding, false, true));
154
+ if (filtered.length !== keybindings.length) {
155
+ return filtered;
156
+ }
157
+ }
158
+ });
159
+ }
160
+ /**
161
+ * Whether there is a keybinding with the given command id in the JSON.
162
+ * @param commandId the keybinding command id
163
+ */
164
+ hasKeybinding(commandId) {
165
+ const keybindings = this.keybindingRegistry.getKeybindingsByScope(keybinding_1.KeybindingScope.USER);
166
+ return keybindings.some(a => a.command === commandId);
167
+ }
168
+ /**
169
+ * Remove the keybindings with the given command id from the JSON.
170
+ * This includes disabled keybindings.
169
171
  * @param commandId the keybinding command id.
170
172
  */
171
173
  removeKeybinding(commandId) {
@@ -1 +1 @@
1
- {"version":3,"file":"keymaps-service.js","sourceRoot":"","sources":["../../src/browser/keymaps-service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keymaps-service.js","sourceRoot":"","sources":["../../src/browser/keymaps-service.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,17 +1,17 @@
1
1
  {
2
2
  "name": "@theia/keymaps",
3
- "version": "1.42.1",
3
+ "version": "1.43.1",
4
4
  "description": "Theia - Custom Keymaps Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.42.1",
7
- "@theia/monaco": "1.42.1",
6
+ "@theia/core": "1.43.1",
7
+ "@theia/monaco": "1.43.1",
8
8
  "@theia/monaco-editor-core": "1.72.3",
9
- "@theia/preferences": "1.42.1",
10
- "@theia/userstorage": "1.42.1",
9
+ "@theia/preferences": "1.43.1",
10
+ "@theia/userstorage": "1.43.1",
11
11
  "jsonc-parser": "^2.2.0"
12
12
  },
13
13
  "devDependencies": {
14
- "@theia/ext-scripts": "1.42.1"
14
+ "@theia/ext-scripts": "1.43.1"
15
15
  },
16
16
  "publishConfig": {
17
17
  "access": "public"
@@ -48,5 +48,5 @@
48
48
  "nyc": {
49
49
  "extends": "../../configs/nyc.json"
50
50
  },
51
- "gitHead": "07502c238094ccd80bcdf3f74f7eec973fd7a4fc"
51
+ "gitHead": "df48285b7d3340e0109e89ffdb0f437ba6710378"
52
52
  }