debug: no need for model.clearWatchExpressions

src/vs/workbench/parts/debug/common/debugModel.ts

@@ -919,15 +919,6 @@ export class Model implements debug.IModel {
 		});
 	}
 
-	public clearWatchExpressionValues(): void {
-		this.watchExpressions.forEach(we => {
-			we.value = Expression.DEFAULT_VALUE;
-			we.available = false;
-		});
-
-		this._onDidChangeWatchExpressions.fire();
-	}
-
 	public removeWatchExpressions(id: string = null): void {
 		this.watchExpressions = id ? this.watchExpressions.filter(we => we.getId() !== id) : [];
 		this._onDidChangeWatchExpressions.fire();

src/vs/workbench/parts/debug/electron-browser/debugService.ts

@@ -450,12 +450,8 @@ export class DebugService implements debug.IDebugService {
 
 		this.viewModel.setFocusedStackFrame(focusedStackFrame, process);
 		this._onDidChangeState.fire();
-		if (focusedStackFrame) {
-			return this.model.evaluateWatchExpressions(process, focusedStackFrame);
-		} else {
-			this.model.clearWatchExpressionValues();
-			return TPromise.as(null);
-		}
+
+		return this.model.evaluateWatchExpressions(process, focusedStackFrame);
 	}
 
 	public enableOrDisableBreakpoints(enable: boolean, breakpoint?: debug.IEnablement): TPromise<void> {

src/vs/workbench/parts/debug/test/node/debugModel.test.ts

@@ -303,7 +303,7 @@ suite('Debug - Model', () => {
 		model.renameWatchExpression(process, stackFrame, watchExpressions[1].getId(), 'new_name').done();
 		assertWatchExpressions(model.getWatchExpressions(), 'new_name');
 
-		model.clearWatchExpressionValues();
+		model.evaluateWatchExpressions(process, null);
 		assertWatchExpressions(model.getWatchExpressions(), 'new_name');
 
 		model.removeWatchExpressions();