From 6275278ae9f12cd25501dcedb30ce174717b4fd2 Mon Sep 17 00:00:00 2001 From: isidor Date: Fri, 16 Mar 2018 13:50:48 +0100 Subject: [PATCH] debug: bring back toString it is used for copyAll action fixes #45967 --- src/vs/workbench/parts/debug/common/debugModel.ts | 11 +++++++++++ .../debug/electron-browser/electronDebugActions.ts | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/parts/debug/common/debugModel.ts b/src/vs/workbench/parts/debug/common/debugModel.ts index 0fb3dc1c164..89e82f0afee 100644 --- a/src/vs/workbench/parts/debug/common/debugModel.ts +++ b/src/vs/workbench/parts/debug/common/debugModel.ts @@ -38,6 +38,9 @@ export abstract class AbstractReplElement implements IReplElement { public getId(): string { return `replelement:${this.id}`; } + + // Used by the copy all action in repl + abstract toString(): string; } export class SimpleReplElement extends AbstractReplElement { @@ -49,6 +52,10 @@ export class SimpleReplElement extends AbstractReplElement { ) { super(source); } + + public toString(): string { + return this.value; + } } export class RawObjectReplElement extends AbstractReplElement implements IExpression { @@ -89,6 +96,10 @@ export class RawObjectReplElement extends AbstractReplElement implements IExpres return TPromise.as(result); } + + public toString(): string { + return `${this.name}\n${this.value}`; + } } export class ExpressionContainer implements IExpressionContainer { diff --git a/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts b/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts index b7ef876194d..4709acbb680 100644 --- a/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts +++ b/src/vs/workbench/parts/debug/electron-browser/electronDebugActions.ts @@ -9,7 +9,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { removeAnsiEscapeCodes } from 'vs/base/common/strings'; import { Variable } from 'vs/workbench/parts/debug/common/debugModel'; -import { IDebugService, IStackFrame } from 'vs/workbench/parts/debug/common/debug'; +import { IDebugService, IStackFrame, IReplElement } from 'vs/workbench/parts/debug/common/debug'; import { clipboard } from 'electron'; export class CopyValueAction extends Action { @@ -77,7 +77,7 @@ export class CopyAllAction extends Action { if (text) { text += `\n`; } - text += navigator.current().toString(); + text += (navigator.current()).toString(); } clipboard.writeText(removeAnsiEscapeCodes(text)); -- GitLab