mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve ControlFlow ourself instead of hard coding.

Browse Source
This commit is contained in:
Dezhi Wu 2021-10-13 21:19:41 +08:00
parent 5818358bbf
commit 93ae993ec4
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
crates/ide_assists/src/handlers/extract_function.rs
View File

@ -2,11 +2,17 @@
use ast::make;
use either::Either;
use hir::{HirDisplay, InFile, Local, Semantics, TypeInfo};
use hir::{HirDisplay, InFile, Local, ModuleDef, 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},
helpers::{
insert_use::{insert_use, ImportScope},
FamousDefs,
},
helpers::{
mod_path_to_ast,
node_ext::{preorder_expr, walk_expr, walk_pat, walk_patterns_in_expr},
},
search::{FileReference, ReferenceCategory, SearchScope},
RootDatabase,
};
@ -129,11 +135,20 @@ pub(crate) fn extract_function(acc: &mut Assists, ctx: &AssistContext) -> Option
ImportScope::Block(it) => ImportScope::Block(builder.make_mut(it)),
};
insert_use(
&scope,
make::path_from_text("std::ops::ControlFlow"),
&ctx.config.insert_use,
);
let control_flow_enum =
FamousDefs(&ctx.sema, Some(module.krate())).core_ops_ControlFlow();
if let Some(control_flow_enum) = control_flow_enum {
let mod_path = module.find_use_path_prefixed(
ctx.sema.db,
ModuleDef::from(control_flow_enum),
ctx.config.insert_use.prefix_kind,
);
if let Some(mod_path) = mod_path {
insert_use(&scope, mod_path_to_ast(&mod_path), &ctx.config.insert_use);
}
}
}
match ctx.config.snippet_cap {
@ -3304,6 +3319,7 @@ fn break_loop_with_if() {
check_assist(
extract_function,
r#"
//- minicore: try
fn foo() {
loop {
let mut n = 1;
@ -3315,7 +3331,7 @@ fn foo() {
}
"#,
r#"
use std::ops::ControlFlow;
use core::ops::ControlFlow;
fn foo() {
loop {
@ -3342,6 +3358,7 @@ fn break_loop_nested() {
check_assist(
extract_function,
r#"
//- minicore: try
fn foo() {
loop {
let mut n = 1;
@ -3354,7 +3371,7 @@ fn foo() {
}
"#,
r#"
use std::ops::ControlFlow;
use core::ops::ControlFlow;
fn foo() {
loop {

4
crates/ide_db/src/helpers/famous_defs.rs
View File

@ -68,6 +68,10 @@ pub fn core_ops_Deref(&self) -> Option<Trait> {
self.find_trait("core:ops:Deref")
}
pub fn core_ops_ControlFlow(&self) -> Option<Enum> {
self.find_enum("core:ops:ControlFlow")
}
pub fn alloc(&self) -> Option<Crate> {
self.find_crate("alloc")
}