language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 21:35:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Add ModuleOrItem guess to import granularity guessing

Browse source
This commit is contained in:
Lukas Wirth 2021-07-01 21:32:35 +02:00
parent 3d2490ca97
commit 7c8ef301ca
2 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/ide_db/src/helpers/insert_use.rs
View file

@ -145,17 +145,21 @@ impl ImportScope {
let prefix_c = prev_prefix.qualifiers().count();
let curr_c = curr_path.qualifiers().count() - prefix_c;
let prev_c = prev_path.qualifiers().count() - prefix_c;
if curr_c <= 1 || prev_c <= 1 {
// Same prefix but no use tree lists so this has to be of item style.
break ImportGranularityGuess::Item; // this overwrites CrateOrModule, technically the file doesn't adhere to anything here.
}
if curr_c == 1 && prev_c == 1 {
// Same prefix, only differing in the last segment and no use tree lists so this has to be of item style.
break ImportGranularityGuess::Item;
} else {
// Same prefix and no use tree list but differs in more than one segment at the end. This might be module style still.
res = ImportGranularityGuess::ModuleOrItem;
}
} else {
// Same prefix with item tree lists, has to be module style as it
// can't be crate style since the trees wouldn't share a prefix then.
break ImportGranularityGuess::Module;
}
}
}
}
prev = curr;
prev_vis = curr_vis;
prev_attrs = curr_attrs;
@ -168,6 +172,7 @@ enum ImportGranularityGuess {
Unknown,
Item,
Module,
ModuleOrItem,
Crate,
CrateOrModule,
}
@ -186,6 +191,7 @@ pub fn insert_use<'a>(scope: &ImportScope, path: ast::Path, cfg: &InsertUseConfi
ImportGranularityGuess::Unknown => mb,
ImportGranularityGuess::Item => None,
ImportGranularityGuess::Module => Some(MergeBehavior::Module),
ImportGranularityGuess::ModuleOrItem => mb.and(Some(MergeBehavior::Module)),
ImportGranularityGuess::Crate => Some(MergeBehavior::Crate),
ImportGranularityGuess::CrateOrModule => mb.or(Some(MergeBehavior::Crate)),
};

15
crates/ide_db/src/helpers/insert_use/tests.rs
View file

@ -743,12 +743,23 @@ use foo::bar::qux;
",
ImportGranularityGuess::Item,
);
}
#[test]
fn guess_module_or_item() {
check_guess(
r"
use foo::bar::Bar;
use foo::baz;
use foo::qux;
",
ImportGranularityGuess::Item,
ImportGranularityGuess::ModuleOrItem,
);
check_guess(
r"
use foo::bar::Bar;
use foo::bar;
",
ImportGranularityGuess::ModuleOrItem,
);
}