From 8144fc9a95162d5c3fd41e002623258aff041d8b Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 13 Feb 2018 15:17:08 +0100 Subject: [PATCH] Fix #43466 in 1.20 --- src/vs/workbench/api/node/extHostTreeViews.ts | 2 +- src/vs/workbench/browser/parts/views/treeView.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/api/node/extHostTreeViews.ts b/src/vs/workbench/api/node/extHostTreeViews.ts index effb25dd985cc..ea4dfe8b17269 100644 --- a/src/vs/workbench/api/node/extHostTreeViews.ts +++ b/src/vs/workbench/api/node/extHostTreeViews.ts @@ -205,7 +205,7 @@ class ExtHostTreeView extends Disposable { } const prefix = parentHandle ? parentHandle : ExtHostTreeView.LABEL_HANDLE_PREFIX; - let elementId = label ? label : basename(resourceUri.path); + let elementId = label ? label : (resourceUri ? basename(resourceUri.path) : ''); elementId = elementId.indexOf('/') !== -1 ? elementId.replace('/', '//') : elementId; const existingHandle = this.nodes.has(element) ? this.nodes.get(element).handle : void 0; diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index 69fd5b0cab975..58644cf73c8aa 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -320,7 +320,7 @@ class TreeRenderer implements IRenderer { public renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void { const resource = node.resourceUri ? URI.revive(node.resourceUri) : null; - const name = node.label || basename(resource.path); + const name = node.label ? node.label : (resource ? basename(resource.path) : ''); const icon = this.themeService.getTheme().type === LIGHT ? node.icon : node.iconDark; // reset