@codingame/monaco-vscode-view-common-service-override 4.5.1 → 4.5.2

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 (60) hide show
  1. package/package.json +3 -3
  2. package/vscode/src/vs/base/browser/ui/grid/grid.js +12 -12
  3. package/vscode/src/vs/base/browser/ui/grid/gridview.js +26 -26
  4. package/vscode/src/vs/platform/languagePacks/common/localizedStrings.js +4 -3
  5. package/vscode/src/vs/workbench/api/browser/viewsExtensionPoint.js +127 -220
  6. package/vscode/src/vs/workbench/browser/actions/listCommands.js +43 -44
  7. package/vscode/src/vs/workbench/browser/actions/navigationActions.js +7 -30
  8. package/vscode/src/vs/workbench/browser/parts/activitybar/activitybarPart.js +67 -138
  9. package/vscode/src/vs/workbench/browser/parts/auxiliarybar/auxiliaryBarPart.js +21 -36
  10. package/vscode/src/vs/workbench/browser/parts/compositeBar.js +26 -27
  11. package/vscode/src/vs/workbench/browser/parts/compositePart.js +17 -31
  12. package/vscode/src/vs/workbench/browser/parts/editor/editor.contribution.js +215 -764
  13. package/vscode/src/vs/workbench/browser/parts/editor/editorConfiguration.js +27 -42
  14. package/vscode/src/vs/workbench/browser/parts/editor/editorDropTarget.js +24 -23
  15. package/vscode/src/vs/workbench/browser/parts/editor/editorPart.js +3 -3
  16. package/vscode/src/vs/workbench/browser/parts/editor/editorParts.js +31 -33
  17. package/vscode/src/vs/workbench/browser/parts/paneCompositeBar.js +51 -54
  18. package/vscode/src/vs/workbench/browser/parts/paneCompositePart.js +38 -41
  19. package/vscode/src/vs/workbench/browser/parts/panel/panelPart.js +21 -24
  20. package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarActions.js +2 -5
  21. package/vscode/src/vs/workbench/browser/parts/sidebar/sidebarPart.js +17 -20
  22. package/vscode/src/vs/workbench/browser/window.js +41 -92
  23. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchy.contribution.js +41 -78
  24. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyPeek.js +23 -46
  25. package/vscode/src/vs/workbench/contrib/callHierarchy/browser/callHierarchyTree.js +36 -27
  26. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditorInputFactory.js +1 -1
  27. package/vscode/src/vs/workbench/contrib/customEditor/browser/customEditors.js +1 -1
  28. package/vscode/src/vs/workbench/contrib/customEditor/common/contributedCustomEditors.js +14 -15
  29. package/vscode/src/vs/workbench/contrib/customEditor/common/customEditor.js +10 -11
  30. package/vscode/src/vs/workbench/contrib/customEditor/common/customEditorModelManager.js +1 -1
  31. package/vscode/src/vs/workbench/contrib/customEditor/common/extensionPoint.js +25 -52
  32. package/vscode/src/vs/workbench/contrib/languageStatus/browser/languageStatus.contribution.js +55 -87
  33. package/vscode/src/vs/workbench/contrib/limitIndicator/browser/limitIndicator.contribution.js +18 -48
  34. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/commands.js +61 -150
  35. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/commands/devCommands.js +15 -70
  36. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/mergeEditor.contribution.js +9 -20
  37. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/colors.js +14 -65
  38. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/conflictActions.js +38 -113
  39. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/baseCodeEditorView.js +12 -19
  40. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/inputCodeEditorView.js +34 -75
  41. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/editors/resultCodeEditorView.js +16 -37
  42. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/mergeEditor.js +40 -43
  43. package/vscode/src/vs/workbench/contrib/mergeEditor/browser/view/viewModel.js +12 -11
  44. package/vscode/src/vs/workbench/contrib/preferences/browser/keyboardLayoutPicker.js +24 -61
  45. package/vscode/src/vs/workbench/contrib/sash/browser/sash.contribution.js +7 -6
  46. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchy.contribution.js +37 -70
  47. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyPeek.js +23 -46
  48. package/vscode/src/vs/workbench/contrib/typeHierarchy/browser/typeHierarchyTree.js +26 -27
  49. package/vscode/src/vs/workbench/contrib/webview/browser/overlayWebview.js +2 -2
  50. package/vscode/src/vs/workbench/contrib/webview/browser/webviewElement.js +50 -52
  51. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewCommands.js +18 -34
  52. package/vscode/src/vs/workbench/contrib/webviewPanel/browser/webviewPanel.contribution.js +7 -10
  53. package/vscode/src/vs/workbench/contrib/webviewView/browser/webviewViewService.js +2 -2
  54. package/vscode/src/vs/workbench/services/auxiliaryWindow/browser/auxiliaryWindowService.js +45 -46
  55. package/vscode/src/vs/workbench/services/driver/browser/driver.js +8 -6
  56. package/vscode/src/vs/workbench/services/editor/browser/editorResolverService.js +45 -68
  57. package/vscode/src/vs/workbench/services/history/browser/historyService.js +95 -98
  58. package/vscode/src/vs/workbench/services/progress/browser/progressService.js +34 -74
  59. package/vscode/src/vs/workbench/services/views/browser/viewDescriptorService.js +69 -67
  60. package/vscode/src/vs/workbench/services/views/common/viewContainerModel.js +52 -47
@@ -18,15 +18,12 @@ import { IOutputService } from 'vscode/vscode/vs/workbench/services/output/commo
18
18
  import { CounterSet } from 'vscode/vscode/vs/base/common/map';
19
19
  import { localize2WithPath } from 'vscode/vscode/vs/nls';
20
20
 
21
+ const _moduleId = "vs/workbench/services/views/common/viewContainerModel";
21
22
  registerAction2(class extends Action2 {
22
23
  constructor() {
23
24
  super({
24
25
  id: '_workbench.output.showViewsLog',
25
- title: ( localize2WithPath(
26
- 'vs/workbench/services/views/common/viewContainerModel',
27
- 'showViewsLog',
28
- "Show Views Log"
29
- )),
26
+ title: ( localize2WithPath(_moduleId, 0, "Show Views Log")),
30
27
  category: Categories.Developer,
31
28
  f1: true
32
29
  });
@@ -44,12 +41,12 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
44
41
  super();
45
42
  this.viewContainerName = viewContainerName;
46
43
  this.storageService = storageService;
47
- this._onDidChangeStoredState = this._register(( new Emitter()));
44
+ this._onDidChangeStoredState = this._register(( (new Emitter())));
48
45
  this.onDidChangeStoredState = this._onDidChangeStoredState.event;
49
46
  this.logger = loggerService.createLogger(VIEWS_LOG_ID, { name: VIEWS_LOG_NAME, hidden: true });
50
47
  this.globalViewsStateStorageId = getViewsStateStorageId(viewContainerStorageId);
51
48
  this.workspaceViewsStateStorageId = viewContainerStorageId;
52
- this._register(this.storageService.onDidChangeValue(0 , this.globalViewsStateStorageId, this._register(( new DisposableStore())))(() => this.onDidStorageChange()));
49
+ this._register(this.storageService.onDidChangeValue(0 , this.globalViewsStateStorageId, this._register(( (new DisposableStore()))))(() => this.onDidStorageChange()));
53
50
  this.state = this.initialize();
54
51
  }
55
52
  set(id, state) {
@@ -75,7 +72,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
75
72
  };
76
73
  }
77
74
  }
78
- if (( Object.keys(storedViewsStates)).length > 0) {
75
+ if (( (Object.keys(storedViewsStates))).length > 0) {
79
76
  this.storageService.store(this.workspaceViewsStateStorageId, JSON.stringify(storedViewsStates), 1 , 1 );
80
77
  }
81
78
  else {
@@ -134,9 +131,9 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
134
131
  }
135
132
  }
136
133
  initialize() {
137
- const viewStates = ( new Map());
134
+ const viewStates = ( (new Map()));
138
135
  const workspaceViewsStates = this.getStoredWorkspaceState();
139
- for (const id of ( Object.keys(workspaceViewsStates))) {
136
+ for (const id of ( (Object.keys(workspaceViewsStates)))) {
140
137
  const workspaceViewState = workspaceViewsStates[id];
141
138
  viewStates.set(id, {
142
139
  active: false,
@@ -150,7 +147,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
150
147
  const value = this.storageService.get(this.globalViewsStateStorageId, 1 , '[]');
151
148
  const { state: workspaceVisibilityStates } = this.parseStoredGlobalState(value);
152
149
  if (workspaceVisibilityStates.size > 0) {
153
- for (const { id, isHidden } of ( workspaceVisibilityStates.values())) {
150
+ for (const { id, isHidden } of ( (workspaceVisibilityStates.values()))) {
154
151
  const viewState = viewStates.get(id);
155
152
  if (viewState) {
156
153
  if (isUndefined(viewState.visibleWorkspace)) {
@@ -172,7 +169,7 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
172
169
  if (hasDuplicates) {
173
170
  this.setStoredGlobalState(state);
174
171
  }
175
- for (const { id, isHidden, order } of ( state.values())) {
172
+ for (const { id, isHidden, order } of ( (state.values()))) {
176
173
  const viewState = viewStates.get(id);
177
174
  if (viewState) {
178
175
  viewState.visibleGlobal = !isHidden;
@@ -199,22 +196,22 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
199
196
  return this.parseStoredGlobalState(this.globalViewsStatesValue).state;
200
197
  }
201
198
  setStoredGlobalState(storedGlobalState) {
202
- this.globalViewsStatesValue = JSON.stringify([...( storedGlobalState.values())]);
199
+ this.globalViewsStatesValue = JSON.stringify([...( (storedGlobalState.values()))]);
203
200
  }
204
201
  parseStoredGlobalState(value) {
205
202
  const storedValue = JSON.parse(value);
206
203
  let hasDuplicates = false;
207
204
  const state = storedValue.reduce((result, storedState) => {
208
205
  if (typeof storedState === 'string' ) {
209
- hasDuplicates = hasDuplicates || ( result.has(storedState));
206
+ hasDuplicates = hasDuplicates || ( (result.has(storedState)));
210
207
  result.set(storedState, { id: storedState, isHidden: true });
211
208
  }
212
209
  else {
213
- hasDuplicates = hasDuplicates || ( result.has(storedState.id));
210
+ hasDuplicates = hasDuplicates || ( (result.has(storedState.id)));
214
211
  result.set(storedState.id, storedState);
215
212
  }
216
213
  return result;
217
- }, ( new Map()));
214
+ }, ( (new Map())));
218
215
  return { state, hasDuplicates };
219
216
  }
220
217
  get globalViewsStatesValue() {
@@ -236,34 +233,40 @@ let ViewDescriptorsState = class ViewDescriptorsState extends Disposable {
236
233
  this.storageService.store(this.globalViewsStateStorageId, value, 0 , 0 );
237
234
  }
238
235
  };
239
- ViewDescriptorsState = ( __decorate([
240
- ( __param(2, IStorageService)),
241
- ( __param(3, ILoggerService))
242
- ], ViewDescriptorsState));
236
+ ViewDescriptorsState = ( (__decorate([
237
+ ( (__param(2, IStorageService))),
238
+ ( (__param(3, ILoggerService)))
239
+ ], ViewDescriptorsState)));
243
240
  let ViewContainerModel = class ViewContainerModel extends Disposable {
244
241
  get title() { return this._title; }
245
242
  get icon() { return this._icon; }
246
243
  get keybindingId() { return this._keybindingId; }
247
- get allViewDescriptors() { return ( this.viewDescriptorItems.map(item => item.viewDescriptor)); }
248
- get activeViewDescriptors() { return ( this.viewDescriptorItems.filter(item => item.state.active).map(item => item.viewDescriptor)); }
249
- get visibleViewDescriptors() { return ( this.viewDescriptorItems.filter(item => this.isViewDescriptorVisible(item)).map(item => item.viewDescriptor)); }
244
+ get allViewDescriptors() { return (
245
+ (this.viewDescriptorItems.map(item => item.viewDescriptor))
246
+ ); }
247
+ get activeViewDescriptors() { return (
248
+ (this.viewDescriptorItems.filter(item => item.state.active).map(item => item.viewDescriptor))
249
+ ); }
250
+ get visibleViewDescriptors() { return (
251
+ (this.viewDescriptorItems.filter(item => this.isViewDescriptorVisible(item)).map(item => item.viewDescriptor))
252
+ ); }
250
253
  constructor(viewContainer, instantiationService, contextKeyService, loggerService) {
251
254
  super();
252
255
  this.viewContainer = viewContainer;
253
256
  this.contextKeyService = contextKeyService;
254
- this.contextKeys = ( new CounterSet());
257
+ this.contextKeys = ( (new CounterSet()));
255
258
  this.viewDescriptorItems = [];
256
- this._onDidChangeContainerInfo = this._register(( new Emitter()));
259
+ this._onDidChangeContainerInfo = this._register(( (new Emitter())));
257
260
  this.onDidChangeContainerInfo = this._onDidChangeContainerInfo.event;
258
- this._onDidChangeAllViewDescriptors = this._register(( new Emitter()));
261
+ this._onDidChangeAllViewDescriptors = this._register(( (new Emitter())));
259
262
  this.onDidChangeAllViewDescriptors = this._onDidChangeAllViewDescriptors.event;
260
- this._onDidChangeActiveViewDescriptors = this._register(( new Emitter()));
263
+ this._onDidChangeActiveViewDescriptors = this._register(( (new Emitter())));
261
264
  this.onDidChangeActiveViewDescriptors = this._onDidChangeActiveViewDescriptors.event;
262
- this._onDidAddVisibleViewDescriptors = this._register(( new Emitter()));
265
+ this._onDidAddVisibleViewDescriptors = this._register(( (new Emitter())));
263
266
  this.onDidAddVisibleViewDescriptors = this._onDidAddVisibleViewDescriptors.event;
264
- this._onDidRemoveVisibleViewDescriptors = this._register(( new Emitter()));
267
+ this._onDidRemoveVisibleViewDescriptors = this._register(( (new Emitter())));
265
268
  this.onDidRemoveVisibleViewDescriptors = this._onDidRemoveVisibleViewDescriptors.event;
266
- this._onDidMoveVisibleViewDescriptors = this._register(( new Emitter()));
269
+ this._onDidMoveVisibleViewDescriptors = this._register(( (new Emitter())));
267
270
  this.onDidMoveVisibleViewDescriptors = this._onDidMoveVisibleViewDescriptors.event;
268
271
  this.logger = loggerService.createLogger(VIEWS_LOG_ID, { name: VIEWS_LOG_NAME, hidden: true });
269
272
  this._register(Event.filter(contextKeyService.onDidChangeContext, e => e.affectsSome(this.contextKeys))(() => this.onDidChangeContext()));
@@ -272,7 +275,9 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
272
275
  this.updateContainerInfo();
273
276
  }
274
277
  updateContainerInfo() {
275
- const useDefaultContainerInfo = this.viewContainer.alwaysUseContainerInfo || this.visibleViewDescriptors.length === 0 || ( this.visibleViewDescriptors.some(v => ( Registry.as(Extensions.ViewsRegistry)).getViewContainer(v.id) === this.viewContainer));
278
+ const useDefaultContainerInfo = this.viewContainer.alwaysUseContainerInfo || this.visibleViewDescriptors.length === 0 || ( (this.visibleViewDescriptors.some(
279
+ v => ( (Registry.as(Extensions.ViewsRegistry))).getViewContainer(v.id) === this.viewContainer
280
+ )));
276
281
  const title = useDefaultContainerInfo ? (typeof this.viewContainer.title === 'string' ? this.viewContainer.title : this.viewContainer.title.value) : this.visibleViewDescriptors[0]?.containerTitle || this.visibleViewDescriptors[0]?.name?.value || '';
277
282
  let titleChanged = false;
278
283
  if (this._title !== title) {
@@ -307,7 +312,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
307
312
  isVisible(id) {
308
313
  const viewDescriptorItem = this.viewDescriptorItems.find(v => v.viewDescriptor.id === id);
309
314
  if (!viewDescriptorItem) {
310
- throw new Error(`Unknown view ${id}`);
315
+ throw ( (new Error(`Unknown view ${id}`)));
311
316
  }
312
317
  return this.isViewDescriptorVisible(viewDescriptorItem);
313
318
  }
@@ -315,8 +320,8 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
315
320
  this.updateVisibility([{ id, visible }]);
316
321
  }
317
322
  updateVisibility(viewDescriptors) {
318
- const viewDescriptorItemsToHide = coalesce(( viewDescriptors.filter(({ visible }) => !visible)
319
- .map(({ id }) => this.findAndIgnoreIfNotFound(id))));
323
+ const viewDescriptorItemsToHide = coalesce(( (viewDescriptors.filter(({ visible }) => !visible)
324
+ .map(({ id }) => this.findAndIgnoreIfNotFound(id)))));
320
325
  const removed = [];
321
326
  for (const { viewDescriptorItem, visibleIndex } of viewDescriptorItemsToHide) {
322
327
  if (this.updateViewDescriptorItemVisibility(viewDescriptorItem, false)) {
@@ -400,7 +405,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
400
405
  for (const addedViewDescriptorState of addedViewDescriptorStates) {
401
406
  const viewDescriptor = addedViewDescriptorState.viewDescriptor;
402
407
  if (viewDescriptor.when) {
403
- for (const key of ( viewDescriptor.when.keys())) {
408
+ for (const key of ( (viewDescriptor.when.keys()))) {
404
409
  this.contextKeys.add(key);
405
410
  }
406
411
  }
@@ -432,7 +437,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
432
437
  }
433
438
  this.viewDescriptorItems.push(...addedItems);
434
439
  this.viewDescriptorItems.sort(this.compareViewDescriptors.bind(this));
435
- this._onDidChangeAllViewDescriptors.fire({ added: ( addedItems.map(({ viewDescriptor }) => viewDescriptor)), removed: [] });
440
+ this._onDidChangeAllViewDescriptors.fire({ added: ( (addedItems.map(({ viewDescriptor }) => viewDescriptor))), removed: [] });
436
441
  const addedActiveItems = [];
437
442
  for (const viewDescriptorItem of addedItems) {
438
443
  if (viewDescriptorItem.state.active) {
@@ -440,7 +445,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
440
445
  }
441
446
  }
442
447
  if (addedActiveItems.length) {
443
- this._onDidChangeActiveViewDescriptors.fire(({ added: ( addedActiveItems.map(({ viewDescriptorItem }) => viewDescriptorItem.viewDescriptor)), removed: [] }));
448
+ this._onDidChangeActiveViewDescriptors.fire(({ added: ( (addedActiveItems.map(({ viewDescriptorItem }) => viewDescriptorItem.viewDescriptor))), removed: [] }));
444
449
  }
445
450
  const addedVisibleDescriptors = [];
446
451
  for (const { viewDescriptorItem, visible } of addedActiveItems) {
@@ -458,7 +463,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
458
463
  const removedVisibleDescriptors = [];
459
464
  for (const viewDescriptor of viewDescriptors) {
460
465
  if (viewDescriptor.when) {
461
- for (const key of ( viewDescriptor.when.keys())) {
466
+ for (const key of ( (viewDescriptor.when.keys()))) {
462
467
  this.contextKeys.delete(key);
463
468
  }
464
469
  }
@@ -511,7 +516,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
511
516
  addedActiveItems.forEach(({ item }) => item.state.active = true);
512
517
  this.broadCastRemovedVisibleViewDescriptors(removedVisibleDescriptors);
513
518
  if (addedActiveItems.length || removedActiveItems.length) {
514
- this._onDidChangeActiveViewDescriptors.fire(({ added: ( addedActiveItems.map(({ item }) => item.viewDescriptor)), removed: ( removedActiveItems.map(item => item.viewDescriptor)) }));
519
+ this._onDidChangeActiveViewDescriptors.fire(({ added: ( (addedActiveItems.map(({ item }) => item.viewDescriptor))), removed: ( (removedActiveItems.map(item => item.viewDescriptor))) }));
515
520
  }
516
521
  const addedVisibleDescriptors = [];
517
522
  for (const { item, visibleWhenActive } of addedActiveItems) {
@@ -525,13 +530,13 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
525
530
  broadCastAddedVisibleViewDescriptors(added) {
526
531
  if (added.length) {
527
532
  this._onDidAddVisibleViewDescriptors.fire(added.sort((a, b) => a.index - b.index));
528
- this.updateState(`Added views:${( added.map(v => v.viewDescriptor.id)).join(',')} in ${this.viewContainer.id}`);
533
+ this.updateState(`Added views:${( (added.map(v => v.viewDescriptor.id))).join(',')} in ${this.viewContainer.id}`);
529
534
  }
530
535
  }
531
536
  broadCastRemovedVisibleViewDescriptors(removed) {
532
537
  if (removed.length) {
533
538
  this._onDidRemoveVisibleViewDescriptors.fire(removed.sort((a, b) => b.index - a.index));
534
- this.updateState(`Removed views:${( removed.map(v => v.viewDescriptor.id)).join(',')} from ${this.viewContainer.id}`);
539
+ this.updateState(`Removed views:${( (removed.map(v => v.viewDescriptor.id))).join(',')} from ${this.viewContainer.id}`);
535
540
  }
536
541
  }
537
542
  broadCastMovedViewDescriptors(from, to) {
@@ -560,7 +565,7 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
560
565
  if (result) {
561
566
  return result;
562
567
  }
563
- throw new Error(`view descriptor ${id} not found`);
568
+ throw ( (new Error(`view descriptor ${id} not found`)));
564
569
  }
565
570
  findAndIgnoreIfNotFound(id) {
566
571
  for (let i = 0, visibleIndex = 0; i < this.viewDescriptorItems.length; i++) {
@@ -594,10 +599,10 @@ let ViewContainerModel = class ViewContainerModel extends Disposable {
594
599
  return a.group < b.group ? -1 : 1;
595
600
  }
596
601
  };
597
- ViewContainerModel = ( __decorate([
598
- ( __param(1, IInstantiationService)),
599
- ( __param(2, IContextKeyService)),
600
- ( __param(3, ILoggerService))
601
- ], ViewContainerModel));
602
+ ViewContainerModel = ( (__decorate([
603
+ ( (__param(1, IInstantiationService))),
604
+ ( (__param(2, IContextKeyService))),
605
+ ( (__param(3, ILoggerService)))
606
+ ], ViewContainerModel)));
602
607
 
603
608
  export { ViewContainerModel, getViewsStateStorageId };