From f2f0bb9bc12d0fd236e32101b31f5b67c10aa97b Mon Sep 17 00:00:00 2001 From: Anthon van der Neut Date: Tue, 16 Oct 2018 17:13:23 +0200 Subject: add .compact() to set non-compacting for sequence/mapping within sequence --- emitter.py | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'emitter.py') diff --git a/emitter.py b/emitter.py index d1e9dee..05311f0 100644 --- a/emitter.py +++ b/emitter.py @@ -16,7 +16,7 @@ from ruamel.yaml.events import * # NOQA # fmt: off from ruamel.yaml.compat import utf8, text_type, PY2, nprint, dbg, DBG_EVENT, \ - check_anchorname_char, nprintf # NOQA + check_anchorname_char # fmt: on if False: # MYPY @@ -156,6 +156,9 @@ class Emitter(object): self.column = 0 self.whitespace = True self.indention = True + self.compact_seq_seq = True # dash after dash + self.compact_seq_map = True # key after dash + # self.compact_ms = False # dash after key, only when excplicit key with ? self.no_newline = None # type: Optional[bool] # set if directly after `- ` # Whether the document requires an explicit document indicator @@ -404,8 +407,8 @@ class Emitter(object): if isinstance(self.event, ScalarEvent): self.expect_scalar() elif isinstance(self.event, SequenceStartEvent): - nprintf('@', self.indention, self.no_newline, self.column) - i2, n2 = self.indention, self.no_newline + # nprintf('@', self.indention, self.no_newline, self.column) + i2, n2 = self.indention, self.no_newline # NOQA if self.event.comment: if self.event.flow_style is False and self.event.comment: if self.write_post_comment(self.event): @@ -596,7 +599,12 @@ class Emitter(object): def expect_block_sequence(self): # type: () -> None - indentless = self.mapping_context and not self.indention + if self.mapping_context: + indentless = not self.indention + else: + indentless = False + if not self.compact_seq_seq and self.column != 0: + self.write_line_break() self.increase_indent(flow=False, sequence=True, indentless=indentless) self.state = self.expect_first_block_sequence_item @@ -629,6 +637,8 @@ class Emitter(object): def expect_block_mapping(self): # type: () -> None + if not self.mapping_context and not (self.compact_seq_map or self.column == 0): + self.write_line_break() self.increase_indent(flow=False, sequence=False) self.state = self.expect_first_block_mapping_key @@ -1580,7 +1590,7 @@ class Emitter(object): def write_comment(self, comment, pre=False): # type: (Any) -> None value = comment.value - nprintf('{:02d} {:02d} {!r}'.format(self.column, comment.start_mark.column, value)) + # nprintf('{:02d} {:02d} {!r}'.format(self.column, comment.start_mark.column, value)) if not pre and value[-1] == '\n': value = value[:-1] try: -- cgit v1.2.1