From 3040fd59ee95b25f0855c3687896c5673090698d Mon Sep 17 00:00:00 2001 From: isidor Date: Thu, 8 Nov 2018 17:00:14 +0100 Subject: [PATCH] explorer: fix memento state regression --- .../parts/files/electron-browser/explorerViewlet.ts | 2 +- .../parts/files/electron-browser/views/explorerView.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts index 7f8b7605406..c7f73dc9eab 100644 --- a/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts +++ b/src/vs/workbench/parts/files/electron-browser/explorerViewlet.ts @@ -217,7 +217,7 @@ export class ExplorerViewlet extends ViewContainerViewlet implements IExplorerVi }); const explorerInstantiator = this.instantiationService.createChild(new ServiceCollection([IEditorService, delegatingEditorService])); - return explorerInstantiator.createInstance(ExplorerView, { ...options, viewletState: this.fileViewletState }); + return explorerInstantiator.createInstance(ExplorerView, { ...options, fileViewletState: this.fileViewletState }); } return super.createView(viewDescriptor, options); } diff --git a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts index a4ae0916074..ee1c788be02 100644 --- a/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/electron-browser/views/explorerView.ts @@ -45,7 +45,7 @@ import { IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelView import { ILabelService } from 'vs/platform/label/common/label'; export interface IExplorerViewOptions extends IViewletViewOptions { - viewletState: FileViewletState; + fileViewletState: FileViewletState; } export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView { @@ -61,7 +61,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView private explorerViewer: WorkbenchTree; private filter: FileFilter; - private viewletState: FileViewletState; + private fileViewletState: FileViewletState; private explorerRefreshDelayer: ThrottledDelayer; @@ -100,7 +100,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('explorerSection', "Files Explorer Section") }, keybindingService, contextMenuService, configurationService); this.viewState = options.viewletState; - this.viewletState = options.viewletState; + this.fileViewletState = options.fileViewletState; this.autoReveal = true; this.explorerRefreshDelayer = new ThrottledDelayer(ExplorerView.EXPLORER_FILE_CHANGES_REFRESH_DELAY); @@ -406,7 +406,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView private createViewer(container: HTMLElement): WorkbenchTree { const dataSource = this.instantiationService.createInstance(FileDataSource); - const renderer = this.instantiationService.createInstance(FileRenderer, this.viewletState); + const renderer = this.instantiationService.createInstance(FileRenderer, this.fileViewletState); const controller = this.instantiationService.createInstance(FileController); this.disposables.push(controller); const sorter = this.instantiationService.createInstance(FileSorter); -- GitLab