Fix extract_struct_from_enum_variant not updating record references #6514
Conversation
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
matklad
reviewed
Nov 12, 2020
Comment on lines
+207
to
+223
| let (segment, expr) = if let Some(path_expr) = | ||
| find_node_at_offset::<ast::PathExpr>(source_file.syntax(), offset) | ||
| { | ||
| // tuple variant | ||
| (path_expr.path()?.segment()?, path_expr.syntax().parent()?.clone()) | ||
| } else if let Some(record_expr) = | ||
| find_node_at_offset::<ast::RecordExpr>(source_file.syntax(), offset) | ||
| { | ||
| // record variant | ||
| (record_expr.path()?.segment()?, record_expr.syntax().clone()) | ||
| } else { | ||
| return None; | ||
| }; |
Contributor
There was a problem hiding this comment.
I wonder if this'll work correctly for ast::RecordExpr nested into an ast::CallExpr for a different tuple struct?
Member
Author
There was a problem hiding this comment.
You mean something like this?
enum A { <|>One { a: u32, b: u32 } }
struct B(A);
fn foo() {
let _ = B(A::One { a: 1, b: 2 });
}This seems to work properly as I get
struct One{ pub a: u32, pub b: u32 }
enum A { One(One) }
struct B(A);
fn foo() {
let _ = B(A::One(One { a: 1, b: 2 }));
}which seems correct to me. Though I would've expected this to fail as well now that you say it.
Will definitely add this as a test if anything.
Edit: Ah the ast::PathExpr in the ast::CallExpr is a neighbor of the arg_list node containing the record which is why this still works, since find_node_at_offset considers ancestors only so this shouldn't be a problem.
matklad
reviewed
Nov 12, 2020
crates/assists/src/handlers/extract_struct_from_enum_variant.rs
Outdated
Show resolved
Hide resolved
matklad
reviewed
Nov 12, 2020
crates/assists/src/handlers/extract_struct_from_enum_variant.rs
Outdated
Show resolved
Hide resolved
Veykril
force-pushed
the
extract-record
branch
2 times, most recently
from
245b3dc to
3d84c74
Compare
matklad
reviewed
Nov 12, 2020
crates/assists/src/handlers/extract_struct_from_enum_variant.rs
Outdated
Show resolved
Hide resolved
Veykril
force-pushed
the
extract-record
branch
from
3d84c74 to
ccdcd52
Compare
Member
Author
|
Mixed it up with how visibility works since children can always see their parents. bors r+ |
Contributor
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Related to #6510