@theia/keymaps 1.28.0-next.7 → 1.28.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.
Files changed (11) hide show
  1. package/lib/browser/keybindings-widget.d.ts +1 -0
  2. package/lib/browser/keybindings-widget.d.ts.map +1 -1
  3. package/lib/browser/keybindings-widget.js +39 -21
  4. package/lib/browser/keybindings-widget.js.map +1 -1
  5. package/lib/browser/keymaps-service.d.ts +4 -3
  6. package/lib/browser/keymaps-service.d.ts.map +1 -1
  7. package/lib/browser/keymaps-service.js +17 -10
  8. package/lib/browser/keymaps-service.js.map +1 -1
  9. package/package.json +8 -8
  10. package/src/browser/keybindings-widget.tsx +41 -21
  11. package/src/browser/keymaps-service.ts +20 -12
package/lib/browser/keybindings-widget.d.ts CHANGED
@@ -161,6 +161,7 @@ export declare class KeybindingWidget extends ReactWidget implements StatefulWid
161
161
  * @returns the list of keybinding items.
162
162
  */
163
163
  protected getItems(): KeybindingItem[];
164
+ protected createKeybindingItem(command: Command, keybinding?: ScopedKeybinding): KeybindingItem;
164
165
  /**
165
166
  * @returns the input array, sorted.
166
167
  * The sort priority is as follows: items with keybindings before those without, then alphabetical by command.
package/lib/browser/keybindings-widget.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"keybindings-widget.d.ts","sourceRoot":"","sources":["../../src/browser/keybindings-widget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"keybindings-widget.d.ts","sourceRoot":"","sources":["../../src/browser/keybindings-widget.tsx"],"names":[],"mappings":"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"}
package/lib/browser/keybindings-widget.js CHANGED
@@ -344,26 +344,37 @@ let KeybindingWidget = KeybindingWidget_1 = class KeybindingWidget extends react
344
344
  if (command.id.startsWith('_')) {
345
345
  continue;
346
346
  }
347
- const keybinding = this.keybindingRegistry.getKeybindingsForCommand(command.id)[0];
348
- const item = {
349
- command,
350
- keybinding,
351
- labels: {
352
- id: { value: command.id },
353
- command: { value: this.getCommandLabel(command) },
354
- keybinding: { value: this.getKeybindingLabel(keybinding) || '' },
355
- context: { value: this.getContextLabel(keybinding) || '' },
356
- source: { value: this.getScopeLabel(keybinding) || '' }
357
- }
358
- };
359
- this.formatAndMatchCommand(item);
360
- this.formatAndMatchKeybinding(item, []);
361
- this.formatAndMatchContext(item);
362
- this.formatAndMatchSource(item);
363
- items.push(item);
347
+ const keybindings = this.keybindingRegistry.getKeybindingsForCommand(command.id);
348
+ keybindings.forEach(keybinding => {
349
+ const item = this.createKeybindingItem(command, keybinding);
350
+ items.push(item);
351
+ });
352
+ // we might not have any keybindings for the command
353
+ if (keybindings.length < 1) {
354
+ const item = this.createKeybindingItem(command);
355
+ items.push(item);
356
+ }
364
357
  }
365
358
  return this.sortKeybindings(items);
366
359
  }
360
+ createKeybindingItem(command, keybinding) {
361
+ const item = {
362
+ command,
363
+ keybinding,
364
+ labels: {
365
+ id: { value: command.id },
366
+ command: { value: this.getCommandLabel(command) },
367
+ keybinding: { value: this.getKeybindingLabel(keybinding) || '' },
368
+ context: { value: this.getContextLabel(keybinding) || '' },
369
+ source: { value: this.getScopeLabel(keybinding) || '' }
370
+ }
371
+ };
372
+ this.formatAndMatchCommand(item);
373
+ this.formatAndMatchKeybinding(item, []);
374
+ this.formatAndMatchContext(item);
375
+ this.formatAndMatchSource(item);
376
+ return item;
377
+ }
367
378
  /**
368
379
  * @returns the input array, sorted.
369
380
  * The sort priority is as follows: items with keybindings before those without, then alphabetical by command.
@@ -440,11 +451,11 @@ let KeybindingWidget = KeybindingWidget_1 = class KeybindingWidget extends react
440
451
  */
441
452
  editKeybinding(item) {
442
453
  const command = item.command.id;
443
- const oldKeybinding = item.keybinding && item.keybinding.keybinding;
454
+ const oldKeybinding = item.keybinding;
444
455
  const dialog = new EditKeybindingDialog({
445
456
  title: nls_1.nls.localize('theia/keymaps/editKeybindingTitle', 'Edit Keybinding for {0}', command),
446
- initialValue: oldKeybinding,
447
- validate: newKeybinding => this.validateKeybinding(command, oldKeybinding, newKeybinding),
457
+ initialValue: oldKeybinding === null || oldKeybinding === void 0 ? void 0 : oldKeybinding.keybinding,
458
+ validate: newKeybinding => this.validateKeybinding(command, oldKeybinding === null || oldKeybinding === void 0 ? void 0 : oldKeybinding.keybinding, newKeybinding),
448
459
  }, this.keymapsService, item);
449
460
  dialog.open().then(async (keybinding) => {
450
461
  if (keybinding) {
@@ -460,9 +471,16 @@ let KeybindingWidget = KeybindingWidget_1 = class KeybindingWidget extends react
460
471
  * @returns a Promise which resolves to `true` if a user accepts resetting.
461
472
  */
462
473
  async confirmResetKeybinding(item) {
474
+ const message = document.createElement('div');
475
+ const question = document.createElement('p');
476
+ question.textContent = nls_1.nls.localize('theia/keymaps/resetKeybindingConfirmation', 'Do you really want to reset this keybinding to its default value?');
477
+ message.append(question);
478
+ const info = document.createElement('p');
479
+ info.textContent = nls_1.nls.localize('theia/keymaps/resetMultipleKeybindingsWarning', 'If multiple keybindings exist for this command, all of them will be reset.');
480
+ message.append(info);
463
481
  const dialog = new browser_1.ConfirmDialog({
464
482
  title: nls_1.nls.localize('theia/keymaps/resetKeybindingTitle', 'Reset keybinding for {0}', this.getCommandLabel(item.command)),
465
- msg: nls_1.nls.localize('theia/keymaps/resetKeybindingConfirmation', 'Do you really want to reset this keybinding to its default value?')
483
+ msg: message
466
484
  });
467
485
  return !!await dialog.open();
468
486
  }
package/lib/browser/keybindings-widget.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"keybindings-widget.js","sourceRoot":"","sources":["../../src/browser/keybindings-widget.tsx"],"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,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;;;;;AAEhF,kDAAmD;AACnD,+DAAgE;AAChE,kDAAkD;AAClD,4DAAiF;AACjF,wDAA8D;AAC9D,4DAA0E;AAC1E,+EAA2E;AAC3E,qDAEiC;AACjC,uDAAmD;AACnD,iFAA6E;AAC7E,sCAAoC;AACpC,oDAAiD;AA6CjD,IAAa,gBAAgB,wBAA7B,MAAa,gBAAiB,SAAQ,0BAAW;IAAjD;;QAcI;;WAEG;QACO,UAAK,GAAqB,EAAE,CAAC;QAEvC;;WAEG;QACO,UAAK,GAAW,EAAE,CAAC;QAE7B;;WAEG;QACgB,WAAM,GAAG,wBAAwB,CAAC;QACrD;;WAEG;QACgB,wBAAmB,GAAG,qBAAqB,CAAC;QAE/D;;;WAGG;QACgB,iBAAY,GAAG;YAC9B,GAAG,EAAE,SAAS;YACd,IAAI,EAAE,UAAU;SACnB,CAAC;QAEiB,uBAAkB,GAAG,IAAI,eAAO,EAAQ,CAAC;QACnD,gBAAW,GAAgB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAElE;;WAEG;QACgB,sBAAiB,GAAe,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE,EAAE,EAAE,CAAC,CAAC;QAwBxF,2BAAsB,GAAG,QAAQ,CAAC,GAAG,EAAE;YAC7C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;gBAClB,IAAI,CAAC,mBAAmB,EAAE,CAAC;aAC9B;QACL,CAAC,EAAE,GAAG,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAgiBhD,CAAC;IA5jBG;;OAEG;IAEO,IAAI;QACV,IAAI,CAAC,EAAE,GAAG,kBAAgB,CAAC,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,kBAAgB,CAAC,KAAK,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,kBAAgB,CAAC,KAAK,CAAC;QAC5C,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAA,iBAAO,EAAC,YAAY,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC3B,IAAI,CAAC,sBAAsB,EAAE,CAAC;QAE9B,gFAAgF;QAChF,IAAI,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE;YACxC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBAC5D,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC7B,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC/B,CAAC,CAAC,CAAC,CAAC;SACP;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC;IACnG,CAAC;IAUD;;;OAGG;IACI,SAAS;QACZ,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED;;OAEG;IACI,WAAW;QACd,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QACtC,IAAI,MAAM,EAAE;YACR,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC;YAClB,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;YAChB,IAAI,CAAC,mBAAmB,EAAE,CAAC;SAC9B;IACL,CAAC;IAEkB,iBAAiB,CAAC,GAAY;QAC7C,KAAK,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;IAC3B,CAAC;IAED;;OAEG;IACO,mBAAmB;QACzB,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxC,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7E,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtB,IAAI,OAAO,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;YAC1B,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC;YACtD,OAAO,GAAG,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,UAAU,CAAC,IAAI,OAAO,CAAC;YACrE,OAAO,GAAG,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC;YACtD,OAAO,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC;YACrD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC;IAES,qBAAqB,CAAC,IAAoB;QAChD,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxE,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;IAES,wBAAwB,CAAC,IAAoB,EAAE,UAAoB;QACzE,IAAI,IAAI,CAAC,UAAU,EAAE;YACjB,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,CAA4B,CAAC,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE;gBAC1I,IAAI,SAAS,KAAK,CAAC,EAAE;oBACjB,2BAA2B;oBAC3B,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;iBACxE;gBACD,MAAM,aAAa,GAAG,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBACzE,MAAM,WAAW,GAAG,YAAK,CAAC,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;gBAErG,aAAa,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;oBACxC,IAAI,UAAU,KAAK,CAAC,EAAE;wBAClB,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;qBAC7D;oBACD,MAAM,YAAY,GAAG,UAAU,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,iBAAiB,EAAE,CAAC,CAAC;oBACtF,KAAK,KAAL,KAAK,GAAK,YAAY,EAAC;oBACvB,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;gBACtE,CAAC,CAAC,CAAC;gBACH,OAAO,UAAU,CAAC;YACtB,CAAC,EAAE,EAAE,CAAC,CAAC;YACP,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,QAAQ,EAAE,CAAC;YAC3E,OAAO,KAAK,CAAC;SAChB;QACD,IAAI,CAAC,MAAM,CAAC,UAAU,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,qBAAqB,CAAC,IAAoB;QAChD,IAAI,CAAC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACxE,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjD,CAAC;IAES,oBAAoB,CAAC,IAAoB;QAC/C,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtE,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChD,CAAC;IAES,iBAAiB,CAAC,KAAa,EAAE,QAAgB,IAAI,CAAC,KAAK;QACjE,IAAI,KAAK,IAAI,KAAK,EAAE;YAChB,MAAM,UAAU,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;YAChE,IAAI,UAAU,EAAE;gBACZ,OAAO;oBACH,KAAK,EAAE,KAAK;oBACZ,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,MAAM,CAA4B,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE;wBACjH,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;wBACrE,IAAI,QAAQ,KAAK,SAAS,EAAE;4BACxB,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;yBACxD;6BAAM;4BACH,UAAU,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;yBAC1F;wBACD,OAAO,UAAU,CAAC;oBACtB,CAAC,EAAE,EAAE,CAAC;iBACT,CAAC;aACL;SACJ;QACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IAC5B,CAAC;IAED;;;OAGG;IACO,eAAe;QACrB,OAAO,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAqB,CAAC;IACpE,CAAC;IAED;;OAEG;IACO,eAAe;QACrB,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;QACnD,IAAI,KAAK,EAAE;YACN,KAA0B,CAAC,KAAK,EAAE,CAAC;YACnC,KAA0B,CAAC,MAAM,EAAE,CAAC;SACxC;IACL,CAAC;IAED;;OAEG;IACO,MAAM;QACZ,OAAO,6BAAK,EAAE,EAAC,mBAAmB;YAC7B,IAAI,CAAC,YAAY,EAAE;YACnB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,EAAE,CAClE,CAAC;IACX,CAAC;IAED;;OAEG;IACO,YAAY;QAClB,OAAO;YACH,6BAAK,SAAS,EAAC,qBAAqB;gBAChC,+BACI,EAAE,EAAC,WAAW,EACd,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,EAAE,EAClE,IAAI,EAAC,MAAM,EACX,UAAU,EAAE,KAAK,EACjB,WAAW,EAAE,SAAG,CAAC,iBAAiB,CAAC,+BAA+B,CAAC,EACnE,YAAY,EAAC,KAAK,EAClB,OAAO,EAAE,IAAI,CAAC,iBAAiB,GACjC,CACA,CACJ,CAAC;IACX,CAAC;IAED;;OAEG;IACO,aAAa;QACnB,OAAO,oBAAC,4BAAY,IAChB,IAAI,EAAC,SAAS,EACd,MAAM,EAAC,mBAAmB,GAC5B,CAAC;IACP,CAAC;IAED;;OAEG;IACO,WAAW;QACjB,OAAO,6BAAK,EAAE,EAAC,oBAAoB;YAC/B,6BAAK,SAAS,EAAC,IAAI;gBACf;oBACI;wBACI;4BACI,4BAAI,SAAS,EAAC,WAAW,GAAM;4BAC/B,4BAAI,SAAS,EAAC,UAAU,IAAE,SAAG,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAM;4BAChE,4BAAI,SAAS,EAAC,eAAe,IAAE,SAAG,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAM;4BACxE,4BAAI,SAAS,EAAC,YAAY,IAAE,SAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAM;4BAC/D,4BAAI,SAAS,EAAC,WAAW,IAAE,SAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAM,CAC/D,CACD;oBACR,mCACK,IAAI,CAAC,UAAU,EAAE,CACd,CACJ,CACN,CACJ,CAAC;IACX,CAAC;IAED;;OAEG;IACO,UAAU;QAChB,OAAO,oBAAC,KAAK,CAAC,QAAQ,QACjB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAC1E,CAAC;IACtB,CAAC;IAES,SAAS,CAAC,IAAoB,EAAE,KAAa;QACnD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;QACrC,oDAAoD;QACpD,OAAO,4BAAI,SAAS,EAAC,aAAa,EAAC,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC;YACzF,4BAAI,SAAS,EAAC,YAAY,IACrB,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CACxB;YACL,4BAAI,SAAS,EAAC,UAAU,EAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,IACxD,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAC3C;YACL,4BAAI,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,EAAE,SAAS,EAAC,iCAAiC,IACtF,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAC3B;YACL,4BAAI,SAAS,EAAC,YAAY,EAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;gBAC9D,kCAAO,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAQ,CACzD;YACL,4BAAI,SAAS,EAAC,WAAW,EAAC,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC;gBAC3D,8BAAM,SAAS,EAAC,WAAW,IAAE,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAQ,CAC9E,CACJ,CAAC;IACV,CAAC;IAED;;;OAGG;IACO,aAAa,CAAC,IAAoB;QACxC,OAAO,8BAAM,SAAS,EAAC,kBAAkB;YAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAQ,CAAC;IACrG,CAAC;IAED;;;OAGG;IACO,UAAU,CAAC,IAAoB;QACrC,OAAO,2BAAG,KAAK,EAAC,iBAAiB,EAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE;gBACpD,CAAC,CAAC,cAAc,EAAE,CAAC;gBACnB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC9B,CAAC;YAAE,2BAAG,SAAS,EAAE,GAAG,IAAA,iBAAO,EAAC,MAAM,CAAC,iBAAiB,GAAM,CAAI,CAAC;IACnE,CAAC;IAED;;;;OAIG;IACO,WAAW,CAAC,IAAoB;QACtC,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,yBAAe,CAAC,IAAI,CAAC;YACtE,CAAC,CAAC,2BAAG,KAAK,EAAC,kBAAkB,EAAC,IAAI,EAAC,GAAG,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE;oBAChD,CAAC,CAAC,cAAc,EAAE,CAAC;oBACnB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC/B,CAAC;gBAAE,2BAAG,SAAS,EAAE,GAAG,IAAA,iBAAO,EAAC,SAAS,CAAC,iBAAiB,GAAM,CAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,CAAC;IAED;;;OAGG;IACO,gBAAgB,CAAC,UAA0B;QACjD,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;YACxB,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE;YACvC,OAAO,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;gBAChE,IAAI,OAAO,CAAC,GAAG,EAAE;oBACb,OAAO,8BAAM,GAAG,EAAE,KAAK,EAAE,SAAS,EAAC,uBAAuB;wBACtD,8BAAM,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,IAAG,OAAO,CAAC,KAAK,CAAQ,CAC7E,CAAC;iBACX;qBAAM;oBACH,OAAO,8BAAM,GAAG,EAAE,KAAK,EAAE,SAAS,EAAC,6BAA6B,IAC3D,OAAO,CAAC,KAAK,CACX,CAAC;iBACX;YACL,CAAC,CAAC,CAAC;SACN;QAED,OAAO,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;QAChF,OAAO,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACO,QAAQ;QACd,oCAAoC;QACpC,MAAM,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC;QAC/C,MAAM,KAAK,GAAqB,EAAE,CAAC;QACnC,8BAA8B;QAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC5B,0CAA0C;YAC1C,IAAI,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;gBAC5B,SAAS;aACZ;YACD,MAAM,UAAU,GAAG,IAAI,CAAC,kBAAkB,CAAC,wBAAwB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YACnF,MAAM,IAAI,GAAG;gBACT,OAAO;gBACP,UAAU;gBACV,MAAM,EAAE;oBACJ,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,EAAE;oBACzB,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE;oBACjD,UAAU,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE;oBAChE,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE;oBAC1D,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE;iBAC1D;aACJ,CAAC;YACF,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,wBAAwB,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACxC,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpB;QAED,OAAO,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAED;;;OAGG;IACO,eAAe,CAAC,QAA0B;QAChD,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC1B,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE;gBAC/B,OAAO,CAAC,CAAC,CAAC;aACb;YACD,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,UAAU,EAAE;gBAC/B,OAAO,CAAC,CAAC;aACZ;YACD,OAAO,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;OAKG;IACO,eAAe,CAAC,OAAgB;QACtC,IAAI,OAAO,CAAC,KAAK,EAAE;YACf,yFAAyF;YACzF,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;SACrF;QACD,OAAO,OAAO,CAAC,EAAE,CAAC;IACtB,CAAC;IAES,kBAAkB,CAAC,UAAwC;QACjE,OAAO,UAAU,IAAI,UAAU,CAAC,UAAU,CAAC;IAC/C,CAAC;IAES,eAAe,CAAC,UAAwC;QAC9D,OAAO,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;IAC1E,CAAC;IAES,aAAa,CAAC,UAAwC;QAC5D,IAAI,KAAK,GAAG,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC;QAC3C,IAAI,KAAK,KAAK,SAAS,EAAE;YACrB,IAAI,KAAK,GAAG,yBAAe,CAAC,IAAI,EAAE;gBAC9B,KAAK,GAAG,yBAAe,CAAC,OAAO,CAAC;aACnC;YACD,OAAO,yBAAe,CAAC,KAAK,CAAC,CAAC,iBAAiB,EAAE,CAAC;SACrD;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED;;;;;;;;;;;OAWG;IACO,WAAW,CAAC,CAAU,EAAE,CAAU;QACxC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,EAAE;YACpC,OAAO,MAAM,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;SACnE;QACD,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,EAAE;YACjB,OAAO,CAAC,CAAC;SACZ;QACD,IAAI,MAAM,KAAK,CAAC,CAAC,EAAE,EAAE;YACjB,OAAO,CAAC,CAAC,CAAC;SACb;QACD,OAAO,MAAM,CAAC,WAAW,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;IACpE,CAAC;IAED;;;OAGG;IACO,cAAc,CAAC,IAAoB;QACzC,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QACpE,MAAM,MAAM,GAAG,IAAI,oBAAoB,CAAC;YACpC,KAAK,EAAE,SAAG,CAAC,QAAQ,CAAC,mCAAmC,EAAE,yBAAyB,EAAE,OAAO,CAAC;YAC5F,YAAY,EAAE,aAAa;YAC3B,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,aAAa,EAAE,aAAa,CAAC;SAC5F,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAC9B,MAAM,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,KAAK,EAAC,UAAU,EAAC,EAAE;YAClC,IAAI,UAAU,EAAE;gBACZ,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,iCAChC,IAAI,CAAC,UAAU,KAClB,OAAO;oBACP,UAAU,KACX,aAAa,CAAC,CAAC;aACrB;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,sBAAsB,CAAC,IAAoB;QACvD,MAAM,MAAM,GAAG,IAAI,uBAAa,CAAC;YAC7B,KAAK,EAAE,SAAG,CAAC,QAAQ,CAAC,oCAAoC,EAAE,0BAA0B,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACzH,GAAG,EAAE,SAAG,CAAC,QAAQ,CAAC,2CAA2C,EAAE,mEAAmE,CAAC;SACtI,CAAC,CAAC;QACH,OAAO,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;IAED;;;OAGG;IACO,KAAK,CAAC,eAAe,CAAC,IAAoB;QAChD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,SAAS,EAAE;YACX,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SACzD;IACL,CAAC;IAED;;;;;;;OAOG;IACO,kBAAkB,CAAC,OAAe,EAAE,aAAiC,EAAE,UAAkB;QAC/F,IAAI,CAAC,UAAU,EAAE;YACb,OAAO,SAAG,CAAC,QAAQ,CAAC,4CAA4C,EAAE,8BAA8B,CAAC,CAAC;SACrG;QACD,IAAI;YACA,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC;YACxC,qBAAW,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC9B,IAAI,aAAa,KAAK,UAAU,EAAE;gBAC9B,OAAO,GAAG,CAAC,CAAC,0DAA0D;aACzE;YACD,IAAI,IAAI,CAAC,kBAAkB,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE;gBAC5D,OAAO,SAAG,CAAC,QAAQ,CAAC,4CAA4C,EAAE,+BAA+B,CAAC,CAAC;aACtG;YACD,OAAO,EAAE,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACZ,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;IAED;;;;;OAKG;IACO,aAAa,CAAC,GAAW;QAC/B,MAAM,IAAI,GAAe,EAAE,CAAC;QAE5B,IAAI,IAAI,CAAC,KAAK,KAAK,EAAE,EAAE;YACnB,OAAO,IAAI,CAAC;SACf;QAED,IAAI,SAAS,GAAG,GAAG,CAAC;QACpB,IAAI,OAAO,CAAC;QACZ,IAAI,MAAM,CAAC;QAEX,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAEvC,OAAO,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC9B,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACpD,MAAM,eAAe,GAAG,cAAc,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAE1D,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC;YAC7C,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;YAE7C,IAAI,OAAO,EAAE;gBACT,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;aACrD;YACD,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;SACtD;QAED,IAAI,SAAS,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;SACvD;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED;;;OAGG;IACO,iBAAiB,CAAC,QAAyB;QACjD,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACnB,OAAO,0CAEC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK;gBACnD,CAAC,CAAC,8BAAM,GAAG,EAAE,KAAK,EAAE,SAAS,EAAC,aAAa,IAAE,OAAO,CAAC,KAAK,CAAQ;gBAClE,CAAC,CAAC,8BAAM,GAAG,EAAE,KAAK,IAAG,OAAO,CAAC,KAAK,CAAQ,CAAC,CAEpD,CAAC;SACP;QACD,OAAO,QAAQ,CAAC,KAAK,CAAC;IAC1B,CAAC;IAED,UAAU;QACN,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;IACjC,CAAC;IAED,YAAY,CAAC,QAA2B;QACpC,IAAI,OAAO,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,CAAA,KAAK,QAAQ,EAAE;YACrC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACf,OAAO,EAAE,GAAG,EAAE;oBACV,MAAM,WAAW,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC3C,IAAI,WAAW,EAAE;wBACb,WAAW,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;wBACnC,IAAI,CAAC,iBAAiB,EAAE,CAAC;qBAC5B;gBACL,CAAC;aACJ,CAAC,CAAC;SACN;IACL,CAAC;CACJ,CAAA;AAnmBmB,mBAAE,GAAG,yBAA0B,CAAA;AAC/B,sBAAK,GAAG,SAAG,CAAC,iBAAiB,CAAC,oBAAoB,CAAE,CAAA;AATpE;IADC,IAAA,kBAAM,EAAC,yBAAe,CAAC;8BACY,yBAAe;yDAAC;AAGpD;IADC,IAAA,kBAAM,EAAC,4BAAkB,CAAC;8BACY,4BAAkB;4DAAC;AAG1D;IADC,IAAA,kBAAM,EAAC,gCAAc,CAAC;8BACY,gCAAc;wDAAC;AA6ClD;IADC,IAAA,yBAAa,GAAE;;;;4CAiBf;AAtEQ,gBAAgB;IAD5B,IAAA,sBAAU,GAAE;GACA,gBAAgB,CA8mB5B;AA9mBY,4CAAgB;AA+mB7B;;GAEG;AACH,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,+BAAqB;IAapD,YACwC,KAAiC,EAC1B,cAA8B,EACzE,IAAoB;QAEpB,KAAK,CAAC,KAAK,CAAC,CAAC;QAH8B,mBAAc,GAAd,cAAc,CAAgB;QAIzE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,2EAA2E;QAC3E,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,yBAAe,CAAC,IAAI,EAAE;YAC7E,IAAI,CAAC,iBAAiB,EAAE,CAAC;SAC5B;IACL,CAAC;IAEkB,aAAa,CAAC,GAAY;QACzC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,IAAI,CAAC,WAAW,EAAE;YAClB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;SAClD;IACL,CAAC;IAED;;;;OAIG;IACO,cAAc,CAAsC,OAAoB,EAAE,GAAG,oBAAyB;QAC5G,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,aAAG,CAAC,KAAK,EAAE,GAAG,EAAE;YACzC,IAAI,CAAC,KAAK,EAAE,CAAC;YACb,IAAI,CAAC,KAAK,EAAE,CAAC;QACjB,CAAC,EAAE,GAAG,oBAAoB,CAAC,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACO,iBAAiB;QACvB,6BAA6B;QAC7B,MAAM,gBAAgB,GAAG,SAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;QACvD,kFAAkF;QAClF,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,YAAa,CAAC,CAAC;QACrE,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,SAAG,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,CAAC;QACnE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAC5C,OAAO,IAAI,CAAC,WAAW,CAAC;IAC5B,CAAC;IAED;;OAEG;IACO,KAAK;QACX,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/D,CAAC;CAEJ,CAAA;AApEK,oBAAoB;IAcjB,WAAA,IAAA,kBAAM,EAAC,oCAA0B,CAAC,CAAA;IAClC,WAAA,IAAA,kBAAM,EAAC,gCAAc,CAAC,CAAA;qCADoB,oCAA0B;QACV,gCAAc;GAf3E,oBAAoB,CAoEzB"}
1
+ {"version":3,"file":"keybindings-widget.js","sourceRoot":"","sources":["../../src/browser/keybindings-widget.tsx"],"names":[],"mappings":"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"}
package/lib/browser/keymaps-service.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { OpenerService, Widget } from '@theia/core/lib/browser';
2
- import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
2
+ import { KeybindingRegistry, ScopedKeybinding } from '@theia/core/lib/browser/keybinding';
3
3
  import { Keybinding } from '@theia/core/lib/common/keybinding';
4
4
  import { Emitter } from '@theia/core/lib/common/event';
5
5
  import { MonacoTextModelService } from '@theia/monaco/lib/browser/monaco-text-model-service';
@@ -34,9 +34,10 @@ export declare class KeymapsService {
34
34
  open(ref?: Widget): Promise<void>;
35
35
  /**
36
36
  * Set the keybinding in the JSON.
37
- * @param newKeybinding the JSON keybindings.
37
+ * @param newKeybinding the new JSON keybinding
38
+ * @param oldKeybinding the old JSON keybinding
38
39
  */
39
- setKeybinding(newKeybinding: Keybinding, oldKeybinding: string | undefined): Promise<void>;
40
+ setKeybinding(newKeybinding: Keybinding, oldKeybinding: ScopedKeybinding | undefined): Promise<void>;
40
41
  /**
41
42
  * Remove the given keybinding with the given command id from the JSON.
42
43
  * @param commandId the keybinding command id.
package/lib/browser/keymaps-service.d.ts.map CHANGED
@@ -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,MAAM,oCAAoC,CAAC;AACzF,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;cAEa,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrC;;OAEG;IACH,SAAS,CAAC,SAAS,IAAI,IAAI;IA0B3B;;;OAGG;IACG,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAYvC;;;OAGG;IACG,aAAa,CAAC,aAAa,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDhG;;;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;cAEa,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAYrC;;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"}
package/lib/browser/keymaps-service.js CHANGED
@@ -104,20 +104,25 @@ let KeymapsService = class KeymapsService {
104
104
  }
105
105
  /**
106
106
  * Set the keybinding in the JSON.
107
- * @param newKeybinding the JSON keybindings.
107
+ * @param newKeybinding the new JSON keybinding
108
+ * @param oldKeybinding the old JSON keybinding
108
109
  */
109
110
  async setKeybinding(newKeybinding, oldKeybinding) {
110
111
  return this.updateKeymap(() => {
111
112
  let newAdded = false;
112
- let oldRemoved = false;
113
+ let isOldKeybindingDisabled = false;
114
+ let addedDisabledEntry = false;
113
115
  const keybindings = [];
114
116
  for (let keybinding of this.keybindingRegistry.getKeybindingsByScope(keybinding_1.KeybindingScope.USER)) {
115
- if (keybinding_2.Keybinding.equals(keybinding, newKeybinding, true, true)) {
117
+ // search for the old keybinding and modify it
118
+ if (oldKeybinding && keybinding_2.Keybinding.equals(keybinding, oldKeybinding, false, true)) {
116
119
  newAdded = true;
117
120
  keybinding = Object.assign(Object.assign({}, keybinding), { keybinding: newKeybinding.keybinding });
118
121
  }
119
- if (oldKeybinding && keybinding_2.Keybinding.equals(keybinding, Object.assign(Object.assign({}, newKeybinding), { keybinding: oldKeybinding, command: '-' + newKeybinding.command }), false, true)) {
120
- oldRemoved = true;
122
+ // we have an disabled entry for the same command and the oldKeybinding
123
+ if ((oldKeybinding === null || oldKeybinding === void 0 ? void 0 : oldKeybinding.keybinding) &&
124
+ keybinding_2.Keybinding.equals(keybinding, Object.assign(Object.assign({}, newKeybinding), { keybinding: oldKeybinding.keybinding, command: '-' + newKeybinding.command }), false, true)) {
125
+ isOldKeybindingDisabled = true;
121
126
  }
122
127
  keybindings.push(keybinding);
123
128
  }
@@ -131,22 +136,24 @@ let KeymapsService = class KeymapsService {
131
136
  });
132
137
  newAdded = true;
133
138
  }
134
- if (!oldRemoved && oldKeybinding) {
139
+ // we want to add a disabled entry for the old keybinding only when we are modifying the default value
140
+ if (!isOldKeybindingDisabled && (oldKeybinding === null || oldKeybinding === void 0 ? void 0 : oldKeybinding.scope) === keybinding_1.KeybindingScope.DEFAULT) {
135
141
  const disabledBinding = {
136
142
  command: '-' + newKeybinding.command,
137
143
  // TODO key: oldKeybinding, see https://github.com/eclipse-theia/theia/issues/6879
138
- keybinding: oldKeybinding,
144
+ keybinding: oldKeybinding.keybinding,
139
145
  context: newKeybinding.context,
140
146
  when: newKeybinding.when,
141
147
  args: newKeybinding.args
142
148
  };
143
149
  // Add disablement of the old keybinding if it isn't already disabled in the list to avoid duplicate disabled entries
144
- if (!keybindings.some(binding => keybinding_2.Keybinding.equals(binding, disabledBinding, true, true))) {
150
+ if (!keybindings.some(binding => keybinding_2.Keybinding.equals(binding, disabledBinding, false, true))) {
145
151
  keybindings.push(disabledBinding);
146
152
  }
147
- oldRemoved = true;
153
+ isOldKeybindingDisabled = true;
154
+ addedDisabledEntry = true;
148
155
  }
149
- if (newAdded || oldRemoved) {
156
+ if (newAdded || addedDisabledEntry) {
150
157
  return keybindings;
151
158
  }
152
159
  });
package/lib/browser/keymaps-service.js.map CHANGED
@@ -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.28.0-next.7+3b689e0b4f3",
3
+ "version": "1.28.0",
4
4
  "description": "Theia - Custom Keymaps Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.28.0-next.7+3b689e0b4f3",
7
- "@theia/monaco": "1.28.0-next.7+3b689e0b4f3",
8
- "@theia/monaco-editor-core": "1.65.2",
9
- "@theia/preferences": "1.28.0-next.7+3b689e0b4f3",
10
- "@theia/userstorage": "1.28.0-next.7+3b689e0b4f3",
6
+ "@theia/core": "1.28.0",
7
+ "@theia/monaco": "1.28.0",
8
+ "@theia/monaco-editor-core": "1.67.2",
9
+ "@theia/preferences": "1.28.0",
10
+ "@theia/userstorage": "1.28.0",
11
11
  "jsonc-parser": "^2.2.0"
12
12
  },
13
13
  "devDependencies": {
14
- "@theia/ext-scripts": "1.27.0"
14
+ "@theia/ext-scripts": "1.28.0"
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": "3b689e0b4f37844f674b26fc9b2c4d735b0115fd"
51
+ "gitHead": "79d58c87a7bd76f435000a2ac59803b04e1c78be"
52
52
  }
package/src/browser/keybindings-widget.tsx CHANGED
@@ -448,28 +448,40 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
448
448
  if (command.id.startsWith('_')) {
449
449
  continue;
450
450
  }
451
- const keybinding = this.keybindingRegistry.getKeybindingsForCommand(command.id)[0];
452
- const item = {
453
- command,
454
- keybinding,
455
- labels: {
456
- id: { value: command.id },
457
- command: { value: this.getCommandLabel(command) },
458
- keybinding: { value: this.getKeybindingLabel(keybinding) || '' },
459
- context: { value: this.getContextLabel(keybinding) || '' },
460
- source: { value: this.getScopeLabel(keybinding) || '' }
461
- }
462
- };
463
- this.formatAndMatchCommand(item);
464
- this.formatAndMatchKeybinding(item, []);
465
- this.formatAndMatchContext(item);
466
- this.formatAndMatchSource(item);
467
- items.push(item);
451
+ const keybindings = this.keybindingRegistry.getKeybindingsForCommand(command.id);
452
+ keybindings.forEach(keybinding => {
453
+ const item = this.createKeybindingItem(command, keybinding);
454
+ items.push(item);
455
+ });
456
+ // we might not have any keybindings for the command
457
+ if (keybindings.length < 1) {
458
+ const item = this.createKeybindingItem(command);
459
+ items.push(item);
460
+ }
468
461
  }
469
462
 
470
463
  return this.sortKeybindings(items);
471
464
  }
472
465
 
466
+ protected createKeybindingItem(command: Command, keybinding?: ScopedKeybinding): KeybindingItem {
467
+ const item = {
468
+ command,
469
+ keybinding,
470
+ labels: {
471
+ id: { value: command.id },
472
+ command: { value: this.getCommandLabel(command) },
473
+ keybinding: { value: this.getKeybindingLabel(keybinding) || '' },
474
+ context: { value: this.getContextLabel(keybinding) || '' },
475
+ source: { value: this.getScopeLabel(keybinding) || '' }
476
+ }
477
+ };
478
+ this.formatAndMatchCommand(item);
479
+ this.formatAndMatchKeybinding(item, []);
480
+ this.formatAndMatchContext(item);
481
+ this.formatAndMatchSource(item);
482
+ return item;
483
+ }
484
+
473
485
  /**
474
486
  * @returns the input array, sorted.
475
487
  * The sort priority is as follows: items with keybindings before those without, then alphabetical by command.
@@ -552,11 +564,11 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
552
564
  */
553
565
  protected editKeybinding(item: KeybindingItem): void {
554
566
  const command = item.command.id;
555
- const oldKeybinding = item.keybinding && item.keybinding.keybinding;
567
+ const oldKeybinding = item.keybinding;
556
568
  const dialog = new EditKeybindingDialog({
557
569
  title: nls.localize('theia/keymaps/editKeybindingTitle', 'Edit Keybinding for {0}', command),
558
- initialValue: oldKeybinding,
559
- validate: newKeybinding => this.validateKeybinding(command, oldKeybinding, newKeybinding),
570
+ initialValue: oldKeybinding?.keybinding,
571
+ validate: newKeybinding => this.validateKeybinding(command, oldKeybinding?.keybinding, newKeybinding),
560
572
  }, this.keymapsService, item);
561
573
  dialog.open().then(async keybinding => {
562
574
  if (keybinding) {
@@ -576,9 +588,17 @@ export class KeybindingWidget extends ReactWidget implements StatefulWidget {
576
588
  * @returns a Promise which resolves to `true` if a user accepts resetting.
577
589
  */
578
590
  protected async confirmResetKeybinding(item: KeybindingItem): Promise<boolean> {
591
+ const message = document.createElement('div');
592
+ const question = document.createElement('p');
593
+ question.textContent = nls.localize('theia/keymaps/resetKeybindingConfirmation', 'Do you really want to reset this keybinding to its default value?');
594
+ message.append(question);
595
+ const info = document.createElement('p');
596
+ info.textContent = nls.localize('theia/keymaps/resetMultipleKeybindingsWarning', 'If multiple keybindings exist for this command, all of them will be reset.');
597
+ message.append(info);
598
+
579
599
  const dialog = new ConfirmDialog({
580
600
  title: nls.localize('theia/keymaps/resetKeybindingTitle', 'Reset keybinding for {0}', this.getCommandLabel(item.command)),
581
- msg: nls.localize('theia/keymaps/resetKeybindingConfirmation', 'Do you really want to reset this keybinding to its default value?')
601
+ msg: message
582
602
  });
583
603
  return !!await dialog.open();
584
604
  }
package/src/browser/keymaps-service.ts CHANGED
@@ -16,7 +16,7 @@
16
16
 
17
17
  import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
18
18
  import { OpenerService, open, WidgetOpenerOptions, Widget } from '@theia/core/lib/browser';
19
- import { KeybindingRegistry, KeybindingScope } from '@theia/core/lib/browser/keybinding';
19
+ import { KeybindingRegistry, KeybindingScope, ScopedKeybinding } from '@theia/core/lib/browser/keybinding';
20
20
  import { Keybinding, RawKeybinding } from '@theia/core/lib/common/keybinding';
21
21
  import { UserStorageUri } from '@theia/userstorage/lib/browser';
22
22
  import * as jsoncparser from 'jsonc-parser';
@@ -119,23 +119,29 @@ export class KeymapsService {
119
119
 
120
120
  /**
121
121
  * Set the keybinding in the JSON.
122
- * @param newKeybinding the JSON keybindings.
122
+ * @param newKeybinding the new JSON keybinding
123
+ * @param oldKeybinding the old JSON keybinding
123
124
  */
124
- async setKeybinding(newKeybinding: Keybinding, oldKeybinding: string | undefined): Promise<void> {
125
+ async setKeybinding(newKeybinding: Keybinding, oldKeybinding: ScopedKeybinding | undefined): Promise<void> {
125
126
  return this.updateKeymap(() => {
126
127
  let newAdded = false;
127
- let oldRemoved = false;
128
+ let isOldKeybindingDisabled = false;
129
+ let addedDisabledEntry = false;
128
130
  const keybindings = [];
129
131
  for (let keybinding of this.keybindingRegistry.getKeybindingsByScope(KeybindingScope.USER)) {
130
- if (Keybinding.equals(keybinding, newKeybinding, true, true)) {
132
+ // search for the old keybinding and modify it
133
+ if (oldKeybinding && Keybinding.equals(keybinding, oldKeybinding, false, true)) {
131
134
  newAdded = true;
132
135
  keybinding = {
133
136
  ...keybinding,
134
137
  keybinding: newKeybinding.keybinding
135
138
  };
136
139
  }
137
- if (oldKeybinding && Keybinding.equals(keybinding, { ...newKeybinding, keybinding: oldKeybinding, command: '-' + newKeybinding.command }, false, true)) {
138
- oldRemoved = true;
140
+
141
+ // we have an disabled entry for the same command and the oldKeybinding
142
+ if (oldKeybinding?.keybinding &&
143
+ Keybinding.equals(keybinding, { ...newKeybinding, keybinding: oldKeybinding.keybinding, command: '-' + newKeybinding.command }, false, true)) {
144
+ isOldKeybindingDisabled = true;
139
145
  }
140
146
  keybindings.push(keybinding);
141
147
  }
@@ -149,22 +155,24 @@ export class KeymapsService {
149
155
  });
150
156
  newAdded = true;
151
157
  }
152
- if (!oldRemoved && oldKeybinding) {
158
+ // we want to add a disabled entry for the old keybinding only when we are modifying the default value
159
+ if (!isOldKeybindingDisabled && oldKeybinding?.scope === KeybindingScope.DEFAULT) {
153
160
  const disabledBinding = {
154
161
  command: '-' + newKeybinding.command,
155
162
  // TODO key: oldKeybinding, see https://github.com/eclipse-theia/theia/issues/6879
156
- keybinding: oldKeybinding,
163
+ keybinding: oldKeybinding.keybinding,
157
164
  context: newKeybinding.context,
158
165
  when: newKeybinding.when,
159
166
  args: newKeybinding.args
160
167
  };
161
168
  // Add disablement of the old keybinding if it isn't already disabled in the list to avoid duplicate disabled entries
162
- if (!keybindings.some(binding => Keybinding.equals(binding, disabledBinding, true, true))) {
169
+ if (!keybindings.some(binding => Keybinding.equals(binding, disabledBinding, false, true))) {
163
170
  keybindings.push(disabledBinding);
164
171
  }
165
- oldRemoved = true;
172
+ isOldKeybindingDisabled = true;
173
+ addedDisabledEntry = true;
166
174
  }
167
- if (newAdded || oldRemoved) {
175
+ if (newAdded || addedDisabledEntry) {
168
176
  return keybindings;
169
177
  }
170
178
  });