@codingame/monaco-vscode-workbench-service-override 6.0.3 → 7.0.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.
Files changed (2) hide show
  1. package/package.json +8 -8
  2. package/vscode/src/vs/workbench/browser/layout.js +20 -20
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-workbench-service-override",
3
- "version": "6.0.3",
3
+ "version": "7.0.1",
4
4
  "keywords": [],
5
5
  "author": {
6
6
  "name": "CodinGame",
@@ -26,12 +26,12 @@
26
26
  }
27
27
  },
28
28
  "dependencies": {
29
- "vscode": "npm:@codingame/monaco-vscode-api@6.0.3",
30
- "@codingame/monaco-vscode-keybindings-service-override": "6.0.3",
31
- "@codingame/monaco-vscode-quickaccess-service-override": "6.0.3",
32
- "@codingame/monaco-vscode-view-title-bar-service-override": "6.0.3",
33
- "@codingame/monaco-vscode-view-status-bar-service-override": "6.0.3",
34
- "@codingame/monaco-vscode-view-banner-service-override": "6.0.3",
35
- "@codingame/monaco-vscode-view-common-service-override": "6.0.3"
29
+ "vscode": "npm:@codingame/monaco-vscode-api@7.0.1",
30
+ "@codingame/monaco-vscode-keybindings-service-override": "7.0.1",
31
+ "@codingame/monaco-vscode-quickaccess-service-override": "7.0.1",
32
+ "@codingame/monaco-vscode-view-title-bar-service-override": "7.0.1",
33
+ "@codingame/monaco-vscode-view-status-bar-service-override": "7.0.1",
34
+ "@codingame/monaco-vscode-view-banner-service-override": "7.0.1",
35
+ "@codingame/monaco-vscode-view-common-service-override": "7.0.1"
36
36
  }
37
37
  }
package/vscode/src/vs/workbench/browser/layout.js CHANGED
@@ -10,7 +10,7 @@ import { PanelPart } from '@codingame/monaco-vscode-view-common-service-override
10
10
  import { LayoutSettings, Parts, EditorActionsLocation, ActivityBarPosition, shouldShowCustomTitleBar, Position, ZenModeSettings, panelOpensMaximizedFromString, PanelOpensMaximizedOptions, positionToString, positionFromString } from 'vscode/vscode/vs/workbench/services/layout/browser/layoutService';
11
11
  import { isTemporaryWorkspace, WorkbenchState } from 'vscode/vscode/vs/platform/workspace/common/workspace';
12
12
  import { IWorkspaceContextService } from 'vscode/vscode/vs/platform/workspace/common/workspace.service';
13
- import { StorageScope, WillSaveStateReason, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
13
+ import { StorageScope, StorageTarget } from 'vscode/vscode/vs/platform/storage/common/storage';
14
14
  import { IStorageService } from 'vscode/vscode/vs/platform/storage/common/storage.service';
15
15
  import { IConfigurationService } from 'vscode/vscode/vs/platform/configuration/common/configuration.service';
16
16
  import { ITitleService } from 'vscode/vscode/vs/workbench/services/title/browser/titleService.service';
@@ -378,7 +378,7 @@ class Layout extends Disposable {
378
378
  if (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN) && this.stateModel.getRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN)) {
379
379
  this.stateModel.setRuntimeValue(LayoutStateKeys.EDITOR_HIDDEN, false);
380
380
  }
381
- this.stateModel.onDidChangeState(change => {
381
+ this._register(this.stateModel.onDidChangeState(change => {
382
382
  if (change.key === LayoutStateKeys.ACTIVITYBAR_HIDDEN) {
383
383
  this.setActivityBarHidden(change.value);
384
384
  }
@@ -395,7 +395,7 @@ class Layout extends Disposable {
395
395
  this.setPanelAlignment(change.value);
396
396
  }
397
397
  this.doUpdateLayoutConfiguration();
398
- });
398
+ }));
399
399
  const initialEditorsState = this.getInitialEditorsState();
400
400
  if (initialEditorsState) {
401
401
  this.logService.info('Initial editor state', initialEditorsState);
@@ -432,7 +432,9 @@ class Layout extends Disposable {
432
432
  };
433
433
  if (this.isVisible(Parts.SIDEBAR_PART)) {
434
434
  let viewContainerToRestore;
435
- if (!this.environmentService.isBuilt || lifecycleService.startupKind === StartupKind.ReloadedWindow) {
435
+ if (!this.environmentService.isBuilt ||
436
+ lifecycleService.startupKind === StartupKind.ReloadedWindow ||
437
+ this.environmentService.isExtensionDevelopment && !this.environmentService.extensionTestsLocationURI) {
436
438
  viewContainerToRestore = this.storageService.get(SidebarPart.activeViewletSettingsKey, StorageScope.WORKSPACE, this.viewDescriptorService.getDefaultViewContainer(ViewContainerLocation.Sidebar)?.id);
437
439
  }
438
440
  else {
@@ -1053,22 +1055,20 @@ class Layout extends Disposable {
1053
1055
  this.handleContainerDidLayout(this.mainContainer, this._mainContainerDimension);
1054
1056
  }));
1055
1057
  }
1056
- this._register(this.storageService.onWillSaveState(willSaveState => {
1057
- if (willSaveState.reason === WillSaveStateReason.SHUTDOWN) {
1058
- const sideBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN)
1059
- ? this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView)
1060
- : this.workbenchGrid.getViewSize(this.sideBarPartView).width;
1061
- this.stateModel.setInitializationValue(LayoutStateKeys.SIDEBAR_SIZE, sideBarSize);
1062
- const panelSize = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
1063
- ? this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView)
1064
- : (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) === Position.BOTTOM ? this.workbenchGrid.getViewSize(this.panelPartView).height : this.workbenchGrid.getViewSize(this.panelPartView).width);
1065
- this.stateModel.setInitializationValue(LayoutStateKeys.PANEL_SIZE, panelSize);
1066
- const auxiliaryBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
1067
- ? this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView)
1068
- : this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
1069
- this.stateModel.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, auxiliaryBarSize);
1070
- this.stateModel.save(true, true);
1071
- }
1058
+ this._register(this.storageService.onWillSaveState(e => {
1059
+ const sideBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.SIDEBAR_HIDDEN)
1060
+ ? this.workbenchGrid.getViewCachedVisibleSize(this.sideBarPartView)
1061
+ : this.workbenchGrid.getViewSize(this.sideBarPartView).width;
1062
+ this.stateModel.setInitializationValue(LayoutStateKeys.SIDEBAR_SIZE, sideBarSize);
1063
+ const panelSize = this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_HIDDEN)
1064
+ ? this.workbenchGrid.getViewCachedVisibleSize(this.panelPartView)
1065
+ : (this.stateModel.getRuntimeValue(LayoutStateKeys.PANEL_POSITION) === Position.BOTTOM ? this.workbenchGrid.getViewSize(this.panelPartView).height : this.workbenchGrid.getViewSize(this.panelPartView).width);
1066
+ this.stateModel.setInitializationValue(LayoutStateKeys.PANEL_SIZE, panelSize);
1067
+ const auxiliaryBarSize = this.stateModel.getRuntimeValue(LayoutStateKeys.AUXILIARYBAR_HIDDEN)
1068
+ ? this.workbenchGrid.getViewCachedVisibleSize(this.auxiliaryBarPartView)
1069
+ : this.workbenchGrid.getViewSize(this.auxiliaryBarPartView).width;
1070
+ this.stateModel.setInitializationValue(LayoutStateKeys.AUXILIARYBAR_SIZE, auxiliaryBarSize);
1071
+ this.stateModel.save(true, true);
1072
1072
  }));
1073
1073
  }
1074
1074
  layout() {