@codingame/monaco-vscode-view-status-bar-service-override 1.83.16 → 1.85.0-next.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/index.d.ts CHANGED
@@ -1,2 +1 @@
1
1
  export { default } from './viewStatusBar.js';
2
- export { StatusbarPart } from 'vscode/vscode/vs/workbench/browser/parts/statusbar/statusbarPart';
package/index.js CHANGED
@@ -1,2 +1 @@
1
1
  export { default } from './viewStatusBar.js';
2
- export { StatusbarPart } from './vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-view-status-bar-service-override",
3
- "version": "1.83.16",
3
+ "version": "1.85.0-next.0",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -18,7 +18,7 @@
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
20
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@1.83.16",
22
- "monaco-editor": "0.44.0"
21
+ "vscode": "npm:@codingame/monaco-vscode-api@1.85.0-next.0",
22
+ "monaco-editor": "0.45.0"
23
23
  }
24
24
  }
package/viewStatusBar.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { __decorate, __param } from './external/tslib/tslib.es6.js';
2
2
  import { SyncDescriptor } from 'monaco-editor/esm/vs/platform/instantiation/common/descriptors.js';
3
3
  import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
4
- import { StatusbarPart } from './vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js';
4
+ import { StatusbarService } from './vscode/src/vs/workbench/browser/parts/statusbar/statusbarPart.js';
5
5
  import { IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
6
6
  import { Extensions } from 'vscode/vscode/vs/workbench/common/contributions';
7
7
  import { StatusBarItemsExtensionPoint, IExtensionStatusBarItemService, ExtensionStatusBarItemService } from 'vscode/vscode/vs/workbench/api/browser/statusBarExtensionPoint';
@@ -19,9 +19,9 @@ ExtensionPoints = __decorate([
19
19
  ( Registry.as(Extensions.Workbench)).registerWorkbenchContribution(ExtensionPoints, 1 );
20
20
  function getServiceOverride() {
21
21
  return {
22
- [( IStatusbarService.toString())]: new SyncDescriptor(StatusbarPart, [], false),
22
+ [( IStatusbarService.toString())]: new SyncDescriptor(StatusbarService, [], false),
23
23
  [( IExtensionStatusBarItemService.toString())]: new SyncDescriptor(ExtensionStatusBarItemService, [], false)
24
24
  };
25
25
  }
26
26
 
27
- export { StatusbarPart, getServiceOverride as default };
27
+ export { getServiceOverride as default };
@@ -7,6 +7,7 @@ import { registerAction2, Action2 } from 'monaco-editor/esm/vs/platform/actions/
7
7
  import { Categories } from 'monaco-editor/esm/vs/platform/action/common/actionCommonCategories.js';
8
8
  import { IEditorService } from 'vscode/vscode/vs/workbench/services/editor/common/editorService';
9
9
  import { StatusBarFocused } from 'vscode/vscode/vs/workbench/common/contextkeys';
10
+ import { getActiveWindow } from 'monaco-editor/esm/vs/base/browser/dom.js';
10
11
 
11
12
  class ToggleStatusbarEntryVisibilityAction extends Action {
12
13
  constructor(id, label, model) {
@@ -112,7 +113,7 @@ class FocusStatusBarAction extends Action2 {
112
113
  }
113
114
  async run(accessor) {
114
115
  const layoutService = accessor.get(IWorkbenchLayoutService);
115
- layoutService.focusPart("workbench.parts.statusbar" );
116
+ layoutService.focusPart("workbench.parts.statusbar" , getActiveWindow());
116
117
  }
117
118
  }
118
119
  registerAction2(FocusStatusBarAction);
@@ -38,6 +38,8 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
38
38
  this.commandMouseListener = this._register(( new MutableDisposable()));
39
39
  this.commandTouchListener = this._register(( new MutableDisposable()));
40
40
  this.commandKeyboardListener = this._register(( new MutableDisposable()));
41
+ this.focusListener = this._register(( new MutableDisposable()));
42
+ this.focusOutListener = this._register(( new MutableDisposable()));
41
43
  this.hover = undefined;
42
44
  this.labelContainer = document.createElement('a');
43
45
  this.labelContainer.tabIndex = -1;
@@ -77,6 +79,14 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
77
79
  else {
78
80
  this.hover = this._register(setupCustomHover(this.hoverDelegate, this.container, hoverContents));
79
81
  }
82
+ this.focusListener.value = addDisposableListener(this.labelContainer, EventType.FOCUS, (e) => {
83
+ EventHelper.stop(e);
84
+ this.hover?.show(false);
85
+ });
86
+ this.focusOutListener.value = addDisposableListener(this.labelContainer, EventType.FOCUS_OUT, (e) => {
87
+ EventHelper.stop(e);
88
+ this.hover?.hide();
89
+ });
80
90
  }
81
91
  if (!this.entry || entry.command !== this.entry.command) {
82
92
  this.commandMouseListener.clear();
@@ -92,6 +102,10 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
92
102
  EventHelper.stop(e);
93
103
  this.executeCommand(command);
94
104
  }
105
+ else if (event.equals(9 ) || event.equals(15 ) || event.equals(17 )) {
106
+ EventHelper.stop(e);
107
+ this.hover?.hide();
108
+ }
95
109
  });
96
110
  this.labelContainer.classList.remove('disabled');
97
111
  }
@@ -1,6 +1,6 @@
1
1
  import { Disposable, DisposableStore } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
2
2
  import { isStatusbarEntryLocation } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
3
- import { isAncestor, hide, show } from 'monaco-editor/esm/vs/base/browser/dom.js';
3
+ import { isAncestorOfActiveElement, hide, show } from 'monaco-editor/esm/vs/base/browser/dom.js';
4
4
  import { Emitter } from 'monaco-editor/esm/vs/base/common/event.js';
5
5
 
6
6
  class StatusbarViewModel extends Disposable {
@@ -108,7 +108,7 @@ class StatusbarViewModel extends Disposable {
108
108
  return !!this.getFocusedEntry();
109
109
  }
110
110
  getFocusedEntry() {
111
- return this._entries.find(entry => isAncestor(document.activeElement, entry.container));
111
+ return this._entries.find(entry => isAncestorOfActiveElement(entry.container));
112
112
  }
113
113
  focusEntry(delta, restartPosition) {
114
114
  const getVisibleEntry = (start) => {
@@ -1,18 +1,18 @@
1
1
  import { __decorate, __param } from '../../../../../../../external/tslib/tslib.es6.js';
2
2
  import './media/statusbarpart.css.js';
3
3
  import { localizeWithPath } from 'monaco-editor/esm/vs/nls.js';
4
- import { MutableDisposable, dispose, DisposableStore, disposeIfDisposable, toDisposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
5
- import { Part } from 'vscode/vscode/vs/workbench/browser/part';
4
+ import { MutableDisposable, dispose, DisposableStore, disposeIfDisposable, toDisposable, Disposable } from 'monaco-editor/esm/vs/base/common/lifecycle.js';
5
+ import { Part, MultiWindowParts } from 'vscode/vscode/vs/workbench/browser/part';
6
6
  import { Gesture, EventType as EventType$1 } from 'monaco-editor/esm/vs/base/browser/touch.js';
7
7
  import { IInstantiationService } from 'monaco-editor/esm/vs/platform/instantiation/common/instantiation.js';
8
- import { isStatusbarEntryPriority, isStatusbarEntryLocation } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
8
+ import { isStatusbarEntryPriority, isStatusbarEntryLocation, IStatusbarService } from 'vscode/vscode/vs/workbench/services/statusbar/browser/statusbar';
9
9
  import { IContextMenuService } from 'monaco-editor/esm/vs/platform/contextview/browser/contextView.js';
10
10
  import { toAction, Separator } from 'monaco-editor/esm/vs/base/common/actions.js';
11
11
  import { IThemeService } from 'monaco-editor/esm/vs/platform/theme/common/themeService.js';
12
12
  import { STATUS_BAR_ITEM_HOVER_BACKGROUND, STATUS_BAR_ITEM_COMPACT_HOVER_BACKGROUND, STATUS_BAR_BACKGROUND, STATUS_BAR_NO_FOLDER_BACKGROUND, STATUS_BAR_FOREGROUND, STATUS_BAR_NO_FOLDER_FOREGROUND, STATUS_BAR_ITEM_FOCUS_BORDER, STATUS_BAR_BORDER, STATUS_BAR_NO_FOLDER_BORDER, STATUS_BAR_FOCUS_BORDER } from 'vscode/vscode/vs/workbench/common/theme';
13
13
  import { IWorkspaceContextService } from 'monaco-editor/esm/vs/platform/workspace/common/workspace.js';
14
14
  import { contrastBorder, activeContrastBorder } from 'monaco-editor/esm/vs/platform/theme/common/colorRegistry.js';
15
- import { addDisposableListener, EventType, clearNode, EventHelper, createStyleSheet } from 'monaco-editor/esm/vs/base/browser/dom.js';
15
+ import { addDisposableListener, EventType, clearNode, EventHelper, getWindow, createStyleSheet } from 'monaco-editor/esm/vs/base/browser/dom.js';
16
16
  import { IStorageService } from 'monaco-editor/esm/vs/platform/storage/common/storage.js';
17
17
  import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
18
18
  import { equals } from 'monaco-editor/esm/vs/base/common/arrays.js';
@@ -28,10 +28,14 @@ import { ToggleStatusbarEntryVisibilityAction, HideStatusbarEntryAction } from '
28
28
  import { StatusbarViewModel } from './statusbarModel.js';
29
29
  import { StatusbarEntryItem } from './statusbarItem.js';
30
30
  import { StatusBarFocused } from 'vscode/vscode/vs/workbench/common/contextkeys';
31
+ import { Emitter, Event } from 'monaco-editor/esm/vs/base/common/event.js';
31
32
 
33
+ var StatusbarPart_1, AuxiliaryStatusbarPart_1;
32
34
  let StatusbarPart = class StatusbarPart extends Part {
33
- constructor(instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService, hoverService, configurationService) {
34
- super("workbench.parts.statusbar" , { hasTitle: false }, themeService, storageService, layoutService);
35
+ static { StatusbarPart_1 = this; }
36
+ static { this.HEIGHT = 22; }
37
+ constructor(id, instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService, hoverService, configurationService) {
38
+ super(id, { hasTitle: false }, themeService, storageService, layoutService);
35
39
  this.instantiationService = instantiationService;
36
40
  this.contextService = contextService;
37
41
  this.storageService = storageService;
@@ -41,11 +45,13 @@ let StatusbarPart = class StatusbarPart extends Part {
41
45
  this.configurationService = configurationService;
42
46
  this.minimumWidth = 0;
43
47
  this.maximumWidth = Number.POSITIVE_INFINITY;
44
- this.minimumHeight = 22;
45
- this.maximumHeight = 22;
48
+ this.minimumHeight = StatusbarPart_1.HEIGHT;
49
+ this.maximumHeight = StatusbarPart_1.HEIGHT;
46
50
  this.pendingEntries = [];
47
51
  this.viewModel = this._register(( new StatusbarViewModel(this.storageService)));
48
52
  this.onDidChangeEntryVisibility = this.viewModel.onDidChangeEntryVisibility;
53
+ this._onWillDispose = this._register(( new Emitter()));
54
+ this.onWillDispose = this._onWillDispose.event;
49
55
  this.hoverDelegate = new (class {
50
56
  get delay() {
51
57
  if (Date.now() - this.lastHoverHideTime < 200) {
@@ -62,7 +68,9 @@ let StatusbarPart = class StatusbarPart extends Part {
62
68
  showHover(options, focus) {
63
69
  return this.hoverService.showHover({
64
70
  ...options,
65
- hideOnKeyDown: true
71
+ persistence: {
72
+ hideOnKeyDown: true
73
+ }
66
74
  }, focus);
67
75
  }
68
76
  onDidHideHover() {
@@ -327,7 +335,7 @@ let StatusbarPart = class StatusbarPart extends Part {
327
335
  }
328
336
  showContextMenu(e) {
329
337
  EventHelper.stop(e, true);
330
- const event = ( new StandardMouseEvent(e));
338
+ const event = ( new StandardMouseEvent(getWindow(this.element), e));
331
339
  let actions = undefined;
332
340
  this.contextMenuService.showContextMenu({
333
341
  getAnchor: () => event,
@@ -429,8 +437,28 @@ let StatusbarPart = class StatusbarPart extends Part {
429
437
  type: "workbench.parts.statusbar"
430
438
  };
431
439
  }
440
+ dispose() {
441
+ this._onWillDispose.fire();
442
+ super.dispose();
443
+ }
444
+ };
445
+ StatusbarPart = StatusbarPart_1 = ( __decorate([
446
+ ( __param(1, IInstantiationService)),
447
+ ( __param(2, IThemeService)),
448
+ ( __param(3, IWorkspaceContextService)),
449
+ ( __param(4, IStorageService)),
450
+ ( __param(5, IWorkbenchLayoutService)),
451
+ ( __param(6, IContextMenuService)),
452
+ ( __param(7, IContextKeyService)),
453
+ ( __param(8, IHoverService)),
454
+ ( __param(9, IConfigurationService))
455
+ ], StatusbarPart));
456
+ let MainStatusbarPart = class MainStatusbarPart extends StatusbarPart {
457
+ constructor(instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService, hoverService, configurationService) {
458
+ super("workbench.parts.statusbar" , instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService, hoverService, configurationService);
459
+ }
432
460
  };
433
- StatusbarPart = ( __decorate([
461
+ MainStatusbarPart = ( __decorate([
434
462
  ( __param(0, IInstantiationService)),
435
463
  ( __param(1, IThemeService)),
436
464
  ( __param(2, IWorkspaceContextService)),
@@ -440,6 +468,130 @@ StatusbarPart = ( __decorate([
440
468
  ( __param(6, IContextKeyService)),
441
469
  ( __param(7, IHoverService)),
442
470
  ( __param(8, IConfigurationService))
443
- ], StatusbarPart));
471
+ ], MainStatusbarPart));
472
+ let AuxiliaryStatusbarPart = class AuxiliaryStatusbarPart extends StatusbarPart {
473
+ static { AuxiliaryStatusbarPart_1 = this; }
474
+ static { this.COUNTER = 1; }
475
+ constructor(container, instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService, hoverService, configurationService) {
476
+ const id = AuxiliaryStatusbarPart_1.COUNTER++;
477
+ super(`workbench.parts.auxiliaryStatus.${id}`, instantiationService, themeService, contextService, storageService, layoutService, contextMenuService, contextKeyService, hoverService, configurationService);
478
+ this.container = container;
479
+ this.height = StatusbarPart.HEIGHT;
480
+ }
481
+ };
482
+ AuxiliaryStatusbarPart = AuxiliaryStatusbarPart_1 = ( __decorate([
483
+ ( __param(1, IInstantiationService)),
484
+ ( __param(2, IThemeService)),
485
+ ( __param(3, IWorkspaceContextService)),
486
+ ( __param(4, IStorageService)),
487
+ ( __param(5, IWorkbenchLayoutService)),
488
+ ( __param(6, IContextMenuService)),
489
+ ( __param(7, IContextKeyService)),
490
+ ( __param(8, IHoverService)),
491
+ ( __param(9, IConfigurationService))
492
+ ], AuxiliaryStatusbarPart));
493
+ let StatusbarService = class StatusbarService extends MultiWindowParts {
494
+ constructor(instantiationService) {
495
+ super();
496
+ this.instantiationService = instantiationService;
497
+ this.mainPart = this._register(this.instantiationService.createInstance(MainStatusbarPart));
498
+ this.onDidChangeEntryVisibility = this.mainPart.onDidChangeEntryVisibility;
499
+ this._register(this.registerPart(this.mainPart));
500
+ }
501
+ createAuxiliaryStatusbarPart(container) {
502
+ const statusbarPartContainer = document.createElement('footer');
503
+ statusbarPartContainer.classList.add('part', 'statusbar');
504
+ statusbarPartContainer.setAttribute('role', 'status');
505
+ statusbarPartContainer.style.position = 'relative';
506
+ statusbarPartContainer.setAttribute('aria-live', 'off');
507
+ statusbarPartContainer.setAttribute('tabindex', '0');
508
+ container.appendChild(statusbarPartContainer);
509
+ const statusbarPart = this.instantiationService.createInstance(AuxiliaryStatusbarPart, statusbarPartContainer);
510
+ const disposable = this.registerPart(statusbarPart);
511
+ statusbarPart.create(statusbarPartContainer);
512
+ Event.once(statusbarPart.onWillDispose)(() => disposable.dispose());
513
+ return statusbarPart;
514
+ }
515
+ createScoped(statusbarEntryContainer, disposables) {
516
+ return disposables.add(this.instantiationService.createInstance(ScopedStatusbarService, statusbarEntryContainer));
517
+ }
518
+ addEntry(entry, id, alignment, priorityOrLocation = 0) {
519
+ return this.mainPart.addEntry(entry, id, alignment, priorityOrLocation);
520
+ }
521
+ isEntryVisible(id) {
522
+ return this.mainPart.isEntryVisible(id);
523
+ }
524
+ updateEntryVisibility(id, visible) {
525
+ for (const part of this.parts) {
526
+ part.updateEntryVisibility(id, visible);
527
+ }
528
+ }
529
+ focus(preserveEntryFocus) {
530
+ this.activePart.focus(preserveEntryFocus);
531
+ }
532
+ focusNextEntry() {
533
+ this.activePart.focusNextEntry();
534
+ }
535
+ focusPreviousEntry() {
536
+ this.activePart.focusPreviousEntry();
537
+ }
538
+ isEntryFocused() {
539
+ return this.activePart.isEntryFocused();
540
+ }
541
+ overrideStyle(style) {
542
+ const disposables = ( new DisposableStore());
543
+ for (const part of this.parts) {
544
+ disposables.add(part.overrideStyle(style));
545
+ }
546
+ return disposables;
547
+ }
548
+ };
549
+ StatusbarService = ( __decorate([
550
+ ( __param(0, IInstantiationService))
551
+ ], StatusbarService));
552
+ let ScopedStatusbarService = class ScopedStatusbarService extends Disposable {
553
+ constructor(statusbarEntryContainer, statusbarService) {
554
+ super();
555
+ this.statusbarEntryContainer = statusbarEntryContainer;
556
+ this.statusbarService = statusbarService;
557
+ this.onDidChangeEntryVisibility = this.statusbarEntryContainer.onDidChangeEntryVisibility;
558
+ }
559
+ createAuxiliaryStatusbarPart(container) {
560
+ return this.statusbarService.createAuxiliaryStatusbarPart(container);
561
+ }
562
+ createScoped(statusbarEntryContainer, disposables) {
563
+ return this.statusbarService.createScoped(statusbarEntryContainer, disposables);
564
+ }
565
+ getPart() {
566
+ return this.statusbarEntryContainer;
567
+ }
568
+ addEntry(entry, id, alignment, priorityOrLocation = 0) {
569
+ return this.statusbarEntryContainer.addEntry(entry, id, alignment, priorityOrLocation);
570
+ }
571
+ isEntryVisible(id) {
572
+ return this.statusbarEntryContainer.isEntryVisible(id);
573
+ }
574
+ updateEntryVisibility(id, visible) {
575
+ this.statusbarEntryContainer.updateEntryVisibility(id, visible);
576
+ }
577
+ focus(preserveEntryFocus) {
578
+ this.statusbarEntryContainer.focus(preserveEntryFocus);
579
+ }
580
+ focusNextEntry() {
581
+ this.statusbarEntryContainer.focusNextEntry();
582
+ }
583
+ focusPreviousEntry() {
584
+ this.statusbarEntryContainer.focusPreviousEntry();
585
+ }
586
+ isEntryFocused() {
587
+ return this.statusbarEntryContainer.isEntryFocused();
588
+ }
589
+ overrideStyle(style) {
590
+ return this.statusbarEntryContainer.overrideStyle(style);
591
+ }
592
+ };
593
+ ScopedStatusbarService = ( __decorate([
594
+ ( __param(1, IStatusbarService))
595
+ ], ScopedStatusbarService));
444
596
 
445
- export { StatusbarPart };
597
+ export { AuxiliaryStatusbarPart, MainStatusbarPart, ScopedStatusbarService, StatusbarService };