bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Update crates/ide_assists/src/handlers/generate_constant.rs
Co-authored-by: Lukas Wirth <[email protected]>
Browse Source
龙方淞 2021-10-06
parent 4d1a4dc · commit fab238a
Diffstat
-rw-r--r--crates/ide_assists/src/handlers/generate_constant.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/crates/ide_assists/src/handlers/generate_constant.rs b/crates/ide_assists/src/handlers/generate_constant.rs
index 2e3e3be48d..a296f1cefc 100644
--- a/crates/ide_assists/src/handlers/generate_constant.rs
+++ b/crates/ide_assists/src/handlers/generate_constant.rs
@@ -31,10 +31,9 @@ use syntax::{
// ```
pub(crate) fn generate_constant(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
- let statement = ctx.find_node_at_offset::<ast::Stmt>()?;
- let arg_list = ctx.find_node_at_offset::<ast::ArgList>()?;
- let expr = ctx.find_node_at_offset::<ast::Expr>()?;
let constant_token = ctx.find_node_at_offset::<ast::NameRef>()?;
+ let expr = constant_token.syntax().ancestors().find_map(ast::Expr::cast)?;
+ let statement = expr.syntax().ancestors().find_map(ast::Stmt::cast)?;
let ty = ctx.sema.type_of_expr(&expr)?;
let scope = ctx.sema.scope(statement.syntax());
let module = scope.module()?;