From ebfaac9fb978a32a0896949f4115b97e31451903 Mon Sep 17 00:00:00 2001 From: adrianoy Date: Tue, 10 Aug 2021 01:21:53 -0300 Subject: [PATCH] Add multiline comments more sensibly... --- .../java/draylar/omegaconfig/OmegaConfig.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/omega-config-base/src/main/java/draylar/omegaconfig/OmegaConfig.java b/omega-config-base/src/main/java/draylar/omegaconfig/OmegaConfig.java index a43edc6..ddfe210 100644 --- a/omega-config-base/src/main/java/draylar/omegaconfig/OmegaConfig.java +++ b/omega-config-base/src/main/java/draylar/omegaconfig/OmegaConfig.java @@ -120,27 +120,17 @@ public class OmegaConfig { // Find areas we should insert comments into... for (int i = 0; i < lines.size(); i++) { String at = lines.get(i); + String startingWhitespace = getStartingWhitespace(at); - // Check if we should insert comment for (Map.Entry entry : keyToComments.entrySet()) { String comment = entry.getValue(); - + // Check if we should insert comment if (at.trim().startsWith(String.format("\"%s\"", entry.getKey()))) { if (comment.contains("\n")) { - String[] comments = comment.split("\n"); - StringBuilder builder = new StringBuilder(); - - for (int j = 0; j < comments.length; j++) { - builder.append(String.format("%s//%s", getStartingWhitespace(at), comments[j])); - if (j != comments.length - 1) { - builder.append("\n"); - } - } - comment = builder.toString(); + comment = startingWhitespace + "//" + String.join(String.format("\n%s//", startingWhitespace), comment.split("\n")); } else { - comment = String.format("%s//%s", getStartingWhitespace(at), comment); + comment = String.format("%s//%s", startingWhitespace, comment); } - insertions.put(i + insertions.size(), comment); break; }