Fix opa fmt location for non-key rules #4695
Merged
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.
Running the following through
opa fmt
:Causes the
after
comment to be moved outside of the rule:This was caused by
skipPast
inclosingLoc
being called even when there is no[key]
part in the rule head. Adding a third clause fixed this; it seemslike
closingLoc
is designed to take0
in this case because of theskipOpen > 0
.This did affect one other test case, where I had to add an extra newline
to separate the comment from the rule head. Without that,
insertComments
(correctly, I guess) inserts:
Signed-off-by: Jasper Van der Jeugt m@jaspervdj.be