From 2c68e26d8dc99289092e42cbcef4c177544bf2da Mon Sep 17 00:00:00 2001 From: Ashcon Partovi Date: Fri, 25 Aug 2023 11:53:21 -0700 Subject: Fix double quotes in console.log messages --- packages/bun-debug-adapter-protocol/src/debugger/adapter.ts | 5 +---- packages/bun-inspector-protocol/src/util/preview.ts | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/bun-debug-adapter-protocol/src/debugger/adapter.ts b/packages/bun-debug-adapter-protocol/src/debugger/adapter.ts index a9a5fb855..0fef33ed3 100644 --- a/packages/bun-debug-adapter-protocol/src/debugger/adapter.ts +++ b/packages/bun-debug-adapter-protocol/src/debugger/adapter.ts @@ -965,8 +965,7 @@ export class DebugAdapter implements IDebugAdapter, InspectorListener { const variables = parameters.map((parameter, i) => { const variable = this.#addVariable(parameter, { name: `${i}` }); - const { value } = variable; - output += value + " "; + output += remoteObjectToString(parameter, true) + " "; return variable; }); @@ -1704,8 +1703,6 @@ function consoleLevelToAnsiColor(level: JSC.Console.ConsoleMessage["level"]): st return "\u001b[33m"; case "error": return "\u001b[31m"; - case "debug": - return "\u001b[36m"; } return undefined; } diff --git a/packages/bun-inspector-protocol/src/util/preview.ts b/packages/bun-inspector-protocol/src/util/preview.ts index ad751a2b8..c6d748304 100644 --- a/packages/bun-inspector-protocol/src/util/preview.ts +++ b/packages/bun-inspector-protocol/src/util/preview.ts @@ -1,6 +1,6 @@ import type { JSC } from "../protocol"; -export function remoteObjectToString(remoteObject: JSC.Runtime.RemoteObject): string { +export function remoteObjectToString(remoteObject: JSC.Runtime.RemoteObject, topLevel?: boolean): string { const { type, subtype, value, description, className, preview } = remoteObject; switch (type) { case "undefined": @@ -9,6 +9,9 @@ export function remoteObjectToString(remoteObject: JSC.Runtime.RemoteObject): st case "number": return description ?? JSON.stringify(value); case "string": + if (topLevel) { + return String(value ?? description); + } return JSON.stringify(value ?? description); case "symbol": case "bigint": -- cgit v1.2.3