Backport of Standardise how blank lines are added to plan for unchanged blocks into v1.2 #31346
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
teamterraform
force-pushed
the
backport/liamcervante/blank-line-formatting/seriously-engaging-koi
branch
from
07d9152
to
555ca4b
Compare
liamcervante
approved these changes
Jun 30, 2022
liamcervante
deleted the
backport/liamcervante/blank-line-formatting/seriously-engaging-koi
branch
|
Reminder for the merging maintainer: if this is a user-visible change, please update the changelog on the appropriate release branch. |
|
I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #31330 to be assessed for backporting due to the inclusion of the label 1.2-backport.
The below text is copied from the body of the original PR.
Closes #28217
Fix the issue where multiple blank lines were inserted into the plan for every unchanged block type.
There are two cases for unchanged blocks, either the previous block is of the same type or it's of a different type. Previously, if they were the same type there would be no blank line and if they were different there would be a blank line. However, this was confusing because the unchanged blocks are grouped regardless of type so whether a blank line appears or not doesn't always actually mean anything.
So now, this is standardised and there is always a blank line before any
unchanged blockstatement. New unit tests have been added to verify this, and some existing tests have been modified to reflect the new standard.