@codingame/monaco-vscode-api 19.1.3 → 20.0.0

package/vscode/src/vs/workbench/api/common/extHostTreeViews.js

@@ -3,7 +3,7 @@ import { localize } from '../../../nls.js';
 import { basename } from '../../../base/common/resources.js';
 import { URI } from '../../../base/common/uri.js';
 import { Emitter, Event } from '../../../base/common/event.js';
-import { Disposable, DisposableStore } from '../../../base/common/lifecycle.js';
+import { Disposable, DisposableStore, dispose } from '../../../base/common/lifecycle.js';
 import { NoTreeViewError } from '../../common/views.js';
 import { asPromise } from '../../../base/common/async.js';
 import { ViewBadge, DataTransfer as DataTransfer$1, TreeItemCheckboxState, MarkdownString as MarkdownString$1, TreeItem, TreeItemCollapsibleState, ThemeIcon } from './extHostTypes.js';
@@ -32,25 +32,25 @@ function toTreeItemLabel(label, extension) {
     return undefined;
 }
 class ExtHostTreeViews extends Disposable {
-    constructor(_proxy, commands, logService) {
+    constructor(_proxy, _commands, _logService) {
         super();
         this._proxy = _proxy;
-        this.commands = commands;
-        this.logService = logService;
-        this.treeViews = ( new Map());
-        this.treeDragAndDropService = ( new TreeViewsDnDService());
+        this._commands = _commands;
+        this._logService = _logService;
+        this._treeViews = ( new Map());
+        this._treeDragAndDropService = ( new TreeViewsDnDService());
         function isTreeViewConvertableItem(arg) {
             return arg && arg.$treeViewId && (arg.$treeItemHandle || arg.$selectedTreeItems || arg.$focusedTreeItem);
         }
-        commands.registerArgumentProcessor({
+        _commands.registerArgumentProcessor({
             processArgument: arg => {
                 if (isTreeViewConvertableItem(arg)) {
-                    return this.convertArgument(arg);
+                    return this._convertArgument(arg);
                 }
                 else if (Array.isArray(arg) && (arg.length > 0)) {
                     return ( arg.map(item => {
                         if (isTreeViewConvertableItem(item)) {
-                            return this.convertArgument(item);
+                            return this._convertArgument(item);
                         }
                         return item;
                     }));
@@ -71,7 +71,7 @@ class ExtHostTreeViews extends Disposable {
         const dragMimeTypes = options.dragAndDropController?.dragMimeTypes ?? [];
         const hasHandleDrag = !!options.dragAndDropController?.handleDrag;
         const hasHandleDrop = !!options.dragAndDropController?.handleDrop;
-        const treeView = this.createExtHostTreeView(viewId, options, extension);
+        const treeView = this._createExtHostTreeView(viewId, options, extension);
         const proxyOptions = { showCollapseAll: !!options.showCollapseAll, canSelectMany: !!options.canSelectMany, dropMimeTypes, dragMimeTypes, hasHandleDrag, hasHandleDrop, manuallyManageCheckboxes: !!options.manageCheckboxStateManually };
         const registerPromise = this._proxy.$registerTreeViewDataProvider(viewId, proxyOptions);
         const view = {
@@ -128,7 +128,7 @@ class ExtHostTreeViews extends Disposable {
             },
             dispose: async () => {
                 await registerPromise;
-                this.treeViews.delete(viewId);
+                this._treeViews.delete(viewId);
                 treeView.dispose();
             }
         };
@@ -136,7 +136,7 @@ class ExtHostTreeViews extends Disposable {
         return view;
     }
     async $getChildren(treeViewId, treeItemHandles) {
-        const treeView = this.treeViews.get(treeViewId);
+        const treeView = this._treeViews.get(treeViewId);
         if (!treeView) {
             return Promise.reject(( new NoTreeViewError(treeViewId)));
         }
@@ -155,7 +155,7 @@ class ExtHostTreeViews extends Disposable {
         return result;
     }
     async $handleDrop(destinationViewId, requestId, treeDataTransferDTO, targetItemHandle, token, operationUuid, sourceViewId, sourceTreeItemHandles) {
-        const treeView = this.treeViews.get(destinationViewId);
+        const treeView = this._treeViews.get(destinationViewId);
         if (!treeView) {
             return Promise.reject(( new NoTreeViewError(destinationViewId)));
         }
@@ -163,12 +163,12 @@ class ExtHostTreeViews extends Disposable {
             return (await this._proxy.$resolveDropFileData(destinationViewId, requestId, dataItemIndex)).buffer;
         });
         if ((sourceViewId === destinationViewId) && sourceTreeItemHandles) {
-            await this.addAdditionalTransferItems(treeDataTransfer, treeView, sourceTreeItemHandles, token, operationUuid);
+            await this._addAdditionalTransferItems(treeDataTransfer, treeView, sourceTreeItemHandles, token, operationUuid);
         }
         return treeView.onDrop(treeDataTransfer, targetItemHandle, token);
     }
-    async addAdditionalTransferItems(treeDataTransfer, treeView, sourceTreeItemHandles, token, operationUuid) {
-        const existingTransferOperation = this.treeDragAndDropService.removeDragOperationTransfer(operationUuid);
+    async _addAdditionalTransferItems(treeDataTransfer, treeView, sourceTreeItemHandles, token, operationUuid) {
+        const existingTransferOperation = this._treeDragAndDropService.removeDragOperationTransfer(operationUuid);
         if (existingTransferOperation) {
             (await existingTransferOperation)?.forEach((value, key) => {
                 if (value) {
@@ -178,52 +178,52 @@ class ExtHostTreeViews extends Disposable {
         }
         else if (operationUuid && treeView.handleDrag) {
             const willDropPromise = treeView.handleDrag(sourceTreeItemHandles, treeDataTransfer, token);
-            this.treeDragAndDropService.addDragOperationTransfer(operationUuid, willDropPromise);
+            this._treeDragAndDropService.addDragOperationTransfer(operationUuid, willDropPromise);
             await willDropPromise;
         }
         return treeDataTransfer;
     }
     async $handleDrag(sourceViewId, sourceTreeItemHandles, operationUuid, token) {
-        const treeView = this.treeViews.get(sourceViewId);
+        const treeView = this._treeViews.get(sourceViewId);
         if (!treeView) {
             return Promise.reject(( new NoTreeViewError(sourceViewId)));
         }
-        const treeDataTransfer = await this.addAdditionalTransferItems(new DataTransfer$1(), treeView, sourceTreeItemHandles, token, operationUuid);
+        const treeDataTransfer = await this._addAdditionalTransferItems(new DataTransfer$1(), treeView, sourceTreeItemHandles, token, operationUuid);
         if (!treeDataTransfer || token.isCancellationRequested) {
             return;
         }
         return DataTransfer.from(treeDataTransfer);
     }
     async $hasResolve(treeViewId) {
-        const treeView = this.treeViews.get(treeViewId);
+        const treeView = this._treeViews.get(treeViewId);
         if (!treeView) {
             throw ( new NoTreeViewError(treeViewId));
         }
         return treeView.hasResolve;
     }
     $resolve(treeViewId, treeItemHandle, token) {
-        const treeView = this.treeViews.get(treeViewId);
+        const treeView = this._treeViews.get(treeViewId);
         if (!treeView) {
             throw ( new NoTreeViewError(treeViewId));
         }
         return treeView.resolveTreeItem(treeItemHandle, token);
     }
     $setExpanded(treeViewId, treeItemHandle, expanded) {
-        const treeView = this.treeViews.get(treeViewId);
+        const treeView = this._treeViews.get(treeViewId);
         if (!treeView) {
             throw ( new NoTreeViewError(treeViewId));
         }
         treeView.setExpanded(treeItemHandle, expanded);
     }
     $setSelectionAndFocus(treeViewId, selectedHandles, focusedHandle) {
-        const treeView = this.treeViews.get(treeViewId);
+        const treeView = this._treeViews.get(treeViewId);
         if (!treeView) {
             throw ( new NoTreeViewError(treeViewId));
         }
         treeView.setSelectionAndFocus(selectedHandles, focusedHandle);
     }
     $setVisible(treeViewId, isVisible) {
-        const treeView = this.treeViews.get(treeViewId);
+        const treeView = this._treeViews.get(treeViewId);
         if (!treeView) {
             if (!isVisible) {
                 return;
@@ -233,26 +233,26 @@ class ExtHostTreeViews extends Disposable {
         treeView.setVisible(isVisible);
     }
     $changeCheckboxState(treeViewId, checkboxUpdate) {
-        const treeView = this.treeViews.get(treeViewId);
+        const treeView = this._treeViews.get(treeViewId);
         if (!treeView) {
             throw ( new NoTreeViewError(treeViewId));
         }
         treeView.setCheckboxState(checkboxUpdate);
     }
-    createExtHostTreeView(id, options, extension) {
+    _createExtHostTreeView(id, options, extension) {
         const treeView = this._register(( new ExtHostTreeView(
             id,
             options,
             this._proxy,
-            this.commands.converter,
-            this.logService,
+            this._commands.converter,
+            this._logService,
             extension
         )));
-        this.treeViews.set(id, treeView);
+        this._treeViews.set(id, treeView);
         return treeView;
     }
-    convertArgument(arg) {
-        const treeView = this.treeViews.get(arg.$treeViewId);
+    _convertArgument(arg) {
+        const treeView = this._treeViews.get(arg.$treeViewId);
         const asItemHandle = arg;
         if (treeView && asItemHandle.$treeItemHandle) {
             return treeView.getExtensionElement(asItemHandle.$treeItemHandle);
@@ -270,16 +270,16 @@ class ExtHostTreeView extends Disposable {
     get visible() { return this._visible; }
     get selectedElements() { return ( this._selectedHandles.map(handle => this.getExtensionElement(handle))).filter(element => !isUndefinedOrNull(element)); }
     get focusedElement() { return (this._focusedHandle ? this.getExtensionElement(this._focusedHandle) : undefined); }
-    constructor(viewId, options, proxy, commands, logService, extension) {
+    constructor(_viewId, options, _proxy, _commands, _logService, _extension) {
         super();
-        this.viewId = viewId;
-        this.proxy = proxy;
-        this.commands = commands;
-        this.logService = logService;
-        this.extension = extension;
-        this.roots = undefined;
-        this.elements = ( new Map());
-        this.nodes = ( new Map());
+        this._viewId = _viewId;
+        this._proxy = _proxy;
+        this._commands = _commands;
+        this._logService = _logService;
+        this._extension = _extension;
+        this._roots = undefined;
+        this._elements = ( new Map());
+        this._nodes = ( new Map());
         this._visible = false;
         this._selectedHandles = [];
         this._focusedHandle = undefined;
@@ -296,24 +296,25 @@ class ExtHostTreeView extends Disposable {
         this._onDidChangeCheckboxState = this._register(( new Emitter()));
         this.onDidChangeCheckboxState = this._onDidChangeCheckboxState.event;
         this._onDidChangeData = this._register(( new Emitter()));
-        this.refreshPromise = Promise.resolve();
-        this.refreshQueue = Promise.resolve();
+        this._refreshPromise = Promise.resolve();
+        this._refreshQueue = Promise.resolve();
+        this._nodesToClear = ( new Set());
         this._message = '';
         this._title = '';
         this._refreshCancellationSource = ( new CancellationTokenSource());
-        if (extension.contributes && extension.contributes.views) {
-            for (const location in extension.contributes.views) {
-                for (const view of extension.contributes.views[location]) {
-                    if (view.id === viewId) {
+        if (_extension.contributes && _extension.contributes.views) {
+            for (const location in _extension.contributes.views) {
+                for (const view of _extension.contributes.views[location]) {
+                    if (view.id === _viewId) {
                         this._title = view.name;
                     }
                 }
             }
         }
-        this.dataProvider = options.treeDataProvider;
-        this.dndController = options.dragAndDropController;
-        if (this.dataProvider.onDidChangeTreeData) {
-            this._register(this.dataProvider.onDidChangeTreeData(elementOrElements => {
+        this._dataProvider = options.treeDataProvider;
+        this._dndController = options.dragAndDropController;
+        if (this._dataProvider.onDidChangeTreeData) {
+            this._register(this._dataProvider.onDidChangeTreeData(elementOrElements => {
                 if (Array.isArray(elementOrElements) && elementOrElements.length === 0) {
                     return;
                 }
@@ -329,7 +330,7 @@ class ExtHostTreeView extends Disposable {
             if (current.element !== false) {
                 if (!refreshingPromise) {
                     refreshingPromise = ( new Promise(c => promiseCallback = c));
-                    this.refreshPromise = this.refreshPromise.then(() => refreshingPromise);
+                    this._refreshPromise = this._refreshPromise.then(() => refreshingPromise);
                 }
                 if (Array.isArray(current.element)) {
                     result.elements.push(...current.element);
@@ -345,50 +346,54 @@ class ExtHostTreeView extends Disposable {
         }, 200, true);
         this._register(onDidChangeData(({ message, elements }) => {
             if (elements.length) {
-                this.refreshQueue = this.refreshQueue.then(() => {
+                this._refreshQueue = this._refreshQueue.then(() => {
                     const _promiseCallback = promiseCallback;
                     refreshingPromise = null;
-                    return this.refresh(elements).then(() => _promiseCallback());
+                    const childrenToClear = Array.from(this._nodesToClear);
+                    return this._refresh(elements).then(() => {
+                        this._clearNodes(childrenToClear);
+                        return _promiseCallback();
+                    });
                 });
             }
             if (message) {
-                this.proxy.$setMessage(this.viewId, MarkdownString.fromStrict(this._message) ?? '');
+                this._proxy.$setMessage(this._viewId, MarkdownString.fromStrict(this._message) ?? '');
             }
         }));
     }
     async getChildren(parentHandle) {
         const parentElement = parentHandle ? this.getExtensionElement(parentHandle) : undefined;
         if (parentHandle && !parentElement) {
-            this.logService.error(`No tree item with id \'${parentHandle}\' found.`);
+            this._logService.error(`No tree item with id \'${parentHandle}\' found.`);
             return Promise.resolve([]);
         }
-        let childrenNodes = this.getChildrenNodes(parentHandle);
+        let childrenNodes = this._getChildrenNodes(parentHandle);
         if (!childrenNodes) {
-            childrenNodes = await this.fetchChildrenNodes(parentElement);
+            childrenNodes = await this._fetchChildrenNodes(parentElement);
         }
         return childrenNodes ? ( childrenNodes.map(n => n.item)) : undefined;
     }
     getExtensionElement(treeItemHandle) {
-        return this.elements.get(treeItemHandle);
+        return this._elements.get(treeItemHandle);
     }
     reveal(element, options) {
         options = options ? options : { select: true, focus: false };
         const select = isUndefinedOrNull(options.select) ? true : options.select;
         const focus = isUndefinedOrNull(options.focus) ? false : options.focus;
         const expand = isUndefinedOrNull(options.expand) ? false : options.expand;
-        if (typeof this.dataProvider.getParent !== 'function') {
+        if (typeof this._dataProvider.getParent !== 'function') {
             return Promise.reject(( new Error(
                 `Required registered TreeDataProvider to implement 'getParent' method to access 'reveal' method`
             )));
         }
         if (element) {
-            return this.refreshPromise
-                .then(() => this.resolveUnknownParentChain(element))
-                .then(parentChain => this.resolveTreeNode(element, parentChain[parentChain.length - 1])
-                .then(treeNode => this.proxy.$reveal(this.viewId, { item: treeNode.item, parentChain: ( parentChain.map(p => p.item)) }, { select, focus, expand })), error => this.logService.error(error));
+            return this._refreshPromise
+                .then(() => this._resolveUnknownParentChain(element))
+                .then(parentChain => this._resolveTreeNode(element, parentChain[parentChain.length - 1])
+                .then(treeNode => this._proxy.$reveal(this._viewId, { item: treeNode.item, parentChain: ( parentChain.map(p => p.item)) }, { select, focus, expand })), error => this._logService.error(error));
         }
         else {
-            return this.proxy.$reveal(this.viewId, undefined, { select, focus, expand });
+            return this._proxy.$reveal(this._viewId, undefined, { select, focus, expand });
         }
     }
     get message() {
@@ -403,14 +408,14 @@ class ExtHostTreeView extends Disposable {
     }
     set title(title) {
         this._title = title;
-        this.proxy.$setTitle(this.viewId, title, this._description);
+        this._proxy.$setTitle(this._viewId, title, this._description);
     }
     get description() {
         return this._description;
     }
     set description(description) {
         this._description = description;
-        this.proxy.$setTitle(this.viewId, this._title, description);
+        this._proxy.$setTitle(this._viewId, this._title, description);
     }
     get badge() {
         return this._badge;
@@ -421,7 +426,7 @@ class ExtHostTreeView extends Disposable {
             return;
         }
         this._badge = ViewBadge$1.from(badge);
-        this.proxy.$setBadge(this.viewId, badge);
+        this._proxy.$setBadge(this._viewId, badge);
     }
     setExpanded(treeItemHandle, expanded) {
         const element = this.getExtensionElement(treeItemHandle);
@@ -458,7 +463,7 @@ class ExtHostTreeView extends Disposable {
             if (extensionItem) {
                 return {
                     extensionItem: extensionItem,
-                    treeItem: await this.dataProvider.getTreeItem(extensionItem),
+                    treeItem: await this._dataProvider.getTreeItem(extensionItem),
                     newState: checkboxUpdate.newState ? TreeItemCheckboxState.Checked : TreeItemCheckboxState.Unchecked
                 };
             }
@@ -477,118 +482,118 @@ class ExtHostTreeView extends Disposable {
                 extensionTreeItems.push(extensionItem);
             }
         }
-        if (!this.dndController?.handleDrag || (extensionTreeItems.length === 0)) {
+        if (!this._dndController?.handleDrag || (extensionTreeItems.length === 0)) {
             return;
         }
-        await this.dndController.handleDrag(extensionTreeItems, treeDataTransfer, token);
+        await this._dndController.handleDrag(extensionTreeItems, treeDataTransfer, token);
         return treeDataTransfer;
     }
     get hasHandleDrag() {
-        return !!this.dndController?.handleDrag;
+        return !!this._dndController?.handleDrag;
     }
     async onDrop(treeDataTransfer, targetHandleOrNode, token) {
         const target = targetHandleOrNode ? this.getExtensionElement(targetHandleOrNode) : undefined;
-        if ((!target && targetHandleOrNode) || !this.dndController?.handleDrop) {
+        if ((!target && targetHandleOrNode) || !this._dndController?.handleDrop) {
             return;
         }
-        return asPromise(() => this.dndController?.handleDrop
-            ? this.dndController.handleDrop(target, treeDataTransfer, token)
+        return asPromise(() => this._dndController?.handleDrop
+            ? this._dndController.handleDrop(target, treeDataTransfer, token)
             : undefined);
     }
     get hasResolve() {
-        return !!this.dataProvider.resolveTreeItem;
+        return !!this._dataProvider.resolveTreeItem;
     }
     async resolveTreeItem(treeItemHandle, token) {
-        if (!this.dataProvider.resolveTreeItem) {
+        if (!this._dataProvider.resolveTreeItem) {
             return;
         }
-        const element = this.elements.get(treeItemHandle);
+        const element = this._elements.get(treeItemHandle);
         if (element) {
-            const node = this.nodes.get(element);
+            const node = this._nodes.get(element);
             if (node) {
-                const resolve = (await this.dataProvider.resolveTreeItem(node.extensionItem, element, token)) ?? node.extensionItem;
-                this.validateTreeItem(resolve);
-                node.item.tooltip = this.getTooltip(resolve.tooltip);
-                node.item.command = this.getCommand(node.disposableStore, resolve.command);
+                const resolve = (await this._dataProvider.resolveTreeItem(node.extensionItem, element, token)) ?? node.extensionItem;
+                this._validateTreeItem(resolve);
+                node.item.tooltip = this._getTooltip(resolve.tooltip);
+                node.item.command = this._getCommand(node.disposableStore, resolve.command);
                 return node.item;
             }
         }
         return;
     }
-    resolveUnknownParentChain(element) {
-        return this.resolveParent(element)
+    _resolveUnknownParentChain(element) {
+        return this._resolveParent(element)
             .then((parent) => {
             if (!parent) {
                 return Promise.resolve([]);
             }
-            return this.resolveUnknownParentChain(parent)
-                .then(result => this.resolveTreeNode(parent, result[result.length - 1])
+            return this._resolveUnknownParentChain(parent)
+                .then(result => this._resolveTreeNode(parent, result[result.length - 1])
                 .then(parentNode => {
                 result.push(parentNode);
                 return result;
             }));
         });
     }
-    resolveParent(element) {
-        const node = this.nodes.get(element);
+    _resolveParent(element) {
+        const node = this._nodes.get(element);
         if (node) {
-            return Promise.resolve(node.parent ? this.elements.get(node.parent.item.handle) : undefined);
+            return Promise.resolve(node.parent ? this._elements.get(node.parent.item.handle) : undefined);
         }
-        return asPromise(() => this.dataProvider.getParent(element));
+        return asPromise(() => this._dataProvider.getParent(element));
     }
-    resolveTreeNode(element, parent) {
-        const node = this.nodes.get(element);
+    _resolveTreeNode(element, parent) {
+        const node = this._nodes.get(element);
         if (node) {
             return Promise.resolve(node);
         }
-        return asPromise(() => this.dataProvider.getTreeItem(element))
-            .then(extTreeItem => this.createHandle(element, extTreeItem, parent, true))
+        return asPromise(() => this._dataProvider.getTreeItem(element))
+            .then(extTreeItem => this._createHandle(element, extTreeItem, parent, true))
             .then(handle => this.getChildren(parent ? parent.item.handle : undefined)
             .then(() => {
             const cachedElement = this.getExtensionElement(handle);
             if (cachedElement) {
-                const node = this.nodes.get(cachedElement);
+                const node = this._nodes.get(cachedElement);
                 if (node) {
                     return Promise.resolve(node);
                 }
             }
             throw ( new Error(
-                `Cannot resolve tree item for element ${handle} from extension ${this.extension.identifier.value}`
+                `Cannot resolve tree item for element ${handle} from extension ${this._extension.identifier.value}`
             ));
         }));
     }
-    getChildrenNodes(parentNodeOrHandle) {
+    _getChildrenNodes(parentNodeOrHandle) {
         if (parentNodeOrHandle) {
             let parentNode;
             if (typeof parentNodeOrHandle === 'string') {
                 const parentElement = this.getExtensionElement(parentNodeOrHandle);
-                parentNode = parentElement ? this.nodes.get(parentElement) : undefined;
+                parentNode = parentElement ? this._nodes.get(parentElement) : undefined;
             }
             else {
                 parentNode = parentNodeOrHandle;
             }
             return parentNode ? parentNode.children || undefined : undefined;
         }
-        return this.roots;
+        return this._roots;
     }
-    async fetchChildrenNodes(parentElement) {
-        this.clearChildren(parentElement);
+    async _fetchChildrenNodes(parentElement) {
+        this._addChildrenToClear(parentElement);
         const cts = ( new CancellationTokenSource(this._refreshCancellationSource.token));
         try {
-            const parentNode = parentElement ? this.nodes.get(parentElement) : undefined;
-            const elements = await this.dataProvider.getChildren(parentElement);
+            const parentNode = parentElement ? this._nodes.get(parentElement) : undefined;
+            const elements = await this._dataProvider.getChildren(parentElement);
             if (cts.token.isCancellationRequested) {
                 return undefined;
             }
             const coalescedElements = coalesce(elements || []);
             const treeItems = await Promise.all(( coalesce(coalescedElements).map(element => {
-                return this.dataProvider.getTreeItem(element);
+                return this._dataProvider.getTreeItem(element);
             })));
             if (cts.token.isCancellationRequested) {
                 return undefined;
             }
             const items = ( treeItems.map(
-                (item, index) => item ? this.createAndRegisterTreeNode(coalescedElements[index], item, parentNode) : null
+                (item, index) => item ? this._createAndRegisterTreeNode(coalescedElements[index], item, parentNode) : null
             ));
             return coalesce(items);
         }
@@ -596,31 +601,31 @@ class ExtHostTreeView extends Disposable {
             cts.dispose();
         }
     }
-    refresh(elements) {
+    _refresh(elements) {
         const hasRoot = ( elements.some(element => !element));
         if (hasRoot) {
             this._refreshCancellationSource.dispose(true);
             this._refreshCancellationSource = ( new CancellationTokenSource());
-            this.clearAll();
-            return this.proxy.$refresh(this.viewId);
+            this._addChildrenToClear();
+            return this._proxy.$refresh(this._viewId);
         }
         else {
-            const handlesToRefresh = this.getHandlesToRefresh(elements);
+            const handlesToRefresh = this._getHandlesToRefresh(elements);
             if (handlesToRefresh.length) {
-                return this.refreshHandles(handlesToRefresh);
+                return this._refreshHandles(handlesToRefresh);
             }
         }
         return Promise.resolve(undefined);
     }
-    getHandlesToRefresh(elements) {
+    _getHandlesToRefresh(elements) {
         const elementsToUpdate = ( new Set());
-        const elementNodes = ( elements.map(element => this.nodes.get(element)));
+        const elementNodes = ( elements.map(element => this._nodes.get(element)));
         for (const elementNode of elementNodes) {
             if (elementNode && !( elementsToUpdate.has(elementNode.item.handle))) {
                 let currentNode = elementNode;
                 while (currentNode && currentNode.parent && elementNodes.findIndex(node => currentNode && currentNode.parent && node && node.item.handle === currentNode.parent.item.handle) === -1) {
-                    const parentElement = this.elements.get(currentNode.parent.item.handle);
-                    currentNode = parentElement ? this.nodes.get(parentElement) : undefined;
+                    const parentElement = this._elements.get(currentNode.parent.item.handle);
+                    currentNode = parentElement ? this._nodes.get(parentElement) : undefined;
                 }
                 if (currentNode && !currentNode.parent) {
                     elementsToUpdate.add(elementNode.item.handle);
@@ -629,9 +634,9 @@ class ExtHostTreeView extends Disposable {
         }
         const handlesToUpdate = [];
         elementsToUpdate.forEach((handle) => {
-            const element = this.elements.get(handle);
+            const element = this._elements.get(handle);
             if (element) {
-                const node = this.nodes.get(element);
+                const node = this._nodes.get(element);
                 if (node && (!node.parent || !( elementsToUpdate.has(node.parent.item.handle)))) {
                     handlesToUpdate.push(handle);
                 }
@@ -639,27 +644,27 @@ class ExtHostTreeView extends Disposable {
         });
         return handlesToUpdate;
     }
-    refreshHandles(itemHandles) {
+    _refreshHandles(itemHandles) {
         const itemsToRefresh = {};
-        return Promise.all(( itemHandles.map(treeItemHandle => this.refreshNode(treeItemHandle)
+        return Promise.all(( itemHandles.map(treeItemHandle => this._refreshNode(treeItemHandle)
             .then(node => {
             if (node) {
                 itemsToRefresh[treeItemHandle] = node.item;
             }
         }))))
-            .then(() => ( Object.keys(itemsToRefresh)).length ? this.proxy.$refresh(this.viewId, itemsToRefresh) : undefined);
+            .then(() => ( Object.keys(itemsToRefresh)).length ? this._proxy.$refresh(this._viewId, itemsToRefresh) : undefined);
     }
-    refreshNode(treeItemHandle) {
+    _refreshNode(treeItemHandle) {
         const extElement = this.getExtensionElement(treeItemHandle);
         if (extElement) {
-            const existing = this.nodes.get(extElement);
+            const existing = this._nodes.get(extElement);
             if (existing) {
-                this.clearChildren(extElement);
-                return asPromise(() => this.dataProvider.getTreeItem(extElement))
+                this._addChildrenToClear(extElement);
+                return asPromise(() => this._dataProvider.getTreeItem(extElement))
                     .then(extTreeItem => {
                     if (extTreeItem) {
-                        const newNode = this.createTreeNode(extElement, extTreeItem, existing.parent);
-                        this.updateNodeCache(extElement, newNode, existing, existing.parent);
+                        const newNode = this._createTreeNode(extElement, extTreeItem, existing.parent);
+                        this._updateNodeCache(extElement, newNode, existing, existing.parent);
                         existing.dispose();
                         return newNode;
                     }
@@ -669,25 +674,25 @@ class ExtHostTreeView extends Disposable {
         }
         return Promise.resolve(null);
     }
-    createAndRegisterTreeNode(element, extTreeItem, parentNode) {
-        const node = this.createTreeNode(element, extTreeItem, parentNode);
-        if (extTreeItem.id && ( this.elements.has(node.item.handle))) {
-            throw ( new Error(( localize(2610, 'Element with id {0} is already registered', extTreeItem.id))));
+    _createAndRegisterTreeNode(element, extTreeItem, parentNode) {
+        const node = this._createTreeNode(element, extTreeItem, parentNode);
+        if (extTreeItem.id && ( this._elements.has(node.item.handle))) {
+            throw ( new Error(( localize(2637, 'Element with id {0} is already registered', extTreeItem.id))));
         }
-        this.addNodeToCache(element, node);
-        this.addNodeToParentCache(node, parentNode);
+        this._addNodeToCache(element, node);
+        this._addNodeToParentCache(node, parentNode);
         return node;
     }
-    getTooltip(tooltip) {
+    _getTooltip(tooltip) {
         if (MarkdownString$1.isMarkdownString(tooltip)) {
             return MarkdownString.from(tooltip);
         }
         return tooltip;
     }
-    getCommand(disposable, command) {
-        return command ? { ...this.commands.toInternal(command, disposable), originalId: command.command } : undefined;
+    _getCommand(disposable, command) {
+        return command ? { ...this._commands.toInternal(command, disposable), originalId: command.command } : undefined;
     }
-    getCheckbox(extensionTreeItem) {
+    _getCheckbox(extensionTreeItem) {
         if (extensionTreeItem.checkboxState === undefined) {
             return undefined;
         }
@@ -704,33 +709,33 @@ class ExtHostTreeView extends Disposable {
         }
         return { isChecked: checkboxState === TreeItemCheckboxState.Checked, tooltip, accessibilityInformation };
     }
-    validateTreeItem(extensionTreeItem) {
-        if (!TreeItem.isTreeItem(extensionTreeItem, this.extension)) {
+    _validateTreeItem(extensionTreeItem) {
+        if (!TreeItem.isTreeItem(extensionTreeItem, this._extension)) {
             throw ( new Error(
-                `Extension ${this.extension.identifier.value} has provided an invalid tree item.`
+                `Extension ${this._extension.identifier.value} has provided an invalid tree item.`
             ));
         }
     }
-    createTreeNode(element, extensionTreeItem, parent) {
-        this.validateTreeItem(extensionTreeItem);
+    _createTreeNode(element, extensionTreeItem, parent) {
+        this._validateTreeItem(extensionTreeItem);
         const disposableStore = this._register(( new DisposableStore()));
-        const handle = this.createHandle(element, extensionTreeItem, parent);
-        const icon = this.getLightIconPath(extensionTreeItem);
+        const handle = this._createHandle(element, extensionTreeItem, parent);
+        const icon = this._getLightIconPath(extensionTreeItem);
         const item = {
             handle,
             parentHandle: parent ? parent.item.handle : undefined,
             label: toTreeItemLabel(extensionTreeItem.label),
             description: extensionTreeItem.description,
             resourceUri: extensionTreeItem.resourceUri,
-            tooltip: this.getTooltip(extensionTreeItem.tooltip),
-            command: this.getCommand(disposableStore, extensionTreeItem.command),
+            tooltip: this._getTooltip(extensionTreeItem.tooltip),
+            command: this._getCommand(disposableStore, extensionTreeItem.command),
             contextValue: extensionTreeItem.contextValue,
             icon,
-            iconDark: this.getDarkIconPath(extensionTreeItem) || icon,
-            themeIcon: this.getThemeIcon(extensionTreeItem),
+            iconDark: this._getDarkIconPath(extensionTreeItem) || icon,
+            themeIcon: this._getThemeIcon(extensionTreeItem),
             collapsibleState: isUndefinedOrNull(extensionTreeItem.collapsibleState) ? TreeItemCollapsibleState.None : extensionTreeItem.collapsibleState,
             accessibilityInformation: extensionTreeItem.accessibilityInformation,
-            checkbox: this.getCheckbox(extensionTreeItem),
+            checkbox: this._getCheckbox(extensionTreeItem),
         };
         return {
             item,
@@ -741,10 +746,10 @@ class ExtHostTreeView extends Disposable {
             dispose() { disposableStore.dispose(); }
         };
     }
-    getThemeIcon(extensionTreeItem) {
+    _getThemeIcon(extensionTreeItem) {
         return extensionTreeItem.iconPath instanceof ThemeIcon ? extensionTreeItem.iconPath : undefined;
     }
-    createHandle(element, { id, label, resourceUri }, parent, returnFirst) {
+    _createHandle(element, { id, label, resourceUri }, parent, returnFirst) {
         if (id) {
             return `${ExtHostTreeView.ID_HANDLE_PREFIX}/${id}`;
         }
@@ -752,59 +757,59 @@ class ExtHostTreeView extends Disposable {
         const prefix = parent ? parent.item.handle : ExtHostTreeView.LABEL_HANDLE_PREFIX;
         let elementId = treeItemLabel ? treeItemLabel.label : resourceUri ? basename(resourceUri) : '';
         elementId = elementId.indexOf('/') !== -1 ? elementId.replace('/', '//') : elementId;
-        const existingHandle = ( this.nodes.has(element)) ? this.nodes.get(element).item.handle : undefined;
-        const childrenNodes = (this.getChildrenNodes(parent) || []);
+        const existingHandle = ( this._nodes.has(element)) ? this._nodes.get(element).item.handle : undefined;
+        const childrenNodes = (this._getChildrenNodes(parent) || []);
         let handle;
         let counter = 0;
         do {
             handle = `${prefix}/${counter}:${elementId}`;
-            if (returnFirst || !( this.elements.has(handle)) || existingHandle === handle) {
+            if (returnFirst || !( this._elements.has(handle)) || existingHandle === handle) {
                 break;
             }
             counter++;
         } while (counter <= childrenNodes.length);
         return handle;
     }
-    getLightIconPath(extensionTreeItem) {
+    _getLightIconPath(extensionTreeItem) {
         if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon)) {
             if (typeof extensionTreeItem.iconPath === 'string'
                 || URI.isUri(extensionTreeItem.iconPath)) {
-                return this.getIconPath(extensionTreeItem.iconPath);
+                return this._getIconPath(extensionTreeItem.iconPath);
             }
-            return this.getIconPath(extensionTreeItem.iconPath.light);
+            return this._getIconPath(extensionTreeItem.iconPath.light);
         }
         return undefined;
     }
-    getDarkIconPath(extensionTreeItem) {
+    _getDarkIconPath(extensionTreeItem) {
         if (extensionTreeItem.iconPath && !(extensionTreeItem.iconPath instanceof ThemeIcon) && extensionTreeItem.iconPath.dark) {
-            return this.getIconPath(extensionTreeItem.iconPath.dark);
+            return this._getIconPath(extensionTreeItem.iconPath.dark);
         }
         return undefined;
     }
-    getIconPath(iconPath) {
+    _getIconPath(iconPath) {
         if (URI.isUri(iconPath)) {
             return iconPath;
         }
         return URI.file(iconPath);
     }
-    addNodeToCache(element, node) {
-        this.elements.set(node.item.handle, element);
-        this.nodes.set(element, node);
+    _addNodeToCache(element, node) {
+        this._elements.set(node.item.handle, element);
+        this._nodes.set(element, node);
     }
-    updateNodeCache(element, newNode, existing, parentNode) {
-        this.elements.delete(newNode.item.handle);
-        this.nodes.delete(element);
+    _updateNodeCache(element, newNode, existing, parentNode) {
+        this._elements.delete(newNode.item.handle);
+        this._nodes.delete(element);
         if (newNode.item.handle !== existing.item.handle) {
-            this.elements.delete(existing.item.handle);
+            this._elements.delete(existing.item.handle);
         }
-        this.addNodeToCache(element, newNode);
-        const childrenNodes = (this.getChildrenNodes(parentNode) || []);
+        this._addNodeToCache(element, newNode);
+        const childrenNodes = (this._getChildrenNodes(parentNode) || []);
         const childNode = childrenNodes.filter(c => c.item.handle === existing.item.handle)[0];
         if (childNode) {
             childrenNodes.splice(childrenNodes.indexOf(childNode), 1, newNode);
         }
     }
-    addNodeToParentCache(node, parentNode) {
+    _addNodeToParentCache(node, parentNode) {
         if (parentNode) {
             if (!parentNode.children) {
                 parentNode.children = [];
@@ -812,21 +817,24 @@ class ExtHostTreeView extends Disposable {
             parentNode.children.push(node);
         }
         else {
-            if (!this.roots) {
-                this.roots = [];
+            if (!this._roots) {
+                this._roots = [];
             }
-            this.roots.push(node);
+            this._roots.push(node);
         }
     }
-    clearChildren(parentElement) {
+    _addChildrenToClear(parentElement) {
         if (parentElement) {
-            const node = this.nodes.get(parentElement);
+            const node = this._nodes.get(parentElement);
             if (node) {
                 if (node.children) {
                     for (const child of node.children) {
-                        const childElement = this.elements.get(child.item.handle);
+                        this._nodesToClear.add(child);
+                        const childElement = this._elements.get(child.item.handle);
                         if (childElement) {
-                            this.clear(childElement);
+                            this._addChildrenToClear(childElement);
+                            this._nodes.delete(childElement);
+                            this._elements.delete(child.item.handle);
                         }
                     }
                 }
@@ -834,36 +842,33 @@ class ExtHostTreeView extends Disposable {
             }
         }
         else {
-            this.clearAll();
+            this._addAllToClear();
         }
     }
-    clear(element) {
-        const node = this.nodes.get(element);
-        if (node) {
-            if (node.children) {
-                for (const child of node.children) {
-                    const childElement = this.elements.get(child.item.handle);
-                    if (childElement) {
-                        this.clear(childElement);
-                    }
-                }
-            }
-            this.nodes.delete(element);
-            this.elements.delete(node.item.handle);
-            node.dispose();
-        }
+    _addAllToClear() {
+        this._roots = undefined;
+        this._nodes.forEach(node => {
+            this._nodesToClear.add(node);
+        });
+        this._nodes.clear();
+        this._elements.clear();
+    }
+    _clearNodes(nodes) {
+        dispose(nodes);
     }
-    clearAll() {
-        this.roots = undefined;
-        this.elements.clear();
-        this.nodes.forEach(node => node.dispose());
-        this.nodes.clear();
+    _clearAll() {
+        this._roots = undefined;
+        this._elements.clear();
+        dispose(( this._nodes.values()));
+        this._nodes.clear();
+        dispose(this._nodesToClear);
+        this._nodesToClear.clear();
     }
     dispose() {
         super.dispose();
         this._refreshCancellationSource.dispose();
-        this.clearAll();
-        this.proxy.$disposeTree(this.viewId);
+        this._clearAll();
+        this._proxy.$disposeTree(this._viewId);
     }
 }