diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-03-17 07:20:28 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2021-03-17 07:20:28 +0000 |
commit | 6fcb5d772f16af0d1f62dad55fbde75072fb9e89 (patch) | |
tree | e4ddd896f9ca8ca1f99c346a49104b04bc4ca04c /crates/hir_def/src/body/diagnostics.rs | |
parent | 83e6940efb42675226adb8d2856c095b8dce36c5 (diff) | |
parent | a79b5673e8f5d1f8d569bc7c984a293a972a7bb0 (diff) |
Merge #8048
8048: Fix missing unresolved macro diagnostic in function body r=edwin0cheng a=brandondong
This was an issue I found while working on https://github.com/rust-analyzer/rust-analyzer/pull/7970.
**Reproduction:**
1. Call a non-existent macro in a function body.
```
fn main() {
foo!();
}
```
2. No diagnostics are raised. An unresolved-macro-call diagnostic is expected.
3. If the macro call is instead outside of the function body, this works as expected.
I believe this worked previously and regressed in https://github.com/rust-analyzer/rust-analyzer/pull/7805.
**Behavior prior to https://github.com/rust-analyzer/rust-analyzer/pull/7805:**
- The unresolved-macro-call diagnostic did not exist. Instead, a macro-error diagnostic would be raised with the text "could not resolve macro [path]".
- This was implemented by adding an error to the error sink (https://github.com/rust-analyzer/rust-analyzer/pull/7805/files#diff-50a326c5ae465bd9b31ee4310186380aa06e4fa1f6b41dbc0aed5bcc656a3cb8L657).
- The error was propagated through https://github.com/rust-analyzer/rust-analyzer/blob/1a82af3527e476d52410ff4dfd2fb4c57466abcb/crates/hir_def/src/body.rs#L123 eventually reaching https://github.com/rust-analyzer/rust-analyzer/blob/1a82af3527e476d52410ff4dfd2fb4c57466abcb/crates/hir_def/src/body/lower.rs#L569.
**Behavior after:**
- Instead of writing to the error sink, an UnresolvedMacro error is now returned (https://github.com/rust-analyzer/rust-analyzer/pull/7805/files#diff-50a326c5ae465bd9b31ee4310186380aa06e4fa1f6b41dbc0aed5bcc656a3cb8R631).
- The parent caller throws away the error as its function signature is `Option<MacroCallId>` (https://github.com/rust-analyzer/rust-analyzer/pull/7805/files#diff-50a326c5ae465bd9b31ee4310186380aa06e4fa1f6b41dbc0aed5bcc656a3cb8R604).
- We instead now reach the warn condition (https://github.com/rust-analyzer/rust-analyzer/blob/1a82af3527e476d52410ff4dfd2fb4c57466abcb/crates/hir_def/src/body.rs#L124) and no diagnostics are created in https://github.com/rust-analyzer/rust-analyzer/blob/1a82af3527e476d52410ff4dfd2fb4c57466abcb/crates/hir_def/src/body/lower.rs#L575.
**Fix:**
- Make sure to propagate the UnresolvedMacro error. Report the error using the new unresolved-macro-call diagnostic.
Co-authored-by: Brandon <[email protected]>
Diffstat (limited to 'crates/hir_def/src/body/diagnostics.rs')
-rw-r--r-- | crates/hir_def/src/body/diagnostics.rs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/crates/hir_def/src/body/diagnostics.rs b/crates/hir_def/src/body/diagnostics.rs index 1de7d30e2..f6992c9a8 100644 --- a/crates/hir_def/src/body/diagnostics.rs +++ b/crates/hir_def/src/body/diagnostics.rs | |||
@@ -2,13 +2,14 @@ | |||
2 | 2 | ||
3 | use hir_expand::diagnostics::DiagnosticSink; | 3 | use hir_expand::diagnostics::DiagnosticSink; |
4 | 4 | ||
5 | use crate::diagnostics::{InactiveCode, MacroError, UnresolvedProcMacro}; | 5 | use crate::diagnostics::{InactiveCode, MacroError, UnresolvedMacroCall, UnresolvedProcMacro}; |
6 | 6 | ||
7 | #[derive(Debug, Eq, PartialEq)] | 7 | #[derive(Debug, Eq, PartialEq)] |
8 | pub(crate) enum BodyDiagnostic { | 8 | pub(crate) enum BodyDiagnostic { |
9 | InactiveCode(InactiveCode), | 9 | InactiveCode(InactiveCode), |
10 | MacroError(MacroError), | 10 | MacroError(MacroError), |
11 | UnresolvedProcMacro(UnresolvedProcMacro), | 11 | UnresolvedProcMacro(UnresolvedProcMacro), |
12 | UnresolvedMacroCall(UnresolvedMacroCall), | ||
12 | } | 13 | } |
13 | 14 | ||
14 | impl BodyDiagnostic { | 15 | impl BodyDiagnostic { |
@@ -23,6 +24,9 @@ impl BodyDiagnostic { | |||
23 | BodyDiagnostic::UnresolvedProcMacro(diag) => { | 24 | BodyDiagnostic::UnresolvedProcMacro(diag) => { |
24 | sink.push(diag.clone()); | 25 | sink.push(diag.clone()); |
25 | } | 26 | } |
27 | BodyDiagnostic::UnresolvedMacroCall(diag) => { | ||
28 | sink.push(diag.clone()); | ||
29 | } | ||
26 | } | 30 | } |
27 | } | 31 | } |
28 | } | 32 | } |