提交 3040fd59 编写于 作者: I isidor

explorer: fix memento state regression

上级 bae7a2b1
...@@ -217,7 +217,7 @@ export class ExplorerViewlet extends ViewContainerViewlet implements IExplorerVi ...@@ -217,7 +217,7 @@ export class ExplorerViewlet extends ViewContainerViewlet implements IExplorerVi
}); });
const explorerInstantiator = this.instantiationService.createChild(new ServiceCollection([IEditorService, delegatingEditorService])); const explorerInstantiator = this.instantiationService.createChild(new ServiceCollection([IEditorService, delegatingEditorService]));
return explorerInstantiator.createInstance(ExplorerView, <IExplorerViewOptions>{ ...options, viewletState: this.fileViewletState }); return explorerInstantiator.createInstance(ExplorerView, <IExplorerViewOptions>{ ...options, fileViewletState: this.fileViewletState });
} }
return super.createView(viewDescriptor, options); return super.createView(viewDescriptor, options);
} }
......
...@@ -45,7 +45,7 @@ import { IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelView ...@@ -45,7 +45,7 @@ import { IViewletPanelOptions } from 'vs/workbench/browser/parts/views/panelView
import { ILabelService } from 'vs/platform/label/common/label'; import { ILabelService } from 'vs/platform/label/common/label';
export interface IExplorerViewOptions extends IViewletViewOptions { export interface IExplorerViewOptions extends IViewletViewOptions {
viewletState: FileViewletState; fileViewletState: FileViewletState;
} }
export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView { export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView {
...@@ -61,7 +61,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView ...@@ -61,7 +61,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
private explorerViewer: WorkbenchTree; private explorerViewer: WorkbenchTree;
private filter: FileFilter; private filter: FileFilter;
private viewletState: FileViewletState; private fileViewletState: FileViewletState;
private explorerRefreshDelayer: ThrottledDelayer<void>; private explorerRefreshDelayer: ThrottledDelayer<void>;
...@@ -100,7 +100,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView ...@@ -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); super({ ...(options as IViewletPanelOptions), ariaHeaderLabel: nls.localize('explorerSection', "Files Explorer Section") }, keybindingService, contextMenuService, configurationService);
this.viewState = options.viewletState; this.viewState = options.viewletState;
this.viewletState = options.viewletState; this.fileViewletState = options.fileViewletState;
this.autoReveal = true; this.autoReveal = true;
this.explorerRefreshDelayer = new ThrottledDelayer<void>(ExplorerView.EXPLORER_FILE_CHANGES_REFRESH_DELAY); this.explorerRefreshDelayer = new ThrottledDelayer<void>(ExplorerView.EXPLORER_FILE_CHANGES_REFRESH_DELAY);
...@@ -406,7 +406,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView ...@@ -406,7 +406,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
private createViewer(container: HTMLElement): WorkbenchTree { private createViewer(container: HTMLElement): WorkbenchTree {
const dataSource = this.instantiationService.createInstance(FileDataSource); 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); const controller = this.instantiationService.createInstance(FileController);
this.disposables.push(controller); this.disposables.push(controller);
const sorter = this.instantiationService.createInstance(FileSorter); const sorter = this.instantiationService.createInstance(FileSorter);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册