Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-15 22:54:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: only trigger assist on Name

Browse source
This commit is contained in:
Ryan Mehri 2023-09-08 10:06:17 -07:00 committed by Ryan Mehri
parent 91ac1d6194
commit 455dacfd3b
1 changed files with 29 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
crates/ide-assists/src/handlers/bool_to_enum.rs
View file

@ -85,7 +85,9 @@ struct BoolNodeData {
/// Attempts to find an appropriate node to apply the action to.
fn find_bool_node(ctx: &AssistContext<'_>) -> Option<BoolNodeData> {
if let Some(let_stmt) = ctx.find_node_at_offset::<ast::LetStmt>() {
let name: ast::Name = ctx.find_node_at_offset()?;
if let Some(let_stmt) = name.syntax().ancestors().find_map(ast::LetStmt::cast) {
let bind_pat = match let_stmt.pat()? {
ast::Pat::IdentPat(pat) => pat,
_ => {
@ -101,12 +103,12 @@ fn find_bool_node(ctx: &AssistContext<'_>) -> Option<BoolNodeData> {
Some(BoolNodeData {
target_node: let_stmt.syntax().clone(),
name: bind_pat.name()?,
name,
ty_annotation: let_stmt.ty(),
initializer: let_stmt.initializer(),
definition: Definition::Local(def),
})
} else if let Some(const_) = ctx.find_node_at_offset::<ast::Const>() {
} else if let Some(const_) = name.syntax().ancestors().find_map(ast::Const::cast) {
let def = ctx.sema.to_def(&const_)?;
if !def.ty(ctx.db()).is_bool() {
cov_mark::hit!(not_applicable_non_bool_const);
@ -115,12 +117,12 @@ fn find_bool_node(ctx: &AssistContext<'_>) -> Option<BoolNodeData> {
Some(BoolNodeData {
target_node: const_.syntax().clone(),
name: const_.name()?,
name,
ty_annotation: const_.ty(),
initializer: const_.body(),
definition: Definition::Const(def),
})
} else if let Some(static_) = ctx.find_node_at_offset::<ast::Static>() {
} else if let Some(static_) = name.syntax().ancestors().find_map(ast::Static::cast) {
let def = ctx.sema.to_def(&static_)?;
if !def.ty(ctx.db()).is_bool() {
cov_mark::hit!(not_applicable_non_bool_static);
@ -129,14 +131,14 @@ fn find_bool_node(ctx: &AssistContext<'_>) -> Option<BoolNodeData> {
Some(BoolNodeData {
target_node: static_.syntax().clone(),
name: static_.name()?,
name,
ty_annotation: static_.ty(),
initializer: static_.body(),
definition: Definition::Static(def),
})
} else if let Some(field_name) = ctx.find_node_at_offset::<ast::Name>() {
let field = field_name.syntax().ancestors().find_map(ast::RecordField::cast)?;
if field.name()? != field_name {
} else {
let field = name.syntax().ancestors().find_map(ast::RecordField::cast)?;
if field.name()? != name {
return None;
}
@ -148,13 +150,11 @@ fn find_bool_node(ctx: &AssistContext<'_>) -> Option<BoolNodeData> {
}
Some(BoolNodeData {
target_node: strukt.syntax().clone(),
name: field_name,
name,
ty_annotation: field.ty(),
initializer: None,
definition: Definition::Field(def),
})
} else {
None
}
}
@ -528,6 +528,18 @@ fn main() {
)
}
#[test]
fn local_variable_cursor_not_on_ident() {
check_assist_not_applicable(
bool_to_enum,
r#"
fn main() {
let foo = $0true;
}
"#,
)
}
#[test]
fn local_variable_non_ident_pat() {
cov_mark::check!(not_applicable_in_non_ident_pat);
@ -762,4 +774,9 @@ fn main() {
"#,
)
}
#[test]
fn not_applicable_to_other_names() {
check_assist_not_applicable(bool_to_enum, "fn $0main() {}")
}
}