Skip to content

Commit 6dae5cb

Browse files
SomeoneToIgnoreSomeoneToIgnore
committed
Require ModPath for importing
1 parent a9669a5 commit 6dae5cb

File tree

6 files changed

+65
-37
lines changed

6 files changed

+65
-37
lines changed

‎crates/ra_assists/src/assists/add_import.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use hir::{self, db::HirDatabase};
1+
use hir::{self, db::HirDatabase, ModPath};
22
use ra_syntax::{
33
ast::{self, NameOwner},
44
AstNode, Direction, SmolStr,
@@ -21,9 +21,10 @@ pub fn auto_import_text_edit(
2121
// The statement to use as anchor (last resort)
2222
anchor: &SyntaxNode,
2323
// The path to import as a sequence of strings
24-
target: &[SmolStr],
24+
path_to_import: &ModPath,
2525
edit: &mut TextEditBuilder,
2626
) {
27+
let target = path_to_import.to_string().split("::").map(SmolStr::new).collect::<Vec<_>>();
2728
let container = position.ancestors().find_map(|n| {
2829
if let Some(module) = ast::Module::cast(n.clone()) {
2930
return module.item_list().map(|it| it.syntax().clone());
@@ -32,8 +33,8 @@ pub fn auto_import_text_edit(
3233
});
3334

3435
if let Some(container) = container {
35-
let action = best_action_for_target(container, anchor.clone(), target);
36-
make_assist(&action, target, edit);
36+
let action = best_action_for_target(container, anchor.clone(), &target);
37+
make_assist(&action, &target, edit);
3738
}
3839
}
3940

‎crates/ra_assists/src/assists/auto_import.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
use hir::db::HirDatabase;
1+
use hir::{db::HirDatabase, ModPath};
22
use ra_syntax::{
33
ast::{self, AstNode},
4-
SmolStr,
54
SyntaxKind::USE_ITEM,
65
SyntaxNode,
76
};
@@ -58,7 +57,6 @@ pub(crate) fn auto_import<F: ImportsLocator>(
5857
.filter_map(|module_def| module_with_name_to_import.find_use_path(ctx.db, module_def))
5958
.filter(|use_path| !use_path.segments.is_empty())
6059
.take(20)
61-
.map(|import| import.to_string())
6260
.collect::<std::collections::BTreeSet<_>>();
6361
if proposed_imports.is_empty() {
6462
return None;
@@ -76,11 +74,10 @@ pub(crate) fn auto_import<F: ImportsLocator>(
7674
)
7775
}
7876

79-
fn import_to_action(import: String, position: &SyntaxNode, anchor: &SyntaxNode) -> ActionBuilder {
77+
fn import_to_action(import: ModPath, position: &SyntaxNode, anchor: &SyntaxNode) -> ActionBuilder {
8078
let mut action_builder = ActionBuilder::default();
8179
action_builder.label(format!("Import `{}`", &import));
82-
let import_segments = import.split("::").map(SmolStr::new).collect::<Vec<_>>();
83-
auto_import_text_edit(position, anchor, &import_segments, action_builder.text_edit_builder());
80+
auto_import_text_edit(position, anchor, &import, action_builder.text_edit_builder());
8481
action_builder
8582
}
8683

‎crates/ra_hir/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ pub use hir_def::{
5959
ModuleDefId, // FIXME this is exposed and should be used for implementing the `TestImportsLocator` in `ra_assists` only, should be removed later along with the trait and the implementation.
6060
};
6161
pub use hir_expand::{
62-
name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, Origin,
62+
name::{known, Name},
63+
HirFileId, InFile, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, Origin,
6364
};
6465
pub use hir_ty::{display::HirDisplay, CallableDef};

‎crates/ra_hir_def/src/path.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ use ra_syntax::ast;
1616

1717
use crate::{type_ref::TypeRef, InFile};
1818

19-
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
19+
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
2020
pub struct ModPath {
2121
pub kind: PathKind,
2222
pub segments: Vec<Name>,
2323
}
2424

25-
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
25+
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
2626
pub enum PathKind {
2727
Plain,
2828
/// `self::` is `Super(0)`

‎crates/ra_hir_expand/src/name.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,9 @@ pub mod known {
143143
std,
144144
core,
145145
alloc,
146+
hash,
147+
fmt,
148+
io,
146149
iter,
147150
ops,
148151
future,
@@ -167,6 +170,9 @@ pub mod known {
167170
Neg,
168171
Not,
169172
Index,
173+
Display,
174+
Iterator,
175+
Hasher,
170176
// Builtin macros
171177
file,
172178
column,

‎crates/ra_ide/src/completion/complete_scope.rs

Lines changed: 47 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ use ra_text_edit::TextEditBuilder;
66
use rustc_hash::FxHashMap;
77

88
use crate::completion::{CompletionContext, CompletionItem, CompletionKind, Completions};
9+
use hir::{ModPath, PathKind};
910

1011
pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
1112
if !ctx.is_trivial_path {
@@ -54,58 +55,80 @@ pub(super) fn complete_scope(acc: &mut Completions, ctx: &CompletionContext) {
5455
}
5556
}
5657

57-
fn build_import_label(name: &str, path: &[SmolStr]) -> String {
58+
fn build_import_label(name: &str, path: &ModPath) -> String {
5859
let mut buf = String::with_capacity(64);
5960
buf.push_str(name);
6061
buf.push_str(" (");
61-
fmt_import_path(path, &mut buf);
62+
buf.push_str(&path.to_string());
6263
buf.push_str(")");
6364
buf
6465
}
6566

66-
fn fmt_import_path(path: &[SmolStr], buf: &mut String) {
67-
let mut segments = path.iter();
68-
if let Some(s) = segments.next() {
69-
buf.push_str(&s);
70-
}
71-
for s in segments {
72-
buf.push_str("::");
73-
buf.push_str(&s);
74-
}
75-
}
76-
7767
#[derive(Debug, Clone, Default)]
7868
pub(crate) struct ImportResolver {
7969
// todo: use fst crate or something like that
80-
dummy_names: Vec<(SmolStr, Vec<SmolStr>)>,
70+
dummy_names: Vec<(SmolStr, ModPath)>,
8171
}
8272

8373
impl ImportResolver {
8474
pub(crate) fn new() -> Self {
8575
let dummy_names = vec![
86-
(SmolStr::new("fmt"), vec![SmolStr::new("std"), SmolStr::new("fmt")]),
87-
(SmolStr::new("io"), vec![SmolStr::new("std"), SmolStr::new("io")]),
88-
(SmolStr::new("iter"), vec![SmolStr::new("std"), SmolStr::new("iter")]),
89-
(SmolStr::new("hash"), vec![SmolStr::new("std"), SmolStr::new("hash")]),
76+
(
77+
SmolStr::new("fmt"),
78+
ModPath { kind: PathKind::Plain, segments: vec![hir::known::std, hir::known::fmt] },
79+
),
80+
(
81+
SmolStr::new("io"),
82+
ModPath { kind: PathKind::Plain, segments: vec![hir::known::std, hir::known::io] },
83+
),
84+
(
85+
SmolStr::new("iter"),
86+
ModPath {
87+
kind: PathKind::Plain,
88+
segments: vec![hir::known::std, hir::known::iter],
89+
},
90+
),
91+
(
92+
SmolStr::new("hash"),
93+
ModPath {
94+
kind: PathKind::Plain,
95+
segments: vec![hir::known::std, hir::known::hash],
96+
},
97+
),
9098
(
9199
SmolStr::new("Debug"),
92-
vec![SmolStr::new("std"), SmolStr::new("fmt"), SmolStr::new("Debug")],
100+
ModPath {
101+
kind: PathKind::Plain,
102+
segments: vec![hir::known::std, hir::known::fmt, hir::known::Debug],
103+
},
93104
),
94105
(
95106
SmolStr::new("Display"),
96-
vec![SmolStr::new("std"), SmolStr::new("fmt"), SmolStr::new("Display")],
107+
ModPath {
108+
kind: PathKind::Plain,
109+
segments: vec![hir::known::std, hir::known::fmt, hir::known::Display],
110+
},
97111
),
98112
(
99113
SmolStr::new("Hash"),
100-
vec![SmolStr::new("std"), SmolStr::new("hash"), SmolStr::new("Hash")],
114+
ModPath {
115+
kind: PathKind::Plain,
116+
segments: vec![hir::known::std, hir::known::hash, hir::known::Hash],
117+
},
101118
),
102119
(
103120
SmolStr::new("Hasher"),
104-
vec![SmolStr::new("std"), SmolStr::new("hash"), SmolStr::new("Hasher")],
121+
ModPath {
122+
kind: PathKind::Plain,
123+
segments: vec![hir::known::std, hir::known::hash, hir::known::Hasher],
124+
},
105125
),
106126
(
107127
SmolStr::new("Iterator"),
108-
vec![SmolStr::new("std"), SmolStr::new("iter"), SmolStr::new("Iterator")],
128+
ModPath {
129+
kind: PathKind::Plain,
130+
segments: vec![hir::known::std, hir::known::iter, hir::known::Iterator],
131+
},
109132
),
110133
];
111134

@@ -115,7 +138,7 @@ impl ImportResolver {
115138
// Returns a map of importable items filtered by name.
116139
// The map associates item name with its full path.
117140
// todo: should return Resolutions
118-
pub(crate) fn all_names(&self, name: &str) -> FxHashMap<SmolStr, Vec<SmolStr>> {
141+
pub(crate) fn all_names(&self, name: &str) -> FxHashMap<SmolStr, ModPath> {
119142
if name.len() > 1 {
120143
self.dummy_names.iter().filter(|(n, _)| n.contains(name)).cloned().collect()
121144
} else {

0 commit comments

Comments
 (0)