feat: initial version of bool_to_enum assist

This commit is contained in:
Ryan Mehri 2023-08-19 16:49:26 -06:00
parent 994df3d6a3
commit d7a8e800c9
3 changed files with 754 additions and 0 deletions

View File

@ -0,0 +1,724 @@
use ide_db::{
assists::{AssistId, AssistKind},
defs::Definition,
search::{FileReference, SearchScope, UsageSearchResult},
source_change::SourceChangeBuilder,
};
use syntax::{
ast::{
self,
edit::IndentLevel,
edit_in_place::{AttrsOwnerEdit, Indent},
make, HasName,
},
ted, AstNode, NodeOrToken, SyntaxNode, T,
};
use crate::assist_context::{AssistContext, Assists};
// Assist: bool_to_enum
//
// This converts boolean local variables, fields, constants, and statics into a new
// enum with two variants `Bool::True` and `Bool::False`, as well as replacing
// all assignments with the variants and replacing all usages with `== Bool::True` or
// `== Bool::False`.
//
// ```
// fn main() {
// let $0bool = true;
//
// if bool {
// println!("foo");
// }
// }
// ```
// ->
// ```
// fn main() {
// #[derive(PartialEq, Eq)]
// enum Bool { True, False }
//
// let bool = Bool::True;
//
// if bool == Bool::True {
// println!("foo");
// }
// }
// ```
pub(crate) fn bool_to_enum(acc: &mut Assists, ctx: &AssistContext<'_>) -> Option<()> {
let BoolNodeData { target_node, name, ty_annotation, initializer, definition } =
find_bool_node(ctx)?;
let target = name.syntax().text_range();
acc.add(
AssistId("bool_to_enum", AssistKind::RefactorRewrite),
"Convert boolean to enum",
target,
|edit| {
if let Some(ty) = &ty_annotation {
cov_mark::hit!(replaces_ty_annotation);
edit.replace(ty.syntax().text_range(), "Bool");
}
if let Some(initializer) = initializer {
replace_bool_expr(edit, initializer);
}
let usages = definition
.usages(&ctx.sema)
.in_scope(&SearchScope::single_file(ctx.file_id()))
.all();
replace_usages(edit, &usages);
add_enum_def(edit, ctx, &usages, target_node);
},
)
}
struct BoolNodeData {
target_node: SyntaxNode,
name: ast::Name,
ty_annotation: Option<ast::Type>,
initializer: Option<ast::Expr>,
definition: Definition,
}
/// 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 bind_pat = match let_stmt.pat()? {
ast::Pat::IdentPat(pat) => pat,
_ => {
cov_mark::hit!(not_applicable_in_non_ident_pat);
return None;
}
};
let def = ctx.sema.to_def(&bind_pat)?;
if !def.ty(ctx.db()).is_bool() {
cov_mark::hit!(not_applicable_non_bool_local);
return None;
}
Some(BoolNodeData {
target_node: let_stmt.syntax().clone(),
name: bind_pat.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>() {
let def = ctx.sema.to_def(&const_)?;
if !def.ty(ctx.db()).is_bool() {
cov_mark::hit!(not_applicable_non_bool_const);
return None;
}
Some(BoolNodeData {
target_node: const_.syntax().clone(),
name: const_.name()?,
ty_annotation: const_.ty(),
initializer: const_.body(),
definition: Definition::Const(def),
})
} else if let Some(static_) = ctx.find_node_at_offset::<ast::Static>() {
let def = ctx.sema.to_def(&static_)?;
if !def.ty(ctx.db()).is_bool() {
cov_mark::hit!(not_applicable_non_bool_static);
return None;
}
Some(BoolNodeData {
target_node: static_.syntax().clone(),
name: static_.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 {
return None;
}
let strukt = field.syntax().ancestors().find_map(ast::Struct::cast)?;
let def = ctx.sema.to_def(&field)?;
if !def.ty(ctx.db()).is_bool() {
cov_mark::hit!(not_applicable_non_bool_field);
return None;
}
Some(BoolNodeData {
target_node: strukt.syntax().clone(),
name: field_name,
ty_annotation: field.ty(),
initializer: None,
definition: Definition::Field(def),
})
} else {
None
}
}
fn replace_bool_expr(edit: &mut SourceChangeBuilder, expr: ast::Expr) {
let expr_range = expr.syntax().text_range();
let enum_expr = bool_expr_to_enum_expr(expr);
edit.replace(expr_range, enum_expr.syntax().text())
}
/// Converts an expression of type `bool` to one of the new enum type.
fn bool_expr_to_enum_expr(expr: ast::Expr) -> ast::Expr {
let true_expr = make::expr_path(make::path_from_text("Bool::True")).clone_for_update();
let false_expr = make::expr_path(make::path_from_text("Bool::False")).clone_for_update();
if let ast::Expr::Literal(literal) = &expr {
match literal.kind() {
ast::LiteralKind::Bool(true) => true_expr,
ast::LiteralKind::Bool(false) => false_expr,
_ => expr,
}
} else {
make::expr_if(
expr,
make::tail_only_block_expr(true_expr),
Some(ast::ElseBranch::Block(make::tail_only_block_expr(false_expr))),
)
.clone_for_update()
}
}
/// Replaces all usages of the target identifier, both when read and written to.
fn replace_usages(edit: &mut SourceChangeBuilder, usages: &UsageSearchResult) {
for (_, references) in usages.iter() {
references
.into_iter()
.filter_map(|FileReference { range, name, .. }| match name {
ast::NameLike::NameRef(name) => Some((*range, name)),
_ => None,
})
.for_each(|(range, name_ref)| {
if let Some(initializer) = find_assignment_usage(name_ref) {
cov_mark::hit!(replaces_assignment);
replace_bool_expr(edit, initializer);
} else if let Some((prefix_expr, expr)) = find_negated_usage(name_ref) {
cov_mark::hit!(replaces_negation);
edit.replace(
prefix_expr.syntax().text_range(),
format!("{} == Bool::False", expr),
);
} else if let Some((record_field, initializer)) = find_record_expr_usage(name_ref) {
cov_mark::hit!(replaces_record_expr);
let record_field = edit.make_mut(record_field);
let enum_expr = bool_expr_to_enum_expr(initializer);
record_field.replace_expr(enum_expr);
} else if name_ref.syntax().ancestors().find_map(ast::Expr::cast).is_some() {
// for any other usage in an expression, replace it with a check that it is the true variant
edit.replace(range, format!("{} == Bool::True", name_ref.text()));
}
})
}
}
fn find_assignment_usage(name_ref: &ast::NameRef) -> Option<ast::Expr> {
let bin_expr = name_ref.syntax().ancestors().find_map(ast::BinExpr::cast)?;
if let Some(ast::BinaryOp::Assignment { op: None }) = bin_expr.op_kind() {
bin_expr.rhs()
} else {
None
}
}
fn find_negated_usage(name_ref: &ast::NameRef) -> Option<(ast::PrefixExpr, ast::Expr)> {
let prefix_expr = name_ref.syntax().ancestors().find_map(ast::PrefixExpr::cast)?;
if let Some(ast::UnaryOp::Not) = prefix_expr.op_kind() {
let initializer = prefix_expr.expr()?;
Some((prefix_expr, initializer))
} else {
None
}
}
fn find_record_expr_usage(name_ref: &ast::NameRef) -> Option<(ast::RecordExprField, ast::Expr)> {
let record_field = name_ref.syntax().ancestors().find_map(ast::RecordExprField::cast)?;
let initializer = record_field.expr()?;
Some((record_field, initializer))
}
/// Adds the definition of the new enum before the target node.
fn add_enum_def(
edit: &mut SourceChangeBuilder,
ctx: &AssistContext<'_>,
usages: &UsageSearchResult,
target_node: SyntaxNode,
) {
let make_enum_pub = usages.iter().any(|(file_id, _)| file_id != &ctx.file_id());
let enum_def = make_bool_enum(make_enum_pub);
let indent = IndentLevel::from_node(&target_node);
enum_def.reindent_to(indent);
ted::insert_all(
ted::Position::before(&edit.make_syntax_mut(target_node)),
vec![
enum_def.syntax().clone().into(),
make::tokens::whitespace(&format!("\n\n{indent}")).into(),
],
);
}
fn make_bool_enum(make_pub: bool) -> ast::Enum {
let enum_def = make::enum_(
if make_pub { Some(make::visibility_pub()) } else { None },
make::name("Bool"),
make::variant_list(vec![
make::variant(make::name("True"), None),
make::variant(make::name("False"), None),
]),
)
.clone_for_update();
let derive_eq = make::attr_outer(make::meta_token_tree(
make::ext::ident_path("derive"),
make::token_tree(
T!['('],
vec![
NodeOrToken::Token(make::tokens::ident("PartialEq")),
NodeOrToken::Token(make::token(T![,])),
NodeOrToken::Token(make::tokens::single_space()),
NodeOrToken::Token(make::tokens::ident("Eq")),
],
),
))
.clone_for_update();
enum_def.add_attr(derive_eq);
enum_def
}
#[cfg(test)]
mod tests {
use super::*;
use crate::tests::{check_assist, check_assist_not_applicable};
#[test]
fn local_variable_with_usage() {
check_assist(
bool_to_enum,
r#"
fn main() {
let $0foo = true;
if foo {
println!("foo");
}
}
"#,
r#"
fn main() {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
let foo = Bool::True;
if foo == Bool::True {
println!("foo");
}
}
"#,
)
}
#[test]
fn local_variable_with_usage_negated() {
cov_mark::check!(replaces_negation);
check_assist(
bool_to_enum,
r#"
fn main() {
let $0foo = true;
if !foo {
println!("foo");
}
}
"#,
r#"
fn main() {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
let foo = Bool::True;
if foo == Bool::False {
println!("foo");
}
}
"#,
)
}
#[test]
fn local_variable_with_type_annotation() {
cov_mark::check!(replaces_ty_annotation);
check_assist(
bool_to_enum,
r#"
fn main() {
let $0foo: bool = false;
}
"#,
r#"
fn main() {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
let foo: Bool = Bool::False;
}
"#,
)
}
#[test]
fn local_variable_with_non_literal_initializer() {
check_assist(
bool_to_enum,
r#"
fn main() {
let $0foo = 1 == 2;
}
"#,
r#"
fn main() {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
let foo = if 1 == 2 { Bool::True } else { Bool::False };
}
"#,
)
}
#[test]
fn local_variable_binexpr_usage() {
check_assist(
bool_to_enum,
r#"
fn main() {
let $0foo = false;
let bar = true;
if !foo && bar {
println!("foobar");
}
}
"#,
r#"
fn main() {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
let foo = Bool::False;
let bar = true;
if foo == Bool::False && bar {
println!("foobar");
}
}
"#,
)
}
#[test]
fn local_variable_unop_usage() {
check_assist(
bool_to_enum,
r#"
fn main() {
let $0foo = true;
if *&foo {
println!("foobar");
}
}
"#,
r#"
fn main() {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
let foo = Bool::True;
if *&foo == Bool::True {
println!("foobar");
}
}
"#,
)
}
#[test]
fn local_variable_assigned_later() {
cov_mark::check!(replaces_assignment);
check_assist(
bool_to_enum,
r#"
fn main() {
let $0foo: bool;
foo = true;
}
"#,
r#"
fn main() {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
let foo: Bool;
foo = Bool::True;
}
"#,
)
}
#[test]
fn local_variable_does_not_apply_recursively() {
check_assist(
bool_to_enum,
r#"
fn main() {
let $0foo = true;
let bar = !foo;
if bar {
println!("bar");
}
}
"#,
r#"
fn main() {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
let foo = Bool::True;
let bar = foo == Bool::False;
if bar {
println!("bar");
}
}
"#,
)
}
#[test]
fn local_variable_non_bool() {
cov_mark::check!(not_applicable_non_bool_local);
check_assist_not_applicable(
bool_to_enum,
r#"
fn main() {
let $0foo = 1;
}
"#,
)
}
#[test]
fn local_variable_non_ident_pat() {
cov_mark::check!(not_applicable_in_non_ident_pat);
check_assist_not_applicable(
bool_to_enum,
r#"
fn main() {
let ($0foo, bar) = (true, false);
}
"#,
)
}
#[test]
fn field_basic() {
cov_mark::check!(replaces_record_expr);
check_assist(
bool_to_enum,
r#"
struct Foo {
$0bar: bool,
baz: bool,
}
fn main() {
let foo = Foo { bar: true, baz: false };
if foo.bar {
println!("foo");
}
}
"#,
r#"
#[derive(PartialEq, Eq)]
enum Bool { True, False }
struct Foo {
bar: Bool,
baz: bool,
}
fn main() {
let foo = Foo { bar: Bool::True, baz: false };
if foo.bar == Bool::True {
println!("foo");
}
}
"#,
)
}
#[test]
fn field_in_mod_properly_indented() {
check_assist(
bool_to_enum,
r#"
mod foo {
struct Bar {
$0baz: bool,
}
impl Bar {
fn new(baz: bool) -> Self {
Self { baz }
}
}
}
"#,
r#"
mod foo {
#[derive(PartialEq, Eq)]
enum Bool { True, False }
struct Bar {
baz: Bool,
}
impl Bar {
fn new(baz: bool) -> Self {
Self { baz: if baz { Bool::True } else { Bool::False } }
}
}
}
"#,
)
}
#[test]
fn field_non_bool() {
cov_mark::check!(not_applicable_non_bool_field);
check_assist_not_applicable(
bool_to_enum,
r#"
struct Foo {
$0bar: usize,
}
fn main() {
let foo = Foo { bar: 1 };
}
"#,
)
}
#[test]
fn const_basic() {
check_assist(
bool_to_enum,
r#"
const $0FOO: bool = false;
fn main() {
if FOO {
println!("foo");
}
}
"#,
r#"
#[derive(PartialEq, Eq)]
enum Bool { True, False }
const FOO: Bool = Bool::False;
fn main() {
if FOO == Bool::True {
println!("foo");
}
}
"#,
)
}
#[test]
fn const_non_bool() {
cov_mark::check!(not_applicable_non_bool_const);
check_assist_not_applicable(
bool_to_enum,
r#"
const $0FOO: &str = "foo";
fn main() {
println!("{FOO}");
}
"#,
)
}
#[test]
fn static_basic() {
check_assist(
bool_to_enum,
r#"
static mut $0BOOL: bool = true;
fn main() {
unsafe { BOOL = false };
if unsafe { BOOL } {
println!("foo");
}
}
"#,
r#"
#[derive(PartialEq, Eq)]
enum Bool { True, False }
static mut BOOL: Bool = Bool::True;
fn main() {
unsafe { BOOL = Bool::False };
if unsafe { BOOL == Bool::True } {
println!("foo");
}
}
"#,
)
}
#[test]
fn static_non_bool() {
cov_mark::check!(not_applicable_non_bool_static);
check_assist_not_applicable(
bool_to_enum,
r#"
static mut $0FOO: usize = 0;
fn main() {
if unsafe { FOO } == 0 {
println!("foo");
}
}
"#,
)
}
}

View File

@ -115,6 +115,7 @@ mod handlers {
mod apply_demorgan;
mod auto_import;
mod bind_unused_param;
mod bool_to_enum;
mod change_visibility;
mod convert_bool_then;
mod convert_comment_block;
@ -227,6 +228,7 @@ mod handlers {
apply_demorgan::apply_demorgan,
auto_import::auto_import,
bind_unused_param::bind_unused_param,
bool_to_enum::bool_to_enum,
change_visibility::change_visibility,
convert_bool_then::convert_bool_then_to_if,
convert_bool_then::convert_if_to_bool_then,

View File

@ -973,6 +973,11 @@ pub fn tuple_field(visibility: Option<ast::Visibility>, ty: ast::Type) -> ast::T
ast_from_text(&format!("struct f({visibility}{ty});"))
}
pub fn variant_list(variants: impl IntoIterator<Item = ast::Variant>) -> ast::VariantList {
let variants = variants.into_iter().join(", ");
ast_from_text(&format!("enum f {{ {variants} }}"))
}
pub fn variant(name: ast::Name, field_list: Option<ast::FieldList>) -> ast::Variant {
let field_list = match field_list {
None => String::new(),
@ -1037,6 +1042,19 @@ pub fn struct_(
ast_from_text(&format!("{visibility}struct {strukt_name}{type_params}{field_list}{semicolon}",))
}
pub fn enum_(
visibility: Option<ast::Visibility>,
enum_name: ast::Name,
variant_list: ast::VariantList,
) -> ast::Enum {
let visibility = match visibility {
None => String::new(),
Some(it) => format!("{it} "),
};
ast_from_text(&format!("{visibility}enum {enum_name} {variant_list}"))
}
pub fn attr_outer(meta: ast::Meta) -> ast::Attr {
ast_from_text(&format!("#[{meta}]"))
}
@ -1149,6 +1167,16 @@ pub mod tokens {
lit.syntax().first_child_or_token().unwrap().into_token().unwrap()
}
pub fn ident(text: &str) -> SyntaxToken {
assert_eq!(text.trim(), text);
let path: ast::Path = super::ext::ident_path(text);
path.syntax()
.descendants_with_tokens()
.filter_map(|it| it.into_token())
.find(|it| it.kind() == IDENT)
.unwrap()
}
pub fn single_newline() -> SyntaxToken {
let res = SOURCE_FILE
.tree()