Fix reading multiline strings with CRLF, set LF in tests to pass in W…

…indows
Elytrium · Aug 30, 2023 · e9d45f9 · e9d45f9
1 parent 2599b10
commit e9d45f9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/net/elytrium/serializer/language/writer/AbstractWriter.java b/src/main/java/net/elytrium/serializer/language/writer/AbstractWriter.java
@@ -39,6 +39,8 @@
 
 public abstract class AbstractWriter {
 
+  protected static final char NEW_LINE = '\n';
+
   protected final SerializerConfig config;
   protected final BufferedWriter writer;
 

diff --git a/src/main/java/net/elytrium/serializer/language/writer/YamlWriter.java b/src/main/java/net/elytrium/serializer/language/writer/YamlWriter.java
@@ -286,8 +286,8 @@ private void writeCharacters(char[] characters, boolean escapeNewLine, boolean d
     char highSurrogate = 0;
     for (char character : characters) {
       if (!escapeNewLine) {
-        if (character == lineSeparatorChars[lineSeparatorCharsCaught]) {
-          if (++lineSeparatorCharsCaught == lineSeparatorChars.length) {
+        if (character == AbstractWriter.NEW_LINE || character == lineSeparatorChars[lineSeparatorCharsCaught]) {
+          if (character == AbstractWriter.NEW_LINE || ++lineSeparatorCharsCaught == lineSeparatorChars.length) {
             lineSeparatorCharsCaught = 0;
             this.writeLineAndIndent();
 

diff --git a/src/test/java/net/elytrium/serializer/SerializerTest.java b/src/test/java/net/elytrium/serializer/SerializerTest.java
@@ -270,7 +270,7 @@ public String serialize(String from) {
       public String deserialize(String from) {
         return from.trim().isEmpty() ? null : from;
       }
-    }).registerSerializer(new PathSerializer()).setCommentValueIndent(1).build();
+    }).registerSerializer(new PathSerializer()).setCommentValueIndent(1).setLineSeparator("\n").build();
 
     Settings() {
       super(Settings.CONFIG);