From ad9ab956b438b941b3e5934de5990e3ba9236438 Mon Sep 17 00:00:00 2001 From: isidor Date: Wed, 21 Jun 2017 15:57:59 +0200 Subject: [PATCH] explorer: get rid of references to getWorkspace() --- src/vs/workbench/parts/files/browser/views/explorerView.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/files/browser/views/explorerView.ts b/src/vs/workbench/parts/files/browser/views/explorerView.ts index ce9f3788e8d..2a513782a57 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerView.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerView.ts @@ -753,7 +753,7 @@ export class ExplorerView extends CollapsibleView { */ private getResolvedDirectories(stat: FileStat, resolvedDirectories: URI[]): void { if (stat.isDirectoryResolved) { - if (stat.resource.toString() !== this.contextService.getWorkspace().resource.toString()) { + if (!stat.isRoot) { // Drop those path which are parents of the current one for (let i = resolvedDirectories.length - 1; i >= 0; i--) { @@ -782,7 +782,7 @@ export class ExplorerView extends CollapsibleView { public select(resource: URI, reveal: boolean = this.autoReveal): TPromise { // Require valid path - if (!resource || resource.toString() === this.contextService.getWorkspace().resource.toString()) { + if (!resource) { return TPromise.as(null); } @@ -867,7 +867,7 @@ export class ExplorerView extends CollapsibleView { // Keep list of expanded folders to restore on next load if (this.isCreated) { const expanded = this.explorerViewer.getExpandedElements() - .filter((e: FileStat) => e.resource.toString() !== this.contextService.getWorkspace().resource.toString()) + .filter(e => e instanceof FileStat) .map((e: FileStat) => e.resource.toString()); if (expanded.length) { -- GitLab