Minor fix: added multiline scalar condition back into YamlParser with…

… test. (#3633) fixes #3632
openrewrite · Oct 18, 2023 · 0b56a1d · 0b56a1d
1 parent fcfe473
commit 0b56a1d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java b/rewrite-yaml/src/main/java/org/openrewrite/yaml/YamlParser.java
@@ -241,6 +241,9 @@ private Yaml.Documents parseFromInput(Path sourceFile, EncodingDetectingInputStr
                             case PLAIN:
                             default:
                                 style = Yaml.Scalar.Style.PLAIN;
+                                if (!scalarValue.startsWith("@") && event.getStartMark().getIndex() >= reader.getBufferIndex()) {
+                                    scalarValue = reader.readStringFromBuffer(event.getStartMark().getIndex(), event.getEndMark().getIndex() - 1);
+                                }
                                 break;
                         }
                         BlockBuilder builder = blockStack.isEmpty() ? null : blockStack.peek();

diff --git a/rewrite-yaml/src/test/java/org/openrewrite/yaml/tree/MappingTest.java b/rewrite-yaml/src/test/java/org/openrewrite/yaml/tree/MappingTest.java
@@ -229,6 +229,20 @@ void suffixBeforeColon() {
         );
     }
 
+    @Issue("https://github.com/openrewrite/rewrite/issues/3632")
+    @Test
+    void multilineScalar() {
+        rewriteRun(
+          yaml(
+            """
+              data: &anc |
+                  @this is a long string@
+              bar: *anc
+              """
+          )
+        );
+    }
+
     @Test
     void literals() {
         rewriteRun(