Skip to content

Commit

Permalink
Manual merge
Browse files Browse the repository at this point in the history
  • Loading branch information
greg-at-moderne committed Jan 30, 2025
1 parent 7e808f5 commit 224417a
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -624,8 +624,8 @@ public SequenceWithPrefix(String prefix, @Nullable String startBracketPrefix, Li
this.prefix = prefix;
}

public SequenceWithPrefix(UUID id, Markers markers, @Nullable String openingBracketPrefix, List<Entry> entries, @Nullable String closingBracketPrefix, @Nullable Anchor anchor, String prefix) {
super(id, markers, openingBracketPrefix, entries, closingBracketPrefix, anchor);
public SequenceWithPrefix(UUID id, Markers markers, @Nullable String openingBracketPrefix, List<Entry> entries, @Nullable String closingBracketPrefix, @Nullable Anchor anchor, @Nullable Tag tag, String prefix) {
super(id, markers, openingBracketPrefix, entries, closingBracketPrefix, anchor, tag);
this.prefix = prefix;
}

Expand All @@ -638,11 +638,11 @@ public Sequence withPrefix(String prefix) {
@Override
public SequenceWithPrefix withClosingBracketPrefix(@Nullable String closingBracketPrefix) {
// Cannot use super as this returns Yaml.Sequence
return new SequenceWithPrefix(getId(), getMarkers(), getOpeningBracketPrefix(), getEntries(), closingBracketPrefix, getAnchor(), prefix);
return new SequenceWithPrefix(getId(), getMarkers(), getOpeningBracketPrefix(), getEntries(), closingBracketPrefix, getAnchor(), getTag(), prefix);
}

public Sequence toSequence() {
return new Yaml.Sequence(getId(), getMarkers(), getOpeningBracketPrefix(), getEntries(), getClosingBracketPrefix(), getAnchor());
return new Yaml.Sequence(getId(), getMarkers(), getOpeningBracketPrefix(), getEntries(), getClosingBracketPrefix(), getAnchor(), getTag());
}
}

Expand Down

0 comments on commit 224417a

Please sign in to comment.