Skip to content

internal: use ControlFlow in "extract function" assist #10309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 14, 2021
Merged

internal: use ControlFlow in "extract function" assist #10309

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
971a271
use `ControlFlow` in "extract function" assist
dzvon Sep 22, 2021
f888e85
use `ControlFlow::Break(_)` pattern
dzvon Sep 22, 2021
5818358
import `ControlFlow` to the module
dzvon Oct 13, 2021
93ae993
resolve `ControlFlow` ourself instead of hard coding.
dzvon Oct 13, 2021
214e7cc
merge use statement
dzvon Oct 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 23 additions & 1 deletion crates/ide_assists/src/handlers/extract_function.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ use either::Either;
use hir::{HirDisplay, InFile, Local, Semantics, TypeInfo};
use ide_db::{
defs::{Definition, NameRefClass},
helpers::insert_use::{insert_use, ImportScope},
helpers::node_ext::{preorder_expr, walk_expr, walk_pat, walk_patterns_in_expr},
search::{FileReference, ReferenceCategory, SearchScope},
RootDatabase,
Expand Down Expand Up @@ -86,6 +87,8 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option

let target_range = body.text_range();

let scope = ImportScope::find_insert_use_container_with_macros(&node, &ctx.sema)?;

acc.add(
AssistId("extract_function", crate::AssistKind::RefactorExtract),
"Extract into function",
Expand Down Expand Up @@ -118,10 +121,25 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option

let fn_def = format_function(ctx, module, &fun, old_indent, new_indent);
let insert_offset = insert_after.text_range().end();

if fn_def.contains("ControlFlow") {
let scope = match scope {
ImportScope::File(it) => ImportScope::File(builder.make_mut(it)),
ImportScope::Module(it) => ImportScope::Module(builder.make_mut(it)),
ImportScope::Block(it) => ImportScope::Block(builder.make_mut(it)),
};

insert_use(
&scope,
make::path_from_text("std::ops::ControlFlow"),
&ctx.config.insert_use,
);
}

match ctx.config.snippet_cap {
Some(cap) => builder.insert_snippet(cap, insert_offset, fn_def),
None => builder.insert(insert_offset, fn_def),
}
};
},
)
}
Expand Down Expand Up @@ -3297,6 +3315,8 @@ fn foo() {
}
"#,
r#"
use std::ops::ControlFlow;

fn foo() {
loop {
let mut n = 1;
Expand Down Expand Up @@ -3334,6 +3354,8 @@ fn foo() {
}
"#,
r#"
use std::ops::ControlFlow;

fn foo() {
loop {
let mut n = 1;
Expand Down