From 6d95eadf783dd7b3c72f6d51a60986236175f72d Mon Sep 17 00:00:00 2001 From: CmdrKittens <52665651+CmdrKittens@users.noreply.github.com> Date: Thu, 9 Apr 2020 01:04:53 -0400 Subject: [PATCH] Improve rendering of config --- .../lib/com/typesafe/config/impl/ConfigString.java | 7 +------ .../lib/com/typesafe/config/impl/SimpleConfigList.java | 8 -------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/ConfigString.java b/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/ConfigString.java index 4a7242a..36e22e2 100644 --- a/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/ConfigString.java +++ b/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/ConfigString.java @@ -80,11 +80,6 @@ abstract class ConfigString extends AbstractConfigValue implements Serializable @Override protected void render(StringBuilder sb, int indent, boolean atRoot, ConfigRenderOptions options) { - String rendered; - if (options.getJson()) - rendered = ConfigImplUtil.renderJsonString(value); - else - rendered = ConfigImplUtil.renderStringUnquotedIfPossible(value); - sb.append(rendered); + sb.append(ConfigImplUtil.renderJsonString(value)); } } diff --git a/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigList.java b/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigList.java index f467081..5007d9c 100644 --- a/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigList.java +++ b/src/main/java/com/drtshock/playervaults/lib/com/typesafe/config/impl/SimpleConfigList.java @@ -209,9 +209,7 @@ final class SimpleConfigList extends AbstractConfigValue implements ConfigList, sb.append("["); if (options.getFormatted()) sb.append('\n'); - int count = 0; for (AbstractConfigValue v : value) { - count++; if (options.getOriginComments()) { String[] lines = v.origin().description().split("\n"); for (String l : lines) { @@ -224,12 +222,6 @@ final class SimpleConfigList extends AbstractConfigValue implements ConfigList, } } if (options.getComments()) { - if (count > 1) { - sb.append('\n'); - if (!v.origin().comments().isEmpty()) { - sb.append('\n'); - } - } for (String comment : v.origin().comments()) { indent(sb, indent + 1, options); sb.append("# ");