Skip to content

Commit 87621de

Browse files
bors[bot]matkladmahdifrmz
authored
Merge #9567 #9568
9567: remove unneded special case r=matklad a=matklad bors r+ 🤖 9568: feat: add 'for' postfix completion r=lnicola a=mahdi-frms ![Peek 2021-07-11 16-45](https://user-images.githubusercontent.com/62165556/125194692-a0aaf780-e267-11eb-952a-81de7955d9a1.gif) adds #9561 used ```ele``` as identifier for each element in the iteration Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com> Co-authored-by: mahdi-frms <mahdif1380@outlook.com>
3 parents a70d931 + bbb0535 + 7bae9c9 commit 87621de

File tree

17 files changed

+92
-53
lines changed

17 files changed

+92
-53
lines changed

crates/ide/src/doc_links.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ pub(crate) fn external_docs(
112112
let node = token.parent()?;
113113
let definition = match_ast! {
114114
match node {
115-
ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced(sema.db))?,
116-
ast::Name(name) => NameClass::classify(&sema, &name).map(|d| d.referenced_or_defined(sema.db))?,
115+
ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced())?,
116+
ast::Name(name) => NameClass::classify(&sema, &name).map(|d| d.referenced_or_defined())?,
117117
_ => return None,
118118
}
119119
};

crates/ide/src/goto_declaration.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ pub(crate) fn goto_declaration(
2525
match parent {
2626
ast::NameRef(name_ref) => {
2727
let name_kind = NameRefClass::classify(&sema, &name_ref)?;
28-
name_kind.referenced(sema.db)
28+
name_kind.referenced()
2929
},
3030
ast::Name(name) => {
31-
NameClass::classify(&sema, &name)?.referenced_or_defined(sema.db)
31+
NameClass::classify(&sema, &name)?.referenced_or_defined()
3232
},
3333
_ => return None,
3434
}

crates/ide/src/goto_definition.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ pub(crate) fn goto_definition(
6060
reference_definition(&sema, Either::Right(&name_ref))
6161
},
6262
ast::Name(name) => {
63-
let def = NameClass::classify(&sema, &name)?.referenced_or_defined(sema.db);
63+
let def = NameClass::classify(&sema, &name)?.referenced_or_defined();
6464
try_find_trait_item_definition(sema.db, &def)
6565
.or_else(|| def.try_to_nav(sema.db))
6666
},
6767
ast::Lifetime(lt) => if let Some(name_class) = NameClass::classify_lifetime(&sema, &lt) {
68-
let def = name_class.referenced_or_defined(sema.db);
68+
let def = name_class.referenced_or_defined();
6969
def.try_to_nav(sema.db)
7070
} else {
7171
reference_definition(&sema, Either::Left(&lt))
@@ -140,7 +140,7 @@ pub(crate) fn reference_definition(
140140
|lifetime| NameRefClass::classify_lifetime(sema, lifetime),
141141
|name_ref| NameRefClass::classify(sema, name_ref),
142142
)?;
143-
let def = name_kind.referenced(sema.db);
143+
let def = name_kind.referenced();
144144
def.try_to_nav(sema.db)
145145
}
146146

crates/ide/src/goto_implementation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ pub(crate) fn goto_implementation(
2929
let node = sema.find_node_at_offset_with_descend(&syntax, position.offset)?;
3030
let def = match &node {
3131
ast::NameLike::Name(name) => {
32-
NameClass::classify(&sema, name).map(|class| class.referenced_or_defined(sema.db))
32+
NameClass::classify(&sema, name).map(|class| class.referenced_or_defined())
3333
}
3434
ast::NameLike::NameRef(name_ref) => {
35-
NameRefClass::classify(&sema, name_ref).map(|class| class.referenced(sema.db))
35+
NameRefClass::classify(&sema, name_ref).map(|class| class.referenced())
3636
}
3737
ast::NameLike::Lifetime(_) => None,
3838
}?;

crates/ide/src/hover.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ pub(crate) fn hover(
9898
// field pattern shorthands to their definition
9999
ast::Name(name) => NameClass::classify(&sema, &name).and_then(|class| match class {
100100
NameClass::ConstReference(def) => Some(def),
101-
def => def.defined(db),
101+
def => def.defined(),
102102
}),
103103
ast::NameRef(name_ref) => {
104-
NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced(db))
104+
NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced())
105105
},
106106
ast::Lifetime(lifetime) => NameClass::classify_lifetime(&sema, &lifetime).map_or_else(
107-
|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced(db)),
108-
|d| d.defined(db),
107+
|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced()),
108+
|d| d.defined(),
109109
),
110110

111111
_ => {

crates/ide/src/references.rs

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ pub(crate) fn find_all_refs(
5858

5959
let (def, is_literal_search) =
6060
if let Some(name) = get_name_of_item_declaration(&syntax, position) {
61-
(NameClass::classify(sema, &name)?.referenced_or_defined(sema.db), true)
61+
(NameClass::classify(sema, &name)?.referenced_or_defined(), true)
6262
} else {
6363
(find_def(sema, &syntax, position.offset)?, false)
6464
};
@@ -116,17 +116,13 @@ pub(crate) fn find_def(
116116
offset: TextSize,
117117
) -> Option<Definition> {
118118
let def = match sema.find_node_at_offset_with_descend(syntax, offset)? {
119-
ast::NameLike::NameRef(name_ref) => {
120-
NameRefClass::classify(sema, &name_ref)?.referenced(sema.db)
121-
}
122-
ast::NameLike::Name(name) => {
123-
NameClass::classify(sema, &name)?.referenced_or_defined(sema.db)
124-
}
119+
ast::NameLike::NameRef(name_ref) => NameRefClass::classify(sema, &name_ref)?.referenced(),
120+
ast::NameLike::Name(name) => NameClass::classify(sema, &name)?.referenced_or_defined(),
125121
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
126-
.map(|class| class.referenced(sema.db))
122+
.map(|class| class.referenced())
127123
.or_else(|| {
128124
NameClass::classify_lifetime(sema, &lifetime)
129-
.map(|class| class.referenced_or_defined(sema.db))
125+
.map(|class| class.referenced_or_defined())
130126
})?,
131127
};
132128
Some(def)

crates/ide/src/rename.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,11 +108,11 @@ fn find_definition(
108108
bail!("Renaming aliases is currently unsupported")
109109
}
110110
ast::NameLike::Name(name) => {
111-
NameClass::classify(sema, &name).map(|class| class.referenced_or_defined(sema.db))
111+
NameClass::classify(sema, &name).map(|class| class.referenced_or_defined())
112112
}
113113
ast::NameLike::NameRef(name_ref) => {
114114
if let Some(def) =
115-
NameRefClass::classify(sema, &name_ref).map(|class| class.referenced(sema.db))
115+
NameRefClass::classify(sema, &name_ref).map(|class| class.referenced())
116116
{
117117
// if the name differs from the definitions name it has to be an alias
118118
if def.name(sema.db).map_or(false, |it| it.to_string() != name_ref.text()) {
@@ -124,10 +124,9 @@ fn find_definition(
124124
}
125125
}
126126
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
127-
.map(|class| NameRefClass::referenced(class, sema.db))
127+
.map(|class| class.referenced())
128128
.or_else(|| {
129-
NameClass::classify_lifetime(sema, &lifetime)
130-
.map(|it| it.referenced_or_defined(sema.db))
129+
NameClass::classify_lifetime(sema, &lifetime).map(|it| it.referenced_or_defined())
131130
}),
132131
}
133132
.ok_or_else(|| format_err!("No references found at position"))?;

crates/ide/src/syntax_highlighting/highlight.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ pub(super) fn element(
4646
};
4747

4848
match name_kind {
49-
Some(NameClass::ExternCrate(_)) => SymbolKind::Module.into(),
5049
Some(NameClass::Definition(def)) => {
5150
let mut h = highlight_def(db, krate, def) | HlMod::Definition;
5251
if let Definition::ModuleDef(hir::ModuleDef::Trait(trait_)) = &def {
@@ -111,7 +110,6 @@ pub(super) fn element(
111110
}
112111
};
113112
let h = match name_class {
114-
NameRefClass::ExternCrate(_) => SymbolKind::Module.into(),
115113
NameRefClass::Definition(def) => {
116114
if let Definition::Local(local) = &def {
117115
if let Some(name) = local.name(db) {

crates/ide/src/syntax_highlighting/test_data/highlight_extern_crate.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,6 @@
3838

3939
.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
4040
</style>
41-
<pre><code><span class="keyword">extern</span> <span class="keyword">crate</span> <span class="module">std</span><span class="semicolon">;</span>
42-
<span class="keyword">extern</span> <span class="keyword">crate</span> <span class="module">alloc</span> <span class="keyword">as</span> <span class="module">abc</span><span class="semicolon">;</span>
41+
<pre><code><span class="keyword">extern</span> <span class="keyword">crate</span> <span class="module library">std</span><span class="semicolon">;</span>
42+
<span class="keyword">extern</span> <span class="keyword">crate</span> <span class="module library">alloc</span> <span class="keyword">as</span> <span class="module declaration library">abc</span><span class="semicolon">;</span>
4343
</code></pre>

crates/ide_assists/src/handlers/add_turbo_fish.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ pub(crate) fn add_turbo_fish(acc: &mut Assists, ctx: &AssistContext) -> Option<(
4141
let name_ref = ast::NameRef::cast(ident.parent()?)?;
4242
let def = match NameRefClass::classify(&ctx.sema, &name_ref)? {
4343
NameRefClass::Definition(def) => def,
44-
NameRefClass::ExternCrate(_) | NameRefClass::FieldShorthand { .. } => return None,
44+
NameRefClass::FieldShorthand { .. } => return None,
4545
};
4646
let fun = match def {
4747
Definition::ModuleDef(hir::ModuleDef::Function(it)) => it,

0 commit comments

Comments
 (0)