Revert "Merge from vscode 81d7885dc2e9dc617e1522697a2966bc4025a45d (#5949)" (#5983)

This reverts commit d15a3fcc98.
This commit is contained in:
Karl Burtram
2019-06-11 12:35:58 -07:00
committed by GitHub
parent 95a50b7892
commit 5a7562a37b
926 changed files with 11394 additions and 19540 deletions

View File

@@ -76,16 +76,16 @@ export class WatchExpressionsView extends ViewletPanel {
const removeAllWatchExpressionsAction = new RemoveAllWatchExpressionsAction(RemoveAllWatchExpressionsAction.ID, RemoveAllWatchExpressionsAction.LABEL, this.debugService, this.keybindingService);
this.toolbar.setActions([addWatchExpressionAction, collapseAction, removeAllWatchExpressionsAction])();
this._register(this.tree.onContextMenu(e => this.onContextMenu(e)));
this._register(this.tree.onMouseDblClick(e => this.onMouseDblClick(e)));
this._register(this.debugService.getModel().onDidChangeWatchExpressions(we => {
this.disposables.push(this.tree.onContextMenu(e => this.onContextMenu(e)));
this.disposables.push(this.tree.onMouseDblClick(e => this.onMouseDblClick(e)));
this.disposables.push(this.debugService.getModel().onDidChangeWatchExpressions(we => {
if (!this.isBodyVisible()) {
this.needsRefresh = true;
} else {
this.tree.updateChildren();
}
}));
this._register(this.debugService.getViewModel().onDidFocusStackFrame(() => {
this.disposables.push(this.debugService.getViewModel().onDidFocusStackFrame(() => {
if (!this.isBodyVisible()) {
this.needsRefresh = true;
return;
@@ -95,14 +95,14 @@ export class WatchExpressionsView extends ViewletPanel {
this.onWatchExpressionsUpdatedScheduler.schedule();
}
}));
this._register(variableSetEmitter.event(() => this.tree.updateChildren()));
this.disposables.push(variableSetEmitter.event(() => this.tree.updateChildren()));
this._register(this.onDidChangeBodyVisibility(visible => {
this.disposables.push(this.onDidChangeBodyVisibility(visible => {
if (visible && this.needsRefresh) {
this.onWatchExpressionsUpdatedScheduler.schedule();
}
}));
this._register(this.debugService.getViewModel().onDidSelectExpression(e => {
this.disposables.push(this.debugService.getViewModel().onDidSelectExpression(e => {
if (e instanceof Expression && e.name) {
this.tree.rerender(e);
}