Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 22:24:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #6641

Browse source 
6641: Fix def map volatility with `#[cfg]` diagnostics r=jonas-schievink a=jonas-schievink

bors r+ 🤖

Co-authored-by: Jonas Schievink <jonasschievink@gmail.com>
This commit is contained in:
bors[bot] 2020-11-26 16:30:05 +00:00 committed by GitHub
commit 3a96c29028
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/hir_def/src/nameres.rs
View file

@ -287,7 +287,7 @@ mod diagnostics {
use hir_expand::diagnostics::DiagnosticSink; use hir_expand::diagnostics::DiagnosticSink;
use hir_expand::hygiene::Hygiene; use hir_expand::hygiene::Hygiene;
use hir_expand::InFile; use hir_expand::InFile;
use syntax::{ast, AstPtr, SyntaxNodePtr}; use syntax::{ast, AstPtr};
use crate::path::ModPath; use crate::path::ModPath;
use crate::{db::DefDatabase, diagnostics::*, nameres::LocalModuleId, AstId}; use crate::{db::DefDatabase, diagnostics::*, nameres::LocalModuleId, AstId};
@ -300,7 +300,7 @@ mod diagnostics {
UnresolvedImport { ast: AstId<ast::Use>, index: usize }, UnresolvedImport { ast: AstId<ast::Use>, index: usize },
UnconfiguredCode { ast: InFile<SyntaxNodePtr>, cfg: CfgExpr, opts: CfgOptions }, UnconfiguredCode { ast: AstId<ast::Item>, cfg: CfgExpr, opts: CfgOptions },
} }
#[derive(Debug, PartialEq, Eq)] #[derive(Debug, PartialEq, Eq)]
@ -341,7 +341,7 @@ mod diagnostics {
pub(super) fn unconfigured_code( pub(super) fn unconfigured_code(
container: LocalModuleId, container: LocalModuleId,
ast: InFile<SyntaxNodePtr>, ast: AstId<ast::Item>,
cfg: CfgExpr, cfg: CfgExpr,
opts: CfgOptions, opts: CfgOptions,
) -> Self { ) -> Self {
@ -399,9 +399,10 @@ mod diagnostics {
} }
DiagnosticKind::UnconfiguredCode { ast, cfg, opts } => { DiagnosticKind::UnconfiguredCode { ast, cfg, opts } => {
let item = ast.to_node(db.upcast());
sink.push(InactiveCode { sink.push(InactiveCode {
file: ast.file_id, file: ast.file_id,
node: ast.value.clone(), node: AstPtr::new(&item).into(),
cfg: cfg.clone(), cfg: cfg.clone(),
opts: opts.clone(), opts: opts.clone(),
}); });

6
crates/hir_def/src/nameres/collector.rs
View file

@ -1336,13 +1336,11 @@ impl ModCollector<'_, '_> {
fn emit_unconfigured_diagnostic(&mut self, item: ModItem, cfg: &CfgExpr) { fn emit_unconfigured_diagnostic(&mut self, item: ModItem, cfg: &CfgExpr) {
let ast_id = item.ast_id(self.item_tree); let ast_id = item.ast_id(self.item_tree);
let id_map = self.def_collector.db.ast_id_map(self.file_id);
let syntax_ptr = id_map.get(ast_id).syntax_node_ptr();
let ast_node = InFile::new(self.file_id, syntax_ptr); let ast_id = InFile::new(self.file_id, ast_id);
self.def_collector.def_map.diagnostics.push(DefDiagnostic::unconfigured_code( self.def_collector.def_map.diagnostics.push(DefDiagnostic::unconfigured_code(
self.module_id, self.module_id,
ast_node, ast_id,
cfg.clone(), cfg.clone(),
self.def_collector.cfg_options.clone(), self.def_collector.cfg_options.clone(),
)); ));

6
crates/hir_def/src/nameres/tests/incremental.rs
View file

@ -38,6 +38,9 @@ fn typing_inside_a_function_should_not_invalidate_def_map() {
fn foo() -> i32 { fn foo() -> i32 {
1 + 1 1 + 1
} }
#[cfg(never)]
fn no() {}
//- /foo/mod.rs //- /foo/mod.rs
pub mod bar; pub mod bar;
@ -53,6 +56,9 @@ fn typing_inside_a_function_should_not_invalidate_def_map() {
use E::*; use E::*;
fn foo() -> i32 { 92 } fn foo() -> i32 { 92 }
#[cfg(never)]
fn no() {}
", ",
); );
} }