From e3f29ad4e03c6ff504eb474607f8d92d1f7ee89b Mon Sep 17 00:00:00 2001 From: brendandouglas Date: Wed, 13 Jun 2018 14:27:08 -0700 Subject: Skylark debugger: don't quote or escape strings when serializing. A minor serialization improvement. I'm planning to refactor this code significantly, but wanted to get this in before I forgot. PiperOrigin-RevId: 200453925 --- .../build/lib/skylarkdebug/server/DebuggerSerialization.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google') diff --git a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerialization.java b/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerialization.java index 70d716332a..e45a1fa294 100644 --- a/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerialization.java +++ b/src/main/java/com/google/devtools/build/lib/skylarkdebug/server/DebuggerSerialization.java @@ -36,11 +36,18 @@ final class DebuggerSerialization { .setLabel(label) // TODO(bazel-team): omit type details for non-Skylark values .setType(EvalUtils.getDataTypeName(value)) - .setDescription(Printer.repr(value)) + .setDescription(getDescription(value)) .addAllChild(getChildren(value)) .build(); } + private static String getDescription(Object value) { + if (value instanceof String) { + return (String) value; + } + return Printer.repr(value); + } + private static Value errorValue(String errorMessage) { return Value.newBuilder().setLabel("Error").setDescription(errorMessage).build(); } -- cgit v1.2.3