Merge pull request #63 from tdakkota/fix/indent-tag-in-block-mapping

fix: put indentation before tag of block mapping
go-faster · Apr 24, 2023 · 74c4493 · 74c4493
2 parents ac9ecfe + 3f3f2dd
commit 74c4493
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 22 deletions.
diff --git a/emitterc.go b/emitterc.go
@@ -730,11 +730,6 @@ func yaml_emitter_emit_flow_mapping_value(emitter *yaml_emitter_t, event *yaml_e
 
 // Expect a block item node.
 func yaml_emitter_emit_block_sequence_item(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_increase_indent(emitter, false, false) {
-			return false
-		}
-	}
 	if event.typ == yaml_SEQUENCE_END_EVENT {
 		emitter.indent = emitter.indents[len(emitter.indents)-1]
 		emitter.indents = emitter.indents[:len(emitter.indents)-1]
@@ -766,11 +761,6 @@ func yaml_emitter_emit_block_sequence_item(emitter *yaml_emitter_t, event *yaml_
 
 // Expect a block key node.
 func yaml_emitter_emit_block_mapping_key(emitter *yaml_emitter_t, event *yaml_event_t, first bool) bool {
-	if first {
-		if !yaml_emitter_increase_indent(emitter, false, false) {
-			return false
-		}
-	}
 	if !yaml_emitter_process_head_comment(emitter) {
 		return false
 	}
@@ -915,33 +905,67 @@ func yaml_emitter_emit_scalar(emitter *yaml_emitter_t, event *yaml_event_t) bool
 
 // Expect SEQUENCE-START.
 func yaml_emitter_emit_sequence_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
 	if emitter.flow_level > 0 || emitter.canonical || event.sequence_style() == yaml_FLOW_SEQUENCE_STYLE ||
 		yaml_emitter_check_empty_sequence(emitter) {
+		if !yaml_emitter_process_anchor(emitter) {
+			return false
+		}
+		if !yaml_emitter_process_tag(emitter) {
+			return false
+		}
 		emitter.state = yaml_EMIT_FLOW_SEQUENCE_FIRST_ITEM_STATE
 	} else {
+		if !yaml_emitter_increase_indent(emitter, false, false) {
+			return false
+		}
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+		if !yaml_emitter_process_anchor(emitter) {
+			return false
+		}
+		if !yaml_emitter_process_tag(emitter) {
+			return false
+		}
 		emitter.state = yaml_EMIT_BLOCK_SEQUENCE_FIRST_ITEM_STATE
 	}
 	return true
 }
 
 // Expect MAPPING-START.
 func yaml_emitter_emit_mapping_start(emitter *yaml_emitter_t, event *yaml_event_t) bool {
-	if !yaml_emitter_process_anchor(emitter) {
-		return false
-	}
-	if !yaml_emitter_process_tag(emitter) {
-		return false
-	}
 	if emitter.flow_level > 0 || emitter.canonical || event.mapping_style() == yaml_FLOW_MAPPING_STYLE ||
 		yaml_emitter_check_empty_mapping(emitter) {
+		if !yaml_emitter_process_anchor(emitter) {
+			return false
+		}
+		if !yaml_emitter_process_tag(emitter) {
+			return false
+		}
 		emitter.state = yaml_EMIT_FLOW_MAPPING_FIRST_KEY_STATE
 	} else {
+		// FIXME(tdakkota): should we do it for flow style?
+		//
+		// Write same indent as mapping have.
+		// In cases like this:
+		//
+		// 	a:
+		// 	 b: # comment
+		// 	  !tag
+		// 	  c:
+		//
+		if !yaml_emitter_increase_indent(emitter, false, false) {
+			return false
+		}
+		if !yaml_emitter_write_indent(emitter) {
+			return false
+		}
+		if !yaml_emitter_process_anchor(emitter) {
+			return false
+		}
+		if !yaml_emitter_process_tag(emitter) {
+			return false
+		}
 		emitter.state = yaml_EMIT_BLOCK_MAPPING_FIRST_KEY_STATE
 	}
 	return true

diff --git a/testdata/fuzz/FuzzDecodeEncodeDecode/3fd9827db9432432 b/testdata/fuzz/FuzzDecodeEncodeDecode/3fd9827db9432432
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("0:\n 0: #\n  !0\n -")
diff --git a/testdata/fuzz/FuzzDecodeEncodeDecode/64588d00b12b492f b/testdata/fuzz/FuzzDecodeEncodeDecode/64588d00b12b492f
@@ -0,0 +1,2 @@
+go test fuzz v1
+[]byte("0:\n 0: #\n  !0\n  0:")