fix: Improve add some on block like expression#21953
Merged
ChayimFriedman2 merged 1 commit intorust-lang:masterfrom Apr 7, 2026
Merged
fix: Improve add some on block like expression#21953ChayimFriedman2 merged 1 commit intorust-lang:masterfrom
ChayimFriedman2 merged 1 commit intorust-lang:masterfrom
Conversation
rustbot
added
the
S-waiting-on-review
ChayimFriedman2
requested changes
Apr 6, 2026
| .insert(expr.syntax().text_range().end(), format!("\n{indent}{variant_name}(())")); | ||
|
|
||
| let source_change = SourceChange::from_text_edit( | ||
| expr_ptr.file_id.original_file(ctx.sema.db).file_id(ctx.sema.db), |
Contributor
There was a problem hiding this comment.
You can't expect the expanded node to be in the original file.
A4-Tacks
force-pushed
the
add-some-instead-wrap-some
branch
from
1c24686 to
8ba16f5
Compare
Collaborator
|
This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed. Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers. |
ChayimFriedman2
requested changes
Apr 7, 2026
| let mut builder = TextEdit::builder(); | ||
| let indent = expr.indent_level(); | ||
| builder | ||
| .insert(expr.syntax().text_range().end(), format!("\n{indent}{variant_name}(())")); |
Contributor
There was a problem hiding this comment.
This should be the upmapped range.
Example
---
```rust
fn foo() -> Result<(), ()> {
for _ in 0..5 {}$0
}
```
**Before this PR**
```rust
fn foo() -> Result<(), ()> {
Ok(for _ in 0..5 {})
}
```
**After this PR**
```rust
fn foo() -> Result<(), ()> {
for _ in 0..5 {}
Ok(())
}
```
A4-Tacks
force-pushed
the
add-some-instead-wrap-some
branch
from
8ba16f5 to
e7444c0
Compare
ChayimFriedman2
approved these changes
Apr 7, 2026
rustbot
removed
the
S-waiting-on-review
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
After #21952, make the PR also support macros
Example
Before this PR
After this PR