@codingame/monaco-vscode-view-status-bar-service-override 3.2.3 → 4.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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-view-status-bar-service-override",
3
- "version": "3.2.3",
3
+ "version": "4.0.0",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -18,6 +18,6 @@
18
18
  "module": "index.js",
19
19
  "types": "index.d.ts",
20
20
  "dependencies": {
21
- "vscode": "npm:@codingame/monaco-vscode-api@3.2.3"
21
+ "vscode": "npm:@codingame/monaco-vscode-api@4.0.0"
22
22
  }
23
23
  }
@@ -13,7 +13,7 @@ import { assertIsDefined } from 'vscode/vscode/vs/base/common/types';
13
13
  import { StandardKeyboardEvent } from 'vscode/vscode/vs/base/browser/keyboardEvent';
14
14
  import { renderIcon, renderLabelWithIcons } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabels';
15
15
  import { syncing, spinningLoading } from 'vscode/vscode/vs/platform/theme/common/iconRegistry';
16
- import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/iconLabel/iconLabelHover';
16
+ import { setupCustomHover } from 'vscode/vscode/vs/base/browser/ui/hover/updatableHoverWidget';
17
17
  import { isMarkdownString, markdownStringEqual } from 'vscode/vscode/vs/base/common/htmlContent';
18
18
  import { Gesture, EventType as EventType$1 } from 'vscode/vscode/vs/base/browser/touch';
19
19
 
@@ -46,7 +46,7 @@ let StatusbarEntryItem = class StatusbarEntryItem extends Disposable {
46
46
  this.labelContainer.setAttribute('role', 'button');
47
47
  this.labelContainer.className = 'statusbar-item-label';
48
48
  this._register(Gesture.addTarget(this.labelContainer));
49
- this.label = ( new StatusBarCodiconLabel(this.labelContainer));
49
+ this.label = this._register(( new StatusBarCodiconLabel(this.labelContainer)));
50
50
  this.container.appendChild(this.labelContainer);
51
51
  this.beakContainer = document.createElement('div');
52
52
  this.beakContainer.className = 'status-bar-item-beak-container';
@@ -11,7 +11,17 @@ import { toAction, Separator } from 'vscode/vscode/vs/base/common/actions';
11
11
  import { IThemeService } from 'vscode/vscode/vs/platform/theme/common/themeService';
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 'vscode/vscode/vs/platform/workspace/common/workspace';
14
- import { contrastBorder, activeContrastBorder } from 'vscode/vscode/vs/platform/theme/common/colorRegistry';
14
+ import 'vscode/vscode/vs/platform/theme/common/colorUtils';
15
+ import { contrastBorder, activeContrastBorder } from 'vscode/vscode/vs/platform/theme/common/colors/baseColors';
16
+ import 'vscode/vscode/vs/platform/theme/common/colors/chartsColors';
17
+ import 'vscode/vscode/vs/platform/theme/common/colors/editorColors';
18
+ import 'vscode/vscode/vs/platform/theme/common/colors/inputColors';
19
+ import 'vscode/vscode/vs/platform/theme/common/colors/listColors';
20
+ import 'vscode/vscode/vs/platform/theme/common/colors/menuColors';
21
+ import 'vscode/vscode/vs/platform/theme/common/colors/minimapColors';
22
+ import 'vscode/vscode/vs/platform/theme/common/colors/miscColors';
23
+ import 'vscode/vscode/vs/platform/theme/common/colors/quickpickColors';
24
+ import 'vscode/vscode/vs/platform/theme/common/colors/searchColors';
15
25
  import { addDisposableListener, EventType, clearNode, EventHelper, getWindow, createStyleSheet } from 'vscode/vscode/vs/base/browser/dom';
16
26
  import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage';
17
27
  import { IWorkbenchLayoutService } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
@@ -201,7 +211,7 @@ let StatusbarPart = class StatusbarPart extends Part {
201
211
  }
202
212
  createContentArea(parent) {
203
213
  this.element = parent;
204
- const scopedContextKeyService = this.contextKeyService.createScoped(this.element);
214
+ const scopedContextKeyService = this._register(this.contextKeyService.createScoped(this.element));
205
215
  StatusBarFocused.bindTo(scopedContextKeyService).set(true);
206
216
  this.leftItemsContainer = document.createElement('div');
207
217
  this.leftItemsContainer.classList.add('left-items', 'items-container');
@@ -467,6 +477,8 @@ let StatusbarService = class StatusbarService extends MultiWindowParts {
467
477
  super('workbench.statusBarService', themeService, storageService);
468
478
  this.instantiationService = instantiationService;
469
479
  this.mainPart = this._register(this.instantiationService.createInstance(MainStatusbarPart));
480
+ this._onDidCreateAuxiliaryStatusbarPart = this._register(( new Emitter()));
481
+ this.onDidCreateAuxiliaryStatusbarPart = this._onDidCreateAuxiliaryStatusbarPart.event;
470
482
  this.onDidChangeEntryVisibility = this.mainPart.onDidChangeEntryVisibility;
471
483
  this._register(this.registerPart(this.mainPart));
472
484
  }
@@ -482,14 +494,43 @@ let StatusbarService = class StatusbarService extends MultiWindowParts {
482
494
  const disposable = this.registerPart(statusbarPart);
483
495
  statusbarPart.create(statusbarPartContainer);
484
496
  Event.once(statusbarPart.onWillDispose)(() => disposable.dispose());
497
+ this._onDidCreateAuxiliaryStatusbarPart.fire(statusbarPart);
485
498
  return statusbarPart;
486
499
  }
487
500
  createScoped(statusbarEntryContainer, disposables) {
488
501
  return disposables.add(this.instantiationService.createInstance(ScopedStatusbarService, statusbarEntryContainer));
489
502
  }
490
503
  addEntry(entry, id, alignment, priorityOrLocation = 0) {
504
+ if (entry.showInAllWindows) {
505
+ return this.doAddEntryToAllWindows(entry, id, alignment, priorityOrLocation);
506
+ }
491
507
  return this.mainPart.addEntry(entry, id, alignment, priorityOrLocation);
492
508
  }
509
+ doAddEntryToAllWindows(entry, id, alignment, priorityOrLocation = 0) {
510
+ const entryDisposables = ( new DisposableStore());
511
+ const accessors = ( new Set());
512
+ function addEntry(part) {
513
+ const partDisposables = ( new DisposableStore());
514
+ partDisposables.add(part.onWillDispose(() => partDisposables.dispose()));
515
+ const accessor = partDisposables.add(part.addEntry(entry, id, alignment, priorityOrLocation));
516
+ accessors.add(accessor);
517
+ partDisposables.add(toDisposable(() => accessors.delete(accessor)));
518
+ entryDisposables.add(partDisposables);
519
+ partDisposables.add(toDisposable(() => entryDisposables.delete(partDisposables)));
520
+ }
521
+ for (const part of this.parts) {
522
+ addEntry(part);
523
+ }
524
+ entryDisposables.add(this.onDidCreateAuxiliaryStatusbarPart(part => addEntry(part)));
525
+ return {
526
+ update: (entry) => {
527
+ for (const update of accessors) {
528
+ update.update(entry);
529
+ }
530
+ },
531
+ dispose: () => entryDisposables.dispose()
532
+ };
533
+ }
493
534
  isEntryVisible(id) {
494
535
  return this.mainPart.isEntryVisible(id);
495
536
  }