Merge yaml test for inline comments retention #4365
Merged
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
Thanks for the helpful test here @johnpaulms ! What I can see from stepping through with the debugger is that the comment is attached to the |
pstreef
approved these changes
Jul 31, 2024
|
merging this into my branch so I can take it along there |
jevanlingen
pushed a commit
that referenced
this pull request
Nov 22, 2024
* Added test cases to check inline comment retention. * Updated issue number to check inline comment retention. --------- Co-authored-by: j0m17kw <[email protected]> Co-authored-by: Peter Streef <[email protected]>
jevanlingen
pushed a commit
that referenced
this pull request
Nov 25, 2024
* Added test cases to check inline comment retention. * Updated issue number to check inline comment retention. --------- Co-authored-by: j0m17kw <[email protected]> Co-authored-by: Peter Streef <[email protected]>
timtebeek
added a commit
that referenced
this pull request
Nov 25, 2024
* fix: `MergeYaml` block indentation not as expected * Indication where things need to change * calculate indentation * add todo * Make it work with variable indent * Fix for sequences * cleanup * cleanup * comments * extract method * revert * revert * Merge yaml test for inline comments retention (#4365) * Added test cases to check inline comment retention. * Updated issue number to check inline comment retention. --------- Co-authored-by: j0m17kw <[email protected]> Co-authored-by: Peter Streef <[email protected]> * revert * Revert all to main (to start again) * Make multiline scalars work * Cleanup * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Add extra test `addPropertyWitCommentAboveLastLine` * Improve IndentsVisitor, so merged multiline scalars work too * Small improvements * Apply formatter * Consistently use the same style of import for nested classes * Reuse local variable `value` instead of repeated `incomingEntry.getValue()` * Small improvements --------- Co-authored-by: johnpaulms <[email protected]> Co-authored-by: j0m17kw <[email protected]> Co-authored-by: lingenj <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tim te Beek <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What's changed?
Added test case to test inline comment retention for mergeyaml recipe
What's your motivation?
We have same issue as described here
Anything in particular you'd like reviewers to focus on?
Nothing as of now.
Anyone you would like to review specifically?
@timtebeek @pstreef to review this test case
Have you considered any alternatives or workarounds?
There is no work around for this issue. Developers want to retain the comments in their yaml file.
Any additional context
Checklist