-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Fix eol handling on the last token in a file when formatting code actions #79602
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
CyrusNajmabadi
merged 14 commits into
dotnet:main
from
CyrusNajmabadi:lastTokenFormatting
Jul 25, 2025
Merged
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
8881e25
Fix eol handling on the last token in a file when formatting code act…
CyrusNajmabadi a40a540
Add work item
CyrusNajmabadi cd1fd17
Fix tests
CyrusNajmabadi 391f256
Fix tests
CyrusNajmabadi bcbaa5d
Fix tests
CyrusNajmabadi 43f1850
Fix tests
CyrusNajmabadi d4d8ad7
Fix tests
CyrusNajmabadi b5ad09f
Fix tests
CyrusNajmabadi 741806c
Fix tests
CyrusNajmabadi ee7d8ac
Fix tests
CyrusNajmabadi e3bd96f
Fix tests
CyrusNajmabadi 048c8a4
Fix tests
CyrusNajmabadi 1cc5767
Fix tests
CyrusNajmabadi 6c1bed7
Merge remote-tracking branch 'upstream/main' into lastTokenFormatting
CyrusNajmabadi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
the thing we're fixing is that we injected a final
}into the file with an elastic-cr-lf (this is good).However, the formatting engine wasn't ever fixing up that elastic-cr-lf because the code below effectively said "only format up to the exact end of the
}, no further". This was happening because we normally try to find the 'next' token after the last touched token and format through that. But in this case, there is no next token (it's the last token in the file). So the fix is in that case to consider up through the full end of the token (which includes the trailing trivia) so we will update that properly.