Skip to content

Commit 13af22d

Browse files
VeykrilVeykril
committed
Reduce the default autoimport exclusion list
1 parent 528ed6b commit 13af22d

File tree

5 files changed

+90
-186
lines changed

5 files changed

+90
-186
lines changed

‎src/tools/rust-analyzer/crates/hir-def/src/item_scope.rs‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,6 @@ impl ItemScope {
354354
.chain(self.unnamed_trait_imports.keys().copied())
355355
}
356356

357-
pub fn trait_by_name(&self, name: &Name) -> Option<TraitId> {
358-
self.types.get(name).and_then(|def| match def.def {
359-
ModuleDefId::TraitId(it) => Some(it),
360-
_ => None,
361-
})
362-
}
363-
364357
pub(crate) fn resolutions(&self) -> impl Iterator<Item = (Option<Name>, PerNs)> + '_ {
365358
self.entries().map(|(name, res)| (Some(name.clone()), res)).chain(
366359
self.unnamed_trait_imports.iter().map(|(tr, trait_)| {

‎src/tools/rust-analyzer/crates/ide-completion/src/tests/expression.rs‎

Lines changed: 83 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,19 +1430,22 @@ fn foo() {
14301430
}
14311431
"#,
14321432
expect![[r#"
1433-
me inherent() fn(&self)
1434-
sn box Box::new(expr)
1435-
sn call function(expr)
1436-
sn dbg dbg!(expr)
1437-
sn dbgr dbg!(&expr)
1438-
sn deref *expr
1439-
sn let let
1440-
sn letm let mut
1441-
sn match match expr {}
1442-
sn ref &expr
1443-
sn refm &mut expr
1444-
sn return return expr
1445-
sn unsafe unsafe {}
1433+
me bar() (as ExcludedTrait) fn(&self)
1434+
me baz() (as ExcludedTrait) fn(&self)
1435+
me foo() (as ExcludedTrait) fn(&self)
1436+
me inherent() fn(&self)
1437+
sn box Box::new(expr)
1438+
sn call function(expr)
1439+
sn dbg dbg!(expr)
1440+
sn dbgr dbg!(&expr)
1441+
sn deref *expr
1442+
sn let let
1443+
sn letm let mut
1444+
sn match match expr {}
1445+
sn ref &expr
1446+
sn refm &mut expr
1447+
sn return return expr
1448+
sn unsafe unsafe {}
14461449
"#]],
14471450
);
14481451
}
@@ -1468,18 +1471,18 @@ fn foo(v: &dyn ExcludedTrait) {
14681471
me bar() (as ExcludedTrait) fn(&self)
14691472
me baz() (as ExcludedTrait) fn(&self)
14701473
me foo() (as ExcludedTrait) fn(&self)
1471-
sn box Box::new(expr)
1472-
sn call function(expr)
1473-
sn dbg dbg!(expr)
1474+
sn box Box::new(expr)
1475+
sn call function(expr)
1476+
sn dbg dbg!(expr)
14741477
sn dbgr dbg!(&expr)
1475-
sn deref *expr
1476-
sn let let
1477-
sn letm let mut
1478-
sn match match expr {}
1479-
sn ref &expr
1480-
sn refm &mut expr
1478+
sn deref *expr
1479+
sn let let
1480+
sn letm let mut
1481+
sn match match expr {}
1482+
sn ref &expr
1483+
sn refm &mut expr
14811484
sn return return expr
1482-
sn unsafe unsafe {}
1485+
sn unsafe unsafe {}
14831486
"#]],
14841487
);
14851488
check_with_config(
@@ -1501,18 +1504,18 @@ fn foo(v: impl ExcludedTrait) {
15011504
me bar() (as ExcludedTrait) fn(&self)
15021505
me baz() (as ExcludedTrait) fn(&self)
15031506
me foo() (as ExcludedTrait) fn(&self)
1504-
sn box Box::new(expr)
1505-
sn call function(expr)
1506-
sn dbg dbg!(expr)
1507+
sn box Box::new(expr)
1508+
sn call function(expr)
1509+
sn dbg dbg!(expr)
15071510
sn dbgr dbg!(&expr)
1508-
sn deref *expr
1509-
sn let let
1510-
sn letm let mut
1511-
sn match match expr {}
1512-
sn ref &expr
1513-
sn refm &mut expr
1511+
sn deref *expr
1512+
sn let let
1513+
sn letm let mut
1514+
sn match match expr {}
1515+
sn ref &expr
1516+
sn refm &mut expr
15141517
sn return return expr
1515-
sn unsafe unsafe {}
1518+
sn unsafe unsafe {}
15161519
"#]],
15171520
);
15181521
check_with_config(
@@ -1534,18 +1537,18 @@ fn foo<T: ExcludedTrait>(v: T) {
15341537
me bar() (as ExcludedTrait) fn(&self)
15351538
me baz() (as ExcludedTrait) fn(&self)
15361539
me foo() (as ExcludedTrait) fn(&self)
1537-
sn box Box::new(expr)
1538-
sn call function(expr)
1539-
sn dbg dbg!(expr)
1540+
sn box Box::new(expr)
1541+
sn call function(expr)
1542+
sn dbg dbg!(expr)
15401543
sn dbgr dbg!(&expr)
1541-
sn deref *expr
1542-
sn let let
1543-
sn letm let mut
1544-
sn match match expr {}
1545-
sn ref &expr
1546-
sn refm &mut expr
1544+
sn deref *expr
1545+
sn let let
1546+
sn letm let mut
1547+
sn match match expr {}
1548+
sn ref &expr
1549+
sn refm &mut expr
15471550
sn return return expr
1548-
sn unsafe unsafe {}
1551+
sn unsafe unsafe {}
15491552
"#]],
15501553
);
15511554
}
@@ -1578,19 +1581,22 @@ fn foo() {
15781581
}
15791582
"#,
15801583
expect![[r#"
1581-
me inherent() fn(&self)
1582-
sn box Box::new(expr)
1583-
sn call function(expr)
1584-
sn dbg dbg!(expr)
1585-
sn dbgr dbg!(&expr)
1586-
sn deref *expr
1587-
sn let let
1588-
sn letm let mut
1589-
sn match match expr {}
1590-
sn ref &expr
1591-
sn refm &mut expr
1592-
sn return return expr
1593-
sn unsafe unsafe {}
1584+
me bar() (use module2::ExcludedTrait) fn(&self)
1585+
me baz() (use module2::ExcludedTrait) fn(&self)
1586+
me foo() (use module2::ExcludedTrait) fn(&self)
1587+
me inherent() fn(&self)
1588+
sn box Box::new(expr)
1589+
sn call function(expr)
1590+
sn dbg dbg!(expr)
1591+
sn dbgr dbg!(&expr)
1592+
sn deref *expr
1593+
sn let let
1594+
sn letm let mut
1595+
sn match match expr {}
1596+
sn ref &expr
1597+
sn refm &mut expr
1598+
sn return return expr
1599+
sn unsafe unsafe {}
15941600
"#]],
15951601
);
15961602
}
@@ -1623,19 +1629,22 @@ fn foo() {
16231629
}
16241630
"#,
16251631
expect![[r#"
1626-
me inherent() fn(&self)
1627-
sn box Box::new(expr)
1628-
sn call function(expr)
1629-
sn dbg dbg!(expr)
1630-
sn dbgr dbg!(&expr)
1631-
sn deref *expr
1632-
sn let let
1633-
sn letm let mut
1634-
sn match match expr {}
1635-
sn ref &expr
1636-
sn refm &mut expr
1637-
sn return return expr
1638-
sn unsafe unsafe {}
1632+
me bar() (use module2::ExcludedTrait) fn(&self)
1633+
me baz() (use module2::ExcludedTrait) fn(&self)
1634+
me foo() (use module2::ExcludedTrait) fn(&self)
1635+
me inherent() fn(&self)
1636+
sn box Box::new(expr)
1637+
sn call function(expr)
1638+
sn dbg dbg!(expr)
1639+
sn dbgr dbg!(&expr)
1640+
sn deref *expr
1641+
sn let let
1642+
sn letm let mut
1643+
sn match match expr {}
1644+
sn ref &expr
1645+
sn refm &mut expr
1646+
sn return return expr
1647+
sn unsafe unsafe {}
16391648
"#]],
16401649
);
16411650
}
@@ -1663,8 +1672,11 @@ fn foo() {
16631672
}
16641673
"#,
16651674
expect![[r#"
1666-
me inherent(…) fn(&self)
1667-
"#]],
1675+
me bar(…) (as ExcludedTrait) fn(&self)
1676+
me baz(…) (as ExcludedTrait) fn(&self)
1677+
me foo(…) (as ExcludedTrait) fn(&self)
1678+
me inherent(…) fn(&self)
1679+
"#]],
16681680
);
16691681
}
16701682

‎src/tools/rust-analyzer/crates/rust-analyzer/src/config.rs‎

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -442,50 +442,13 @@ config_data! {
442442
completion_autoimport_enable: bool = true,
443443
/// A list of full paths to traits to exclude from flyimport.
444444
///
445-
/// Traits in this list won't be suggested to be imported by flyimport for their methods. Methods from them won't be available in flyimport completion. They will still be available if in scope.
446-
///
447-
/// Note that the trait themselves can still be suggested by flyimport.
445+
/// Traits in this list won't have their methods suggested in completions unless the trait
446+
/// is in scope.
448447
///
449448
/// This setting also inherits `#rust-analyzer.completion.excludeTraits#`.
450-
///
451-
/// This setting defaults to:
452-
///
453-
/// - [`core::borrow::Borrow`](https://doc.rust-lang.org/nightly/core/borrow/trait.Borrow.html)
454-
/// - [`core::borrow::BorrowMut`](https://doc.rust-lang.org/nightly/core/borrow/trait.BorrowMut.html)
455-
/// - [`core::cmp::PartialEq`](https://doc.rust-lang.org/nightly/core/cmp/trait.PartialEq.html)
456-
/// - All operator traits (in [`core::ops`](https://doc.rust-lang.org/nightly/core/ops))
457-
///
458-
/// Note that if you override this setting, those traits won't be automatically inserted, so you may want to insert them manually.
459449
completion_autoimport_excludeTraits: Vec<String> = vec![
460450
"core::borrow::Borrow".to_owned(),
461451
"core::borrow::BorrowMut".to_owned(),
462-
"core::cmp::PartialEq".to_owned(),
463-
"core::ops::Add".to_owned(),
464-
"core::ops::AddAssign".to_owned(),
465-
"core::ops::BitAnd".to_owned(),
466-
"core::ops::BitAndAssign".to_owned(),
467-
"core::ops::BitOr".to_owned(),
468-
"core::ops::BitOrAssign".to_owned(),
469-
"core::ops::BitXor".to_owned(),
470-
"core::ops::BitXorAssign".to_owned(),
471-
"core::ops::Div".to_owned(),
472-
"core::ops::DivAssign".to_owned(),
473-
"core::ops::Mul".to_owned(),
474-
"core::ops::MulAssign".to_owned(),
475-
"core::ops::Rem".to_owned(),
476-
"core::ops::RemAssign".to_owned(),
477-
"core::ops::Shl".to_owned(),
478-
"core::ops::ShlAssign".to_owned(),
479-
"core::ops::Shr".to_owned(),
480-
"core::ops::ShrAssign".to_owned(),
481-
"core::ops::Sub".to_owned(),
482-
"core::ops::SubAssign".to_owned(),
483-
"core::ops::Neg".to_owned(),
484-
"core::ops::Not".to_owned(),
485-
"core::ops::Index".to_owned(),
486-
"core::ops::IndexMut".to_owned(),
487-
"core::ops::Deref".to_owned(),
488-
"core::ops::DerefMut".to_owned(),
489452
],
490453
/// Toggles the additional completions that automatically show method calls and field accesses
491454
/// with `self` prefixed to them when inside a method.

‎src/tools/rust-analyzer/docs/user/generated_config.adoc‎

Lines changed: 3 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -293,53 +293,16 @@ Default:
293293
----
294294
[
295295
"core::borrow::Borrow",
296-
"core::borrow::BorrowMut",
297-
"core::cmp::PartialEq",
298-
"core::ops::Add",
299-
"core::ops::AddAssign",
300-
"core::ops::BitAnd",
301-
"core::ops::BitAndAssign",
302-
"core::ops::BitOr",
303-
"core::ops::BitOrAssign",
304-
"core::ops::BitXor",
305-
"core::ops::BitXorAssign",
306-
"core::ops::Div",
307-
"core::ops::DivAssign",
308-
"core::ops::Mul",
309-
"core::ops::MulAssign",
310-
"core::ops::Rem",
311-
"core::ops::RemAssign",
312-
"core::ops::Shl",
313-
"core::ops::ShlAssign",
314-
"core::ops::Shr",
315-
"core::ops::ShrAssign",
316-
"core::ops::Sub",
317-
"core::ops::SubAssign",
318-
"core::ops::Neg",
319-
"core::ops::Not",
320-
"core::ops::Index",
321-
"core::ops::IndexMut",
322-
"core::ops::Deref",
323-
"core::ops::DerefMut"
296+
"core::borrow::BorrowMut"
324297
]
325298
----
326299
A list of full paths to traits to exclude from flyimport.
327300

328-
Traits in this list won't be suggested to be imported by flyimport for their methods. Methods from them won't be available in flyimport completion. They will still be available if in scope.
329-
330-
Note that the trait themselves can still be suggested by flyimport.
301+
Traits in this list won't have their methods suggested in completions unless the trait
302+
is in scope.
331303

332304
This setting also inherits `#rust-analyzer.completion.excludeTraits#`.
333305

334-
This setting defaults to:
335-
336-
- [`core::borrow::Borrow`](https://doc.rust-lang.org/nightly/core/borrow/trait.Borrow.html)
337-
- [`core::borrow::BorrowMut`](https://doc.rust-lang.org/nightly/core/borrow/trait.BorrowMut.html)
338-
- [`core::cmp::PartialEq`](https://doc.rust-lang.org/nightly/core/cmp/trait.PartialEq.html)
339-
- All operator traits (in [`core::ops`](https://doc.rust-lang.org/nightly/core/ops))
340-
341-
Note that if you override this setting, those traits won't be automatically inserted, so you may want to insert them manually.
342-
343306
--
344307
[[rust-analyzer.completion.autoself.enable]]rust-analyzer.completion.autoself.enable (default: `true`)::
345308
+

‎src/tools/rust-analyzer/editors/code/package.json‎

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1143,37 +1143,10 @@
11431143
"title": "completion",
11441144
"properties": {
11451145
"rust-analyzer.completion.autoimport.excludeTraits": {
1146-
"markdownDescription": "A list of full paths to traits to exclude from flyimport.\n\nTraits in this list won't be suggested to be imported by flyimport for their methods. Methods from them won't be available in flyimport completion. They will still be available if in scope.\n\nNote that the trait themselves can still be suggested by flyimport.\n\nThis setting also inherits `#rust-analyzer.completion.excludeTraits#`.\n\nThis setting defaults to:\n\n - [`core::borrow::Borrow`](https://doc.rust-lang.org/nightly/core/borrow/trait.Borrow.html)\n - [`core::borrow::BorrowMut`](https://doc.rust-lang.org/nightly/core/borrow/trait.BorrowMut.html)\n - [`core::cmp::PartialEq`](https://doc.rust-lang.org/nightly/core/cmp/trait.PartialEq.html)\n - All operator traits (in [`core::ops`](https://doc.rust-lang.org/nightly/core/ops))\n\nNote that if you override this setting, those traits won't be automatically inserted, so you may want to insert them manually.",
1146+
"markdownDescription": "A list of full paths to traits to exclude from flyimport.\n\nTraits in this list won't have their methods suggested in completions unless the trait\nis in scope.\n\nThis setting also inherits `#rust-analyzer.completion.excludeTraits#`.",
11471147
"default": [
11481148
"core::borrow::Borrow",
1149-
"core::borrow::BorrowMut",
1150-
"core::cmp::PartialEq",
1151-
"core::ops::Add",
1152-
"core::ops::AddAssign",
1153-
"core::ops::BitAnd",
1154-
"core::ops::BitAndAssign",
1155-
"core::ops::BitOr",
1156-
"core::ops::BitOrAssign",
1157-
"core::ops::BitXor",
1158-
"core::ops::BitXorAssign",
1159-
"core::ops::Div",
1160-
"core::ops::DivAssign",
1161-
"core::ops::Mul",
1162-
"core::ops::MulAssign",
1163-
"core::ops::Rem",
1164-
"core::ops::RemAssign",
1165-
"core::ops::Shl",
1166-
"core::ops::ShlAssign",
1167-
"core::ops::Shr",
1168-
"core::ops::ShrAssign",
1169-
"core::ops::Sub",
1170-
"core::ops::SubAssign",
1171-
"core::ops::Neg",
1172-
"core::ops::Not",
1173-
"core::ops::Index",
1174-
"core::ops::IndexMut",
1175-
"core::ops::Deref",
1176-
"core::ops::DerefMut"
1149+
"core::borrow::BorrowMut"
11771150
],
11781151
"type": "array",
11791152
"items": {

0 commit comments

Comments
 (0)