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

minor: Fixup macro error kinds

Browse source
This commit is contained in:
Lukas Wirth 2025-01-09 09:37:54 +01:00
parent 32b86a8378
commit 646e96f68d
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
crates/hir-expand/src/lib.rs
View file

@ -188,6 +188,8 @@ impl fmt::Display for RenderedExpandError {
impl RenderedExpandError { impl RenderedExpandError {
const GENERAL_KIND: &str = "macro-error"; const GENERAL_KIND: &str = "macro-error";
const DISABLED: &str = "proc-macro-disabled";
const ATTR_EXP_DISABLED: &str = "attribute-expansion-disabled";
} }
impl ExpandErrorKind { impl ExpandErrorKind {
@ -196,12 +198,12 @@ impl ExpandErrorKind {
ExpandErrorKind::ProcMacroAttrExpansionDisabled => RenderedExpandError { ExpandErrorKind::ProcMacroAttrExpansionDisabled => RenderedExpandError {
message: "procedural attribute macro expansion is disabled".to_owned(), message: "procedural attribute macro expansion is disabled".to_owned(),
error: false, error: false,
kind: "proc-macros-disabled", kind: RenderedExpandError::ATTR_EXP_DISABLED,
}, },
ExpandErrorKind::MacroDisabled => RenderedExpandError { ExpandErrorKind::MacroDisabled => RenderedExpandError {
message: "proc-macro is explicitly disabled".to_owned(), message: "proc-macro is explicitly disabled".to_owned(),
error: false, error: false,
kind: "proc-macro-disabled", kind: RenderedExpandError::DISABLED,
}, },
&ExpandErrorKind::MissingProcMacroExpander(def_crate) => { &ExpandErrorKind::MissingProcMacroExpander(def_crate) => {
match db.proc_macros().get_error_for_crate(def_crate) { match db.proc_macros().get_error_for_crate(def_crate) {

6
crates/ide-diagnostics/src/handlers/macro_error.rs
View file

@ -4,13 +4,13 @@ use crate::{Diagnostic, DiagnosticCode, DiagnosticsContext, Severity};
// //
// This diagnostic is shown for macro expansion errors. // This diagnostic is shown for macro expansion errors.
// Diagnostic: proc-macros-disabled // Diagnostic: attribute-expansion-disabled
// //
// This diagnostic is shown for proc macros where proc macros have been disabled. // This diagnostic is shown for attribute proc macros when attribute expansions have been disabled.
// Diagnostic: proc-macro-disabled // Diagnostic: proc-macro-disabled
// //
// This diagnostic is shown for proc macros that has been specifically disabled via `rust-analyzer.procMacro.ignored`. // This diagnostic is shown for proc macros that have been specifically disabled via `rust-analyzer.procMacro.ignored`.
pub(crate) fn macro_error(ctx: &DiagnosticsContext<'_>, d: &hir::MacroError) -> Diagnostic { pub(crate) fn macro_error(ctx: &DiagnosticsContext<'_>, d: &hir::MacroError) -> Diagnostic {
// Use more accurate position if available. // Use more accurate position if available.
let display_range = ctx.resolve_precise_location(&d.node, d.precise_location); let display_range = ctx.resolve_precise_location(&d.node, d.precise_location);