Fix trailing comments causing value to be cut

Affects issues:
- Fixed #2297

Author: AuroraLS3

Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigReader.java

@@ -33,18 +33,16 @@
  */
 public class ConfigReader implements Closeable {
 
-    private boolean closed;
-
     private final Scanner scanner;
+    private final List<String> unboundComment = new ArrayList<>();
+    private boolean closed;
     private ConfigNode previousNode;
     private ConfigNode parent;
-
     // Indent mode assumes the number of spaces used to indent the file.
     // If the first found indent is smaller, that will be used instead.
     private int indentMode = 4;
-    private final List<String> unboundComment = new ArrayList<>();
-
     private int lastDepth = -1;
+    private String lineDanglingComment;
 
     /**
      * Create a new ConfigReader for a Path.
@@ -131,11 +129,13 @@ private void handleLine(String line, String trimmed) {
 
     private String readNewLine() {
         String line = scanner.nextLine();
+        lineDanglingComment = null;
 
         // Removing any dangling comments
         int danglingComment = line.trim().indexOf(" #");
         if (danglingComment != -1) {
-            line = line.substring(0, danglingComment);
+            lineDanglingComment = line.trim().substring(danglingComment + 1);
+            line = line.substring(0, line.indexOf(" #"));
         }
         return line;
     }
@@ -165,8 +165,16 @@ private void handleCommentLine(String line) {
     }
 
     private void handleUnboundComments() {
+        if (lineDanglingComment != null) {
+            unboundComment.add(lineDanglingComment.substring(1).trim());
+        }
         if (!unboundComment.isEmpty()) {
-            previousNode.setComment(new ArrayList<>(unboundComment));
+            List<String> currentComment = previousNode.getComment();
+            if (currentComment == null || currentComment.isEmpty()) {
+                previousNode.setComment(new ArrayList<>(unboundComment));
+            } else {
+                currentComment.addAll(unboundComment);
+            }
             unboundComment.clear();
         }
     }

Plan/common/src/main/java/com/djrapitops/plan/settings/config/ConfigWriter.java

@@ -101,7 +101,7 @@ private void dfsTreeTraverseLineResolve(ConfigNode writing, Collection<String> l
                 // node is null:       Inconsistent config node state
                 // value is null:      Has no value (empty)
                 // nodeOrder is empty: Has no children
-                if (node == null || node.value == null && node.nodeOrder.isEmpty()) {
+                if (node == null || (node.value == null && node.nodeOrder.isEmpty())) {
                     continue;
                 }
 

Plan/common/src/test/java/com/djrapitops/plan/settings/config/ConfigWriterTest.java

@@ -28,6 +28,7 @@
 import java.nio.file.Path;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Scanner;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -169,4 +170,42 @@ void valueAfterAList() throws IOException {
         assertEquals(expected, writtenLines);
     }
 
+    @Test
+    void danglingCommentIsPreserved() throws IOException {
+        String read = """
+                Node:
+                  Example: example value 123 # comment
+                  OnlyKey: # comment on key
+                    ChildNode: value
+                  List: # comment on list
+                    - First # comment on list item
+                    - Second""";
+
+        Config readConfig;
+        try (ConfigReader reader = new ConfigReader(new Scanner(read))) {
+            readConfig = reader.read();
+        }
+
+        Path out = tempFolder.resolve("dangling.yml");
+        new ConfigWriter(out).write(readConfig);
+
+        List<String> writtenLines = FileResource.lines(out.toFile());
+
+        List<String> expected = Arrays.asList(
+                """
+                        Node:
+                            # comment
+                            Example: example value 123
+                            # comment on key
+                            OnlyKey: 
+                                ChildNode: value
+                            # comment on list
+                            # comment on list item
+                            List:
+                              - First
+                              - Second""".split("\n")
+        );
+        assertEquals(expected, writtenLines);
+    }
+
 }