When merging yaml files comments on the last element of existing block are placed at the wrong line #4671
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
jevanlingen
changed the title
jevanlingen
force-pushed
the
2218-mergeyamlvisitor-inline-comments-not-taken-into-account
branch
from
65f8e16 to
bd350d8
Compare
jevanlingen
commented
Nov 19, 2024
rewrite-yaml/src/main/java/org/openrewrite/yaml/MergeYamlVisitor.java
Outdated
Show resolved
Hide resolved
jevanlingen
commented
Nov 19, 2024
| new MergeYamlVisitor<>(document.getBlock(), yaml, Boolean.TRUE.equals(acceptTheirs), objectIdentifyingProperty) | ||
| .visitNonNull(document.getBlock(), ctx, getCursor()) | ||
| ); | ||
| return getCursor().getMessage(REMOVE_PREFIX, false) ? d.withEnd(d.getEnd().withPrefix("")) : d; |
There was a problem hiding this comment.
I actually don't like very much that I needed to put this here; I would rather keep the cursor messages locked in the MergeYamlVisitor class. I couldn't make it work though, because the visitDocument will not be called in that class.
If I overlooked something please let me know! It would be really nice to let this MergeYaml visitor file untouched.
jevanlingen
commented
Nov 19, 2024
rewrite-yaml/src/main/java/org/openrewrite/yaml/MergeYamlVisitor.java
Outdated
Show resolved
Hide resolved
jevanlingen
force-pushed
the
2218-mergeyamlvisitor-inline-comments-not-taken-into-account
branch
from
0f7e1b0 to
35948c7
Compare
…or.java Co-authored-by: Jacob van Lingen <[email protected]>
…count' of github.com:openrewrite/rewrite into 2218-mergeyamlvisitor-inline-comments-not-taken-into-account # Conflicts: # rewrite-yaml/src/main/java/org/openrewrite/yaml/MergeYamlVisitor.java
…nt being refactored.
sambsnyd
deleted the
2218-mergeyamlvisitor-inline-comments-not-taken-into-account
branch
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?
After merge of two yam files, the comments will be placed at the right position.
What's your motivation?
Checklist