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

Merge #8450

Browse Source 
8450: Don't ignore unnamed consts when looking for definitions r=Veykril a=Veykril

Fixes #8448
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2021-04-09 15:16:36 +00:00 committed by GitHub
commit 343b14f7e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/hir_def/src/child_by_source.rs
View File

@ -80,6 +80,10 @@ impl ChildBySource for ModuleId {
impl ChildBySource for ItemScope {
fn child_by_source_to(&self, db: &dyn DefDatabase, res: &mut DynMap) {
self.declarations().for_each(|item| add_module_def(db, res, item));
self.unnamed_consts().for_each(|konst| {
let src = konst.lookup(db).source(db);
res[keys::CONST].insert(src, konst);
});
self.impls().for_each(|imp| add_impl(db, res, imp));
fn add_module_def(db: &dyn DefDatabase, map: &mut DynMap, item: ModuleDefId) {

2
crates/ide_assists/src/handlers/remove_dbg.rs
View File

@ -30,7 +30,7 @@ pub(crate) fn remove_dbg(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
if new_contents.is_empty() {
match_ast! {
match it {
ast::BlockExpr(it) => {
ast::BlockExpr(_it) => {
macro_call.syntax()
.prev_sibling_or_token()
.and_then(whitespace_start)