From 7beddeb999e6ca7cec21902092ffe6cfab33771b Mon Sep 17 00:00:00 2001 From: Cory Rivera Date: Thu, 22 Aug 2019 15:49:47 -0700 Subject: [PATCH] Re-add carbon edit for handling undefined proxy in extHostTreeViews. (#6883) --- src/vs/workbench/api/common/extHostTreeViews.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/api/common/extHostTreeViews.ts b/src/vs/workbench/api/common/extHostTreeViews.ts index 98902993a7..bc8588334e 100644 --- a/src/vs/workbench/api/common/extHostTreeViews.ts +++ b/src/vs/workbench/api/common/extHostTreeViews.ts @@ -201,7 +201,10 @@ export class ExtHostTreeView extends Disposable { constructor(private viewId: string, options: vscode.TreeViewOptions2, private proxy: MainThreadTreeViewsShape, private commands: CommandsConverter, private logService: ILogService, private extension: IExtensionDescription) { super(); this.dataProvider = options.treeDataProvider; - this.proxy.$registerTreeViewDataProvider(viewId, { showCollapseAll: !!options.showCollapseAll, canSelectMany: !!options.canSelectMany }); + // {{SQL CARBON EDIT}} + if (this.proxy) { + this.proxy.$registerTreeViewDataProvider(viewId, { showCollapseAll: !!options.showCollapseAll, canSelectMany: !!options.canSelectMany }); + } if (this.dataProvider.onDidChangeTreeData) { this._register(this.dataProvider.onDidChangeTreeData(element => this._onDidChangeData.fire({ message: false, element }))); }