Merge fedb13a into backport/liamcervante/blank-line-formatting/seriou…

…sly-engaging-koi
hashicorp · Jun 30, 2022 · 07d9152 · 07d9152
2 parents 81e1a6a + fedb13a
commit 07d9152
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/internal/command/format/diff.go b/internal/command/format/diff.go
@@ -807,6 +807,8 @@ func (p *blockBodyDiffPrinter) writeNestedBlockDiffs(name string, blockS *config
 			newItem := cty.NullVal(oldItem.Type())
 			skipped := p.writeNestedBlockDiff(name, nil, &blockS.Block, plans.Delete, oldItem, newItem, indent, blankBeforeInner, path)
 			if skipped {
+				skippedBlocks++
+			} else {
 				blankBeforeInner = false
 			}
 		}
@@ -816,6 +818,8 @@ func (p *blockBodyDiffPrinter) writeNestedBlockDiffs(name string, blockS *config
 			oldItem := cty.NullVal(newItem.Type())
 			skipped := p.writeNestedBlockDiff(name, nil, &blockS.Block, plans.Create, oldItem, newItem, indent, blankBeforeInner, path)
 			if skipped {
+				skippedBlocks++
+			} else {
 				blankBeforeInner = false
 			}
 		}