Revert "Debug variable nodes kept expanded while stepping (#10338)"

This reverts commit db48de3.

packages/core/src/browser/source-tree/source-tree.ts

@@ -21,9 +21,6 @@ import { MaybePromise } from '../../common/types';
 import { TreeImpl, CompositeTreeNode, TreeNode, SelectableTreeNode, ExpandableTreeNode } from '../tree';
 import { TreeElement, CompositeTreeElement, TreeSource } from './tree-source';
 
-export const SOURCE_NODE_ID_PREFIX = '__source__';
-export const SOURCE_NODE_ID_SEPARATOR = ':';
-
 @injectable()
 export class SourceTree extends TreeImpl {
 
@@ -47,7 +44,7 @@ export class SourceTree extends TreeImpl {
     }
 
     protected toNode(element: TreeElement, index: number, parent: TreeElementNodeParent): TreeElementNode {
-        const id = element.id ? String(element.id) : (parent.id + SOURCE_NODE_ID_SEPARATOR + index);
+        const id = element.id ? String(element.id) : (parent.id + ':' + index);
         const name = id;
         const existing = this.getNode(id);
         const updated = existing && <TreeElementNode>Object.assign(existing, { element, parent });
@@ -135,7 +132,7 @@ export namespace TreeSourceNode {
         if (!source) {
             return source;
         }
-        const id = source.id || SOURCE_NODE_ID_PREFIX;
+        const id = source.id || '__source__';
         return {
             id,
             name: id,

packages/debug/src/browser/view/debug-variables-source.ts

@@ -18,6 +18,7 @@ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'
 import { TreeSource } from '@theia/core/lib/browser/source-tree';
 import { DebugScope } from '../console/debug-console-items';
 import { DebugViewModel } from './debug-view-model';
+import debounce = require('p-debounce');
 
 @injectable()
 export class DebugVariablesSource extends TreeSource {
@@ -31,7 +32,7 @@ export class DebugVariablesSource extends TreeSource {
         this.toDispose.push(this.model.onDidChange(() => this.refresh()));
     }
 
-    protected readonly refresh = () => this.fireDidChange();
+    protected readonly refresh = debounce(() => this.fireDidChange(), 400);
 
     async getElements(): Promise<IterableIterator<DebugScope>> {
         const { currentSession } = this.model;

packages/debug/src/browser/view/debug-variables-widget.ts

@@ -20,9 +20,6 @@ import { SourceTreeWidget } from '@theia/core/lib/browser/source-tree';
 import { DebugVariablesSource } from './debug-variables-source';
 import { DebugViewModel } from './debug-view-model';
 import { nls } from '@theia/core/lib/common/nls';
-import { DebugVariablesSourceTree } from '../debug-variables-source-tree';
-import { Tree, TreeModel } from '@theia/core/lib/browser';
-import { DebugVariablesTreeModel } from '../debug-variables-tree-model';
 
 @injectable()
 export class DebugVariablesWidget extends SourceTreeWidget {
@@ -40,11 +37,6 @@ export class DebugVariablesWidget extends SourceTreeWidget {
         child.bind(DebugVariablesSource).toSelf();
         child.unbind(SourceTreeWidget);
         child.bind(DebugVariablesWidget).toSelf();
-        child.bind(DebugVariablesSourceTree).toSelf();
-        child.rebind(Tree).toService(DebugVariablesSourceTree);
-        child.bind(DebugVariablesTreeModel).toSelf();
-        child.rebind(TreeModel).toService(DebugVariablesTreeModel);
-
         return child;
     }
     static createWidget(parent: interfaces.Container): DebugVariablesWidget {