Add support for less indented comments in block scalars

ingydotnet · Apr 27, 2018 · f9edc91 · f9edc91
1 parent 8d207bc
commit f9edc91
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git a/lib/YAML/Loader.pm b/lib/YAML/Loader.pm
@@ -702,12 +702,22 @@ sub _parse_next_line {
     }
 
     if ($type == LEAF) {
-        while (@{$self->lines} and
+        if (@{$self->lines} and
                $self->lines->[0] =~ m{^( *)(\#)} and
                length($1) < $offset
               ) {
-            shift @{$self->lines};
-            $self->{line}++;
+            if ( length($1) < $offset) {
+                shift @{$self->lines};
+                $self->{line}++;
+                # every comment after that is also thrown away regardless
+                # of identation
+                while (@{$self->lines} and
+                       $self->lines->[0] =~ m{^( *)(\#)}
+                      ) {
+                    shift @{$self->lines};
+                    $self->{line}++;
+                }
+            }
         }
         $self->eos($self->{done} = not @{$self->lines});
     }

diff --git a/test/load-tests.t b/test/load-tests.t
@@ -212,14 +212,14 @@ foo                  :        bar
 - >
  # Not a comment;
 # Is a comment
- #Not a comment
+ #Another comment
 --- 42
           #Final
          #Comment
 +++ perl
 ([2,3,4,5],
  {foo => 'bar', boo => 'far'},
- ["# Not a comment; #Not a comment\n"],
+ ["# Not a comment;\n"],
  42)
 === several docs, some empty
 +++ yaml