diff options
Diffstat (limited to 'crates/hir_def/src/diagnostics.rs')
-rw-r--r-- | crates/hir_def/src/diagnostics.rs | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/crates/hir_def/src/diagnostics.rs b/crates/hir_def/src/diagnostics.rs index c9c08b01f..b221b290c 100644 --- a/crates/hir_def/src/diagnostics.rs +++ b/crates/hir_def/src/diagnostics.rs | |||
@@ -1,11 +1,19 @@ | |||
1 | //! Diagnostics produced by `hir_def`. | 1 | //! Diagnostics produced by `hir_def`. |
2 | 2 | ||
3 | use std::any::Any; | 3 | use std::any::Any; |
4 | use stdx::format_to; | ||
4 | 5 | ||
5 | use hir_expand::diagnostics::{Diagnostic, DiagnosticCode}; | 6 | use cfg::{CfgExpr, CfgOptions, DnfExpr}; |
7 | use hir_expand::diagnostics::{Diagnostic, DiagnosticCode, DiagnosticSink}; | ||
8 | use hir_expand::{HirFileId, InFile}; | ||
6 | use syntax::{ast, AstPtr, SyntaxNodePtr}; | 9 | use syntax::{ast, AstPtr, SyntaxNodePtr}; |
7 | 10 | ||
8 | use hir_expand::{HirFileId, InFile}; | 11 | use crate::{db::DefDatabase, DefWithBodyId}; |
12 | |||
13 | pub fn validate_body(db: &dyn DefDatabase, owner: DefWithBodyId, sink: &mut DiagnosticSink<'_>) { | ||
14 | let source_map = db.body_with_source_map(owner).1; | ||
15 | source_map.add_diagnostics(db, sink); | ||
16 | } | ||
9 | 17 | ||
10 | // Diagnostic: unresolved-module | 18 | // Diagnostic: unresolved-module |
11 | // | 19 | // |
@@ -87,13 +95,15 @@ impl Diagnostic for UnresolvedImport { | |||
87 | } | 95 | } |
88 | } | 96 | } |
89 | 97 | ||
90 | // Diagnostic: unconfigured-code | 98 | // Diagnostic: inactive-code |
91 | // | 99 | // |
92 | // This diagnostic is shown for code with inactive `#[cfg]` attributes. | 100 | // This diagnostic is shown for code with inactive `#[cfg]` attributes. |
93 | #[derive(Debug)] | 101 | #[derive(Debug, Clone, Eq, PartialEq)] |
94 | pub struct InactiveCode { | 102 | pub struct InactiveCode { |
95 | pub file: HirFileId, | 103 | pub file: HirFileId, |
96 | pub node: SyntaxNodePtr, | 104 | pub node: SyntaxNodePtr, |
105 | pub cfg: CfgExpr, | ||
106 | pub opts: CfgOptions, | ||
97 | } | 107 | } |
98 | 108 | ||
99 | impl Diagnostic for InactiveCode { | 109 | impl Diagnostic for InactiveCode { |
@@ -101,8 +111,14 @@ impl Diagnostic for InactiveCode { | |||
101 | DiagnosticCode("inactive-code") | 111 | DiagnosticCode("inactive-code") |
102 | } | 112 | } |
103 | fn message(&self) -> String { | 113 | fn message(&self) -> String { |
104 | // FIXME: say *why* it is configured out | 114 | let inactive = DnfExpr::new(self.cfg.clone()).why_inactive(&self.opts); |
105 | "code is inactive due to #[cfg] directives".to_string() | 115 | let mut buf = "code is inactive due to #[cfg] directives".to_string(); |
116 | |||
117 | if let Some(inactive) = inactive { | ||
118 | format_to!(buf, ": {}", inactive); | ||
119 | } | ||
120 | |||
121 | buf | ||
106 | } | 122 | } |
107 | fn display_source(&self) -> InFile<SyntaxNodePtr> { | 123 | fn display_source(&self) -> InFile<SyntaxNodePtr> { |
108 | InFile::new(self.file, self.node.clone()) | 124 | InFile::new(self.file, self.node.clone()) |