rust-analyzer

diff --git a/crates/hir-def/src/macro_expansion_tests/mod.rs b/crates/hir-def/src/macro_expansion_tests/mod.rs
index 408d03ff71..a2d0ba3deb 100644
--- a/crates/hir-def/src/macro_expansion_tests/mod.rs
+++ b/crates/hir-def/src/macro_expansion_tests/mod.rs

@@ -22,7 +22,7 @@ use hir_expand::{

db::ExpandDatabase,

proc_macro::{ProcMacro, ProcMacroExpander, ProcMacroExpansionError, ProcMacroKind},

span_map::SpanMapRef,

- InFile, MacroCallKind, MacroFileId, MacroFileIdExt,

+ InFile, MacroCallKind, MacroFileId, MacroFileIdExt, MacroKind,

};

use intern::Symbol;

use itertools::Itertools;

@@ -211,7 +211,11 @@ pub fn identity_when_valid(_attr: TokenStream, item: TokenStream) -> TokenStream

if let Some(src) = src {

if let Some(file_id) = src.file_id.macro_file() {

- if file_id.is_attr_macro(&db) || file_id.is_custom_derive(&db) {

+ if let MacroKind::Derive

+ | MacroKind::DeriveBuiltIn

+ | MacroKind::Attr

+ | MacroKind::AttrBuiltIn = file_id.kind(&db)

+ {

let call = file_id.call_node(&db);

let mut show_spans = false;

let mut show_ctxt = false;

@@ -236,7 +240,7 @@ pub fn identity_when_valid(_attr: TokenStream, item: TokenStream) -> TokenStream

for impl_id in def_map[local_id].scope.impls() {

let src = impl_id.lookup(&db).source(&db);

if let Some(macro_file) = src.file_id.macro_file() {

- if macro_file.is_builtin_derive(&db) {

+ if let MacroKind::DeriveBuiltIn | MacroKind::Derive = macro_file.kind(&db) {

let pp = pretty_print_macro_expansion(

src.value.syntax().clone(),

db.span_map(macro_file.into()).as_ref(),

diff --git a/crates/hir-expand/src/files.rs b/crates/hir-expand/src/files.rs
index 13ddb0d4ac..f3bcc77268 100644
--- a/crates/hir-expand/src/files.rs
+++ b/crates/hir-expand/src/files.rs

@@ -10,7 +10,7 @@ use syntax::{AstNode, AstPtr, SyntaxNode, SyntaxNodePtr, SyntaxToken, TextRange,

use crate::{

db::{self, ExpandDatabase},

- map_node_range_up, map_node_range_up_rooted, span_for_offset, MacroFileIdExt,

+ map_node_range_up, map_node_range_up_rooted, span_for_offset, MacroFileIdExt, MacroKind,

};

/// `InFile<T>` stores a value of `T` inside a particular file/syntax tree.

@@ -276,7 +276,11 @@ impl<SN: Borrow<SyntaxNode>> InFile<SN> {

HirFileIdRepr::FileId(file_id) => {

return Some(InRealFile { file_id, value: self.value.borrow().clone() })

}

- HirFileIdRepr::MacroFile(m) if m.is_attr_macro(db) => m,

+ HirFileIdRepr::MacroFile(m)

+ if matches!(m.kind(db), MacroKind::Attr | MacroKind::AttrBuiltIn) =>

+ {

+ m

+ }

_ => return None,

};

@@ -453,7 +457,7 @@ impl<N: AstNode> InFile<N> {

}

HirFileIdRepr::MacroFile(m) => m,

};

- if !file_id.is_attr_macro(db) {

+ if !matches!(file_id.kind(db), MacroKind::Attr | MacroKind::AttrBuiltIn) {

return None;

}

diff --git a/crates/hir-expand/src/lib.rs b/crates/hir-expand/src/lib.rs
index 2c664029f6..41603e3c92 100644
--- a/crates/hir-expand/src/lib.rs
+++ b/crates/hir-expand/src/lib.rs

@@ -416,6 +416,24 @@ impl HirFileIdExt for HirFileId {

}

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

+pub enum MacroKind {

+ /// `macro_rules!` or Macros 2.0 macro.

+ Declarative,

+ /// A built-in function-like macro.

+ DeclarativeBuiltIn,

+ /// A custom derive.

+ Derive,

+ /// A builtin-in derive.

+ DeriveBuiltIn,

+ /// A procedural attribute macro.

+ Attr,

+ /// A built-in attribute macro.

+ AttrBuiltIn,

+ /// A function-like procedural macro.

+ ProcMacro,

pub trait MacroFileIdExt {

fn is_env_or_option_env(&self, db: &dyn ExpandDatabase) -> bool;

fn is_include_like_macro(&self, db: &dyn ExpandDatabase) -> bool;

@@ -427,15 +445,12 @@ pub trait MacroFileIdExt {

fn expansion_info(self, db: &dyn ExpandDatabase) -> ExpansionInfo;

- fn is_builtin_derive(&self, db: &dyn ExpandDatabase) -> bool;

- fn is_custom_derive(&self, db: &dyn ExpandDatabase) -> bool;

+ fn kind(&self, db: &dyn ExpandDatabase) -> MacroKind;

/// Return whether this file is an include macro

fn is_include_macro(&self, db: &dyn ExpandDatabase) -> bool;

fn is_eager(&self, db: &dyn ExpandDatabase) -> bool;

- /// Return whether this file is an attr macro

- fn is_attr_macro(&self, db: &dyn ExpandDatabase) -> bool;

/// Return whether this file is the pseudo expansion of the derive attribute.

/// See [`crate::builtin_attr_macro::derive_attr_expand`].

@@ -468,18 +483,18 @@ impl MacroFileIdExt for MacroFileId {

ExpansionInfo::new(db, self)

}

- fn is_custom_derive(&self, db: &dyn ExpandDatabase) -> bool {

- matches!(

- db.lookup_intern_macro_call(self.macro_call_id).def.kind,

- MacroDefKind::ProcMacro(_, _, ProcMacroKind::CustomDerive)

- )

- }

- fn is_builtin_derive(&self, db: &dyn ExpandDatabase) -> bool {

- matches!(

- db.lookup_intern_macro_call(self.macro_call_id).def.kind,

- MacroDefKind::BuiltInDerive(..)

- )

+ fn kind(&self, db: &dyn ExpandDatabase) -> MacroKind {

+ match db.lookup_intern_macro_call(self.macro_call_id).def.kind {

+ MacroDefKind::Declarative(..) => MacroKind::Declarative,

+ MacroDefKind::BuiltIn(..) | MacroDefKind::BuiltInEager(..) => {

+ MacroKind::DeclarativeBuiltIn

+ }

+ MacroDefKind::BuiltInDerive(..) => MacroKind::DeriveBuiltIn,

+ MacroDefKind::ProcMacro(_, _, ProcMacroKind::CustomDerive) => MacroKind::Derive,

+ MacroDefKind::ProcMacro(_, _, ProcMacroKind::Attr) => MacroKind::Attr,

+ MacroDefKind::ProcMacro(_, _, ProcMacroKind::Bang) => MacroKind::ProcMacro,

+ MacroDefKind::BuiltInAttr(..) => MacroKind::AttrBuiltIn,

+ }

}

fn is_include_macro(&self, db: &dyn ExpandDatabase) -> bool {

@@ -507,13 +522,6 @@ impl MacroFileIdExt for MacroFileId {

}

- fn is_attr_macro(&self, db: &dyn ExpandDatabase) -> bool {

- matches!(

- db.lookup_intern_macro_call(self.macro_call_id).def.kind,

- MacroDefKind::BuiltInAttr(..) | MacroDefKind::ProcMacro(_, _, ProcMacroKind::Attr)

- )

- }

fn is_derive_attr_pseudo_expansion(&self, db: &dyn ExpandDatabase) -> bool {

let loc = db.lookup_intern_macro_call(self.macro_call_id);

loc.def.is_attribute_derive()

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 727d31cffb..55448d4ae8 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs

@@ -142,7 +142,7 @@ pub use {

name::Name,

prettify_macro_expansion,

proc_macro::{ProcMacros, ProcMacrosBuilder},

- tt, ExpandResult, HirFileId, HirFileIdExt, MacroFileId, MacroFileIdExt,

+ tt, ExpandResult, HirFileId, HirFileIdExt, MacroFileId, MacroFileIdExt, MacroKind,

hir_ty::{

consteval::ConstEvalError,

@@ -699,7 +699,10 @@ impl Module {

let source_map = tree_source_maps.impl_(loc.id.value).item();

let node = &tree[loc.id.value];

let file_id = loc.id.file_id();

- if file_id.macro_file().is_some_and(|it| it.is_builtin_derive(db.upcast())) {

+ if file_id

+ .macro_file()

+ .is_some_and(|it| it.kind(db.upcast()) == MacroKind::DeriveBuiltIn)

+ {

// these expansion come from us, diagnosing them is a waste of resources

// FIXME: Once we diagnose the inputs to builtin derives, we should at least extract those diagnostics somehow

continue;

@@ -3050,20 +3053,6 @@ impl BuiltinType {

}

#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

-pub enum MacroKind {

- /// `macro_rules!` or Macros 2.0 macro.

- Declarative,

- /// A built-in or custom derive.

- Derive,

- /// A built-in function-like macro.

- BuiltIn,

- /// A procedural attribute macro.

- Attr,

- /// A function-like procedural macro.

- ProcMacro,

-#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]

pub struct Macro {

pub(crate) id: MacroId,

}

@@ -3093,15 +3082,19 @@ impl Macro {

match self.id {

MacroId::Macro2Id(it) => match it.lookup(db.upcast()).expander {

MacroExpander::Declarative => MacroKind::Declarative,

- MacroExpander::BuiltIn(_) | MacroExpander::BuiltInEager(_) => MacroKind::BuiltIn,

- MacroExpander::BuiltInAttr(_) => MacroKind::Attr,

- MacroExpander::BuiltInDerive(_) => MacroKind::Derive,

+ MacroExpander::BuiltIn(_) | MacroExpander::BuiltInEager(_) => {

+ MacroKind::DeclarativeBuiltIn

+ }

+ MacroExpander::BuiltInAttr(_) => MacroKind::AttrBuiltIn,

+ MacroExpander::BuiltInDerive(_) => MacroKind::DeriveBuiltIn,

MacroId::MacroRulesId(it) => match it.lookup(db.upcast()).expander {

MacroExpander::Declarative => MacroKind::Declarative,

- MacroExpander::BuiltIn(_) | MacroExpander::BuiltInEager(_) => MacroKind::BuiltIn,

- MacroExpander::BuiltInAttr(_) => MacroKind::Attr,

- MacroExpander::BuiltInDerive(_) => MacroKind::Derive,

+ MacroExpander::BuiltIn(_) | MacroExpander::BuiltInEager(_) => {

+ MacroKind::DeclarativeBuiltIn

+ }

+ MacroExpander::BuiltInAttr(_) => MacroKind::AttrBuiltIn,

+ MacroExpander::BuiltInDerive(_) => MacroKind::DeriveBuiltIn,

MacroId::ProcMacroId(it) => match it.lookup(db.upcast()).kind {

ProcMacroKind::CustomDerive => MacroKind::Derive,

@@ -3112,10 +3105,10 @@ impl Macro {

}

pub fn is_fn_like(&self, db: &dyn HirDatabase) -> bool {

- match self.kind(db) {

- MacroKind::Declarative | MacroKind::BuiltIn | MacroKind::ProcMacro => true,

- MacroKind::Attr | MacroKind::Derive => false,

- }

+ matches!(

+ self.kind(db),

+ MacroKind::Declarative | MacroKind::DeclarativeBuiltIn | MacroKind::ProcMacro

+ )

}

pub fn is_builtin_derive(&self, db: &dyn HirDatabase) -> bool {

@@ -3155,11 +3148,11 @@ impl Macro {

}

pub fn is_attr(&self, db: &dyn HirDatabase) -> bool {

- matches!(self.kind(db), MacroKind::Attr)

+ matches!(self.kind(db), MacroKind::Attr | MacroKind::AttrBuiltIn)

}

pub fn is_derive(&self, db: &dyn HirDatabase) -> bool {

- matches!(self.kind(db), MacroKind::Derive)

+ matches!(self.kind(db), MacroKind::Derive | MacroKind::DeriveBuiltIn)

}

diff --git a/crates/ide-db/src/lib.rs b/crates/ide-db/src/lib.rs
index 3a29232d33..96115eee6d 100644
--- a/crates/ide-db/src/lib.rs
+++ b/crates/ide-db/src/lib.rs

@@ -252,10 +252,10 @@ pub enum SymbolKind {

impl From<hir::MacroKind> for SymbolKind {

fn from(it: hir::MacroKind) -> Self {

match it {

- hir::MacroKind::Declarative | hir::MacroKind::BuiltIn => SymbolKind::Macro,

+ hir::MacroKind::Declarative | hir::MacroKind::DeclarativeBuiltIn => SymbolKind::Macro,

hir::MacroKind::ProcMacro => SymbolKind::ProcMacro,

- hir::MacroKind::Derive => SymbolKind::Derive,

- hir::MacroKind::Attr => SymbolKind::Attribute,

+ hir::MacroKind::Derive | hir::MacroKind::DeriveBuiltIn => SymbolKind::Derive,

+ hir::MacroKind::Attr | hir::MacroKind::AttrBuiltIn => SymbolKind::Attribute,

}

diff --git a/crates/ide-db/src/search.rs b/crates/ide-db/src/search.rs
index 7963e8ae4f..02cd8b8bdf 100644
--- a/crates/ide-db/src/search.rs
+++ b/crates/ide-db/src/search.rs

@@ -373,7 +373,9 @@ impl Definition {

SearchScope::krate(db, module.krate())

}

- hir::MacroKind::BuiltIn => SearchScope::crate_graph(db),

+ hir::MacroKind::AttrBuiltIn

+ | hir::MacroKind::DeriveBuiltIn

+ | hir::MacroKind::DeclarativeBuiltIn => SearchScope::crate_graph(db),

hir::MacroKind::Derive | hir::MacroKind::Attr | hir::MacroKind::ProcMacro => {

SearchScope::reverse_dependencies(db, module.krate())

}

diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index d88f7c5033..8d2ca33bf2 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs

@@ -635,12 +635,13 @@ fn filename_and_frag_for_def(

}

Definition::Macro(mac) => match mac.kind(db) {

hir::MacroKind::Declarative

- | hir::MacroKind::BuiltIn

+ | hir::MacroKind::AttrBuiltIn

+ | hir::MacroKind::DeclarativeBuiltIn

| hir::MacroKind::Attr

| hir::MacroKind::ProcMacro => {

format!("macro.{}.html", mac.name(db).as_str())

}

- hir::MacroKind::Derive => {

+ hir::MacroKind::Derive | hir::MacroKind::DeriveBuiltIn => {

format!("derive.{}.html", mac.name(db).as_str())

}

diff --git a/crates/ide/src/moniker.rs b/crates/ide/src/moniker.rs
index 66ea49a98a..25d12a4c0b 100644
--- a/crates/ide/src/moniker.rs
+++ b/crates/ide/src/moniker.rs

@@ -184,11 +184,11 @@ pub(crate) fn def_to_kind(db: &RootDatabase, def: Definition) -> SymbolInformati

match def {

Definition::Macro(it) => match it.kind(db) {

- MacroKind::Declarative => Macro,

- MacroKind::Derive => Attribute,

- MacroKind::BuiltIn => Macro,

- MacroKind::Attr => Attribute,

- MacroKind::ProcMacro => Macro,

+ MacroKind::Derive

+ | MacroKind::DeriveBuiltIn

+ | MacroKind::AttrBuiltIn

+ | MacroKind::Attr => Attribute,

+ MacroKind::Declarative | MacroKind::DeclarativeBuiltIn | MacroKind::ProcMacro => Macro,

Definition::Field(..) | Definition::TupleField(..) => Field,

Definition::Module(..) | Definition::Crate(..) => Module,

diff --git a/crates/ide/src/syntax_highlighting.rs b/crates/ide/src/syntax_highlighting.rs
index 6c5e81ae66..1ce42205d5 100644
--- a/crates/ide/src/syntax_highlighting.rs
+++ b/crates/ide/src/syntax_highlighting.rs

@@ -14,7 +14,7 @@ mod tests;

use std::ops::ControlFlow;

-use hir::{InFile, InRealFile, Name, Semantics};

+use hir::{InFile, InRealFile, MacroFileIdExt, MacroKind, Name, Semantics};

use ide_db::{FxHashMap, Ranker, RootDatabase, SymbolKind};

use span::EditionedFileId;

use syntax::{

@@ -253,8 +253,6 @@ fn traverse(

// FIXME: these are not perfectly accurate, we determine them by the real file's syntax tree

// an attribute nested in a macro call will not emit `inside_attribute`

let mut inside_attribute = false;

- let mut inside_macro_call = false;

- let mut inside_proc_macro_call = false;

// Walk all nodes, keeping track of whether we are inside a macro or not.

// If in macro, expand it first and highlight the expanded code.

@@ -291,11 +289,6 @@ fn traverse(

ast::Item::Fn(_) | ast::Item::Const(_) | ast::Item::Static(_) => {

bindings_shadow_count.clear()

}

- ast::Item::MacroCall(ref macro_call) => {

- inside_macro_call = true;

- inside_proc_macro_call =

- sema.is_proc_macro_call(InFile::new(file_id.into(), macro_call));

- }

_ => (),

}

@@ -330,10 +323,6 @@ fn traverse(

{

attr_or_derive_item = None;

}

- Some(ast::Item::MacroCall(_)) => {

- inside_macro_call = false;

- inside_proc_macro_call = false;

- }

_ => (),

}

@@ -375,17 +364,17 @@ fn traverse(

let descended_element = if in_macro {

// Attempt to descend tokens into macro-calls.

match element {

- NodeOrToken::Token(token) => descend_token(sema, file_id, token),

- n => n,

+ NodeOrToken::Token(token) => descend_token(sema, InRealFile::new(file_id, token)),

+ n => InFile::new(file_id.into(), n),

}

} else {

- element

+ InFile::new(file_id.into(), element)

};

// string highlight injections, note this does not use the descended element as proc-macros

// can rewrite string literals which invalidates our indices

if let (Some(original_token), Some(descended_token)) =

- (original_token, descended_element.as_token())

+ (original_token, descended_element.value.as_token())

{

let control_flow = string_injections(

hl,

@@ -401,7 +390,7 @@ fn traverse(

}

- let element = match descended_element {

+ let element = match descended_element.value {

NodeOrToken::Node(name_like) => {

let hl = highlight::name_like(

sema,

@@ -437,8 +426,9 @@ fn traverse(

if inside_attribute {

highlight |= HlMod::Attribute

}

- if inside_macro_call && tt_level > 0 {

- if inside_proc_macro_call {

+ if let Some(m) = descended_element.file_id.macro_file() {

+ if let MacroKind::ProcMacro | MacroKind::Attr | MacroKind::Derive = m.kind(sema.db)

+ {

highlight |= HlMod::ProcMacro

}

highlight |= HlMod::Macro

@@ -506,20 +496,18 @@ fn string_injections(

fn descend_token(

sema: &Semantics<'_, RootDatabase>,

- file_id: EditionedFileId,

- token: SyntaxToken,

-) -> NodeOrToken<ast::NameLike, SyntaxToken> {

- if token.kind() == COMMENT {

- return NodeOrToken::Token(token);

+ token: InRealFile<SyntaxToken>,

+) -> InFile<NodeOrToken<ast::NameLike, SyntaxToken>> {

+ if token.value.kind() == COMMENT {

+ return token.map(NodeOrToken::Token).into();

}

- let ranker = Ranker::from_token(&token);

+ let ranker = Ranker::from_token(&token.value);

let mut t = None;

let mut r = 0;

- sema.descend_into_macros_breakable(InRealFile::new(file_id, token.clone()), |tok, _ctx| {

+ sema.descend_into_macros_breakable(token.clone(), |tok, _ctx| {

// FIXME: Consider checking ctx transparency for being opaque?

- let tok = tok.value;

- let my_rank = ranker.rank_token(&tok);

+ let my_rank = ranker.rank_token(&tok.value);

if my_rank >= Ranker::MAX_RANK {

// a rank of 0b1110 means that we have found a maximally interesting

@@ -544,8 +532,8 @@ fn descend_token(

ControlFlow::Continue(())

});

- let token = t.unwrap_or(token);

- match token.parent().and_then(ast::NameLike::cast) {

+ let token = t.unwrap_or_else(|| token.into());

+ token.map(|token| match token.parent().and_then(ast::NameLike::cast) {

// Remap the token into the wrapping single token nodes

Some(parent) => match (token.kind(), parent.syntax().kind()) {

(T![self] | T![ident], NAME | NAME_REF) => NodeOrToken::Node(parent),

@@ -555,7 +543,7 @@ fn descend_token(

_ => NodeOrToken::Token(token),

None => NodeOrToken::Token(token),

- }

+ })

}

fn filter_by_config(highlight: &mut Highlight, config: HighlightConfig) -> bool {

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_asm.html b/crates/ide/src/syntax_highlighting/test_data/highlight_asm.html
index 15a6386aa3..2bc22f960b 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_asm.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_asm.html

@@ -49,26 +49,26 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

unsafe {

let foo = 1;

let mut o = 0;

- core::arch::asm!(

+ core::arch::asm!(

"%input = OpLoad _ {0}",

concat!("%result = ", "bar", " _ %input"),

"OpStore {1} %result",

in(reg) &foo,

in(reg) &mut o,

- );

+ );

let thread_id: usize;

mov {0}, gs:[0x30]

mov {0}, [{0}+0x48]

- ", out(reg) thread_id, options(pure, readonly, nostack));

+ ", out(reg) thread_id, options(pure, readonly, nostack));

static UNMAP_BASE: usize;

const MEM_RELEASE: usize;

static VirtualFree: usize;

const OffPtr: usize;

const OffFn: usize;

push {free_type}

push {free_size}

push {base}

@@ -92,7 +92,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

base = sym UNMAP_BASE,

options(noreturn),

- );

+ );

}

// taken from https://github.com/rust-embedded/cortex-m/blob/47921b51f8b960344fcfa1255a50a0d19efcde6d/cortex-m/src/asm.rs#L254-L274

@@ -101,19 +101,19 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

// Ensure thumb mode is set.

let rv = (rv as u32) | 1;

let msp = msp as u32;

"mrs {tmp}, CONTROL",

"bics {tmp}, {spsel}",

"msr CONTROL, {tmp}",

"isb",

"msr MSP, {msp}",

"bx {rv}",

- // `out(reg) _` is not permitted in a `noreturn` asm! call,

- // so instead use `in(reg) 0` and don't restore it afterwards.

+ // `out(reg) _` is not permitted in a `noreturn` asm! call,

+ // so instead use `in(reg) 0` and don't restore it afterwards.

tmp = in(reg) 0,

spsel = in(reg) 2,

msp = in(reg) msp,

rv = in(reg) rv,

options(noreturn, nomem, nostack),

- );

+ );

}</code></pre> \ No newline at end of file

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html b/crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html
index 485d44f97e..e1d51dc0b7 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_attributes.html

@@ -45,20 +45,20 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

.invalid_escape_sequence { color: #FC5555; text-decoration: wavy underline; }

.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }

</style>

-<pre><code>#[allow(dead_code)]

-#[rustfmt::skip]

+<pre><code>#[allow(dead_code)]

+#[rustfmt::skip]

#[proc_macros::identity]

-#[derive(Default)]

+#[derive(Default)]

/// This is a doc comment

// This is a normal comment

/// This is a doc comment

-#[derive(Copy)]

+#[derive(Copy)]

// This is another normal comment

/// This is another doc comment

// This is another normal comment

-#[derive(Copy, Unresolved)]

+#[derive(Copy, Unresolved)]

// The reason for these being here is to test AttrIds

-enum Foo {

- #[default]

- Bar

-}</code></pre> \ No newline at end of file

+enum Foo {

+ #[default]

+ Bar

+}</code></pre> \ No newline at end of file

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_block_mod_items.html b/crates/ide/src/syntax_highlighting/test_data/highlight_block_mod_items.html
index c6eab90e42..af29af3f03 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_block_mod_items.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_block_mod_items.html

@@ -53,9 +53,9 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

};

}

fn main() {

- foo!(Foo);

+ foo!(Foo);

mod module {

- foo!(Bar);

+ foo!(Bar);

fn func(_: y::Bar) {

mod inner {

struct Innerest<const C: usize> { field: [(); {C}] }

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_const.html b/crates/ide/src/syntax_highlighting/test_data/highlight_const.html
index 96cdb532dd..6d8f6b3c6e 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_const.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_const.html

@@ -57,7 +57,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

const {

const || {}

}

- id!(

+ id!(

CONST_ITEM;

CONST_PARAM;

const {

@@ -65,7 +65,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

};

&raw const ();

const

- );

+ );

().assoc_const_method();

}

trait ConstTrait {

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
index 5b5c51a363..263e4545fb 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html

@@ -105,7 +105,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

/// let foo = Foo::new();

///

/// // calls bar on foo

- /// assert!(foo.bar());

+ /// assert!(foo.bar());

///

/// let bar = foo.bar || Foo::bar;

///

@@ -157,7 +157,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

/// ```

/// macro_rules! noop { ($expr:expr) => { $expr }}

-/// noop!(1);

+/// noop!(1);

/// ```

macro_rules! noop {

($expr:expr) => {

@@ -177,7 +177,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

///

#[cfg_attr(feature = "alloc", doc = "```rust")]

#[cfg_attr(not(feature = "alloc"), doc = "```ignore")]

-/// let _ = example(&alloc::vec![1, 2, 3]);

+/// let _ = example(&alloc::vec![1, 2, 3]);

/// ```

pub fn mix_and_match() {}

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
index b5e950ffc2..eb532a5639 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_general.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_general.html

@@ -78,7 +78,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

use self::FooCopy::{self as BarCopy};

-#[derive(Copy)]

+#[derive(Copy)]

struct FooCopy {

x: u32,

}

@@ -170,7 +170,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

impl<T> Option<T> {

fn and<U>(self, other: Option<U>) -> Option<(T, U)> {

match other {

- None => unimplemented!(),

+ None => unimplemented!(),

Nope => Nope,

}

@@ -184,7 +184,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

async fn async_main() {

let f1 = learn_and_sing();

let f2 = dance();

- futures::join!(f1, f2);

+ futures::join!(f1, f2);

}

fn use_foo_items() {

@@ -196,7 +196,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

let control_flow = foo::identity(foo::ControlFlow::Continue);

if control_flow.should_die() {

- foo::die!();

+ foo::die!();

}

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
index 5fbed35192..1f9422161d 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_injection.html

@@ -51,7 +51,7 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

fixture(r#"

trait Foo {

fn foo() {

- println!("2 + 2 = {}", 4);

+ println!("2 + 2 = {}", 4);

}

}"#

);

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_issue_18089.html b/crates/ide/src/syntax_highlighting/test_data/highlight_issue_18089.html
index 06817af1b1..a846addba3 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_issue_18089.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_issue_18089.html

@@ -46,8 +46,8 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }

</style>

<pre><code>fn main() {

- template!(template);

+ template!(template);

}

#[proc_macros::issue_18089]

-fn template() {}</code></pre> \ No newline at end of file

+fn template() {}</code></pre> \ No newline at end of file

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2015.html b/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2015.html
index 2d3407dbcd..4d4d03dba3 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2015.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2015.html

@@ -59,16 +59,16 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

struct __ where Self:;

fn __(_: Self) {}

-void!(Self);

+void!(Self);

// edition dependent

-void!(try async await gen);

+void!(try async await gen);

// edition and context dependent

-void!(dyn);

+void!(dyn);

// builtin custom syntax

-void!(builtin offset_of format_args asm);

+void!(builtin offset_of format_args asm);

// contextual

-void!(macro_rules, union, default, raw, auto, yeet);

+void!(macro_rules, union, default, raw, auto, yeet);

// reserved

-void!(abstract become box do final macro override priv typeof unsized virtual yield);

-void!('static 'self 'unsafe)</code></pre> \ No newline at end of file

+void!(abstract become box do final macro override priv typeof unsized virtual yield);

+void!('static 'self 'unsafe)</code></pre> \ No newline at end of file

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2018.html b/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2018.html
index f8eb5d068a..a199a7ccb4 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2018.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2018.html

@@ -59,16 +59,16 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

// edition dependent

-void!(try async await gen);

+void!(try async await gen);

// edition and context dependent

-void!(dyn);

+void!(dyn);

// builtin custom syntax

// contextual

// reserved

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2021.html b/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2021.html
index f8eb5d068a..a199a7ccb4 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2021.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2021.html

@@ -59,16 +59,16 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

// edition dependent

// edition and context dependent

// builtin custom syntax

// contextual

// reserved

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2024.html b/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2024.html
index fca8401706..58a95f199d 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2024.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2024.html

@@ -59,16 +59,16 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

// edition dependent

-void!(try async await gen);

+void!(try async await gen);

// edition and context dependent

// builtin custom syntax

// contextual

// reserved

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_macros.html b/crates/ide/src/syntax_highlighting/test_data/highlight_macros.html
index f640a5e6ca..f224435e96 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_macros.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_macros.html

@@ -47,21 +47,21 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

</style>

<pre><code>use proc_macros::{mirror, identity, DeriveIdentity};

-mirror! {

+mirror! {

{

,i32 :x pub

,i32 :y pub

} Foo struct

-}

+}

macro_rules! def_fn {

($($tt:tt)*) => {$($tt)*}

}

-def_fn! {

+def_fn! {

fn bar() -> u32 {

100

}

-}

+}

macro_rules! dont_color_me_braces {

() => {0}

@@ -100,16 +100,16 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

};

}

-include!(concat!("foo/", "foo.rs"));

+include!(concat!("foo/", "foo.rs"));

struct S<T>(T);

fn main() {

struct TestLocal;

// regression test, TestLocal here used to not resolve

- let _: S<id![TestLocal]>;

+ let _: S<id![TestLocal]>;

- dont_color_me_braces!();

- noop!(noop!(1));

+ dont_color_me_braces!();

+ noop!(noop!(1));

}

</code></pre> \ No newline at end of file

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
index 1794d7dbfe..539c74f6b5 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html

@@ -99,86 +99,86 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

let a = b'\xFF';

// from https://doc.rust-lang.org/std/fmt/index.html

- println!("Hello"); // => "Hello"

- println!("Hello, {}!", "world"); // => "Hello, world!"

- println!("The number is {}", 1); // => "The number is 1"

- println!("{1} {} {0} {}", 1, 2); // => "2 1 1 2"

- println!("{a} {c} {b}", a="a", b='b', c=3); // => "a 3 b"

- println!("Hello {0} is {1:.5}", "x", 0.01);

- println!("Hello {1} is {2:.0$}", 5, "x", 0.01);

- println!("Hello {0} is {2:.1$}", "x", 5, 0.01);

- println!("Hello {} is {:.*}", "x", 5, 0.01);

- println!("Hello {} is {2:.*}", "x", 5, 0.01);

- println!("Hello {} is {number:.prec$}", "x", prec = 5, number = 0.01);

- println!("{}, `{name:.*}` has 3 fractional digits", "Hello", 3, name=1234.56);

- println!("{}, `{name:.*}` has 3 characters", "Hello", 3, name="1234.56");

- println!("{}, `{name:>8.*}` has 3 right-aligned characters", "Hello", 3, name="1234.56");

+ println!("Hello"); // => "Hello"

+ println!("Hello, {}!", "world"); // => "Hello, world!"

+ println!("The number is {}", 1); // => "The number is 1"

+ println!("{1} {} {0} {}", 1, 2); // => "2 1 1 2"

+ println!("{a} {c} {b}", a="a", b='b', c=3); // => "a 3 b"

+ println!("Hello {0} is {1:.5}", "x", 0.01);

+ println!("Hello {1} is {2:.0$}", 5, "x", 0.01);

+ println!("Hello {0} is {2:.1$}", "x", 5, 0.01);

+ println!("Hello {} is {:.*}", "x", 5, 0.01);

+ println!("Hello {} is {2:.*}", "x", 5, 0.01);

+ println!("Hello {} is {number:.prec$}", "x", prec = 5, number = 0.01);

+ println!("{}, `{name:.*}` has 3 fractional digits", "Hello", 3, name=1234.56);

+ println!("{}, `{name:.*}` has 3 characters", "Hello", 3, name="1234.56");

+ println!("{}, `{name:>8.*}` has 3 right-aligned characters", "Hello", 3, name="1234.56");

let _ = "{}"

let _ = "{{}}";

- println!(r"Hello, {}!", "world");

+ println!(r"Hello, {}!", "world");

// escape sequences

- println!("\u{48}\x65\x6C\x6C\x6F World");

+ println!("\u{48}\x65\x6C\x6C\x6F World");

let _ = "\x28\x28\x00\x63\xFF\u{FF}\n"; // invalid non-UTF8 escape sequences

let _ = b"\x28\x28\x00\x63\xFF\u{FF}\n"; // valid bytes, invalid unicodes

let _ = c"\u{FF}\xFF"; // valid bytes, valid unicodes

let backslash = r"\\";

- panic!("{}", 0);

- panic!("more {}", 1);

- assert!(true, "{}", 1);

- assert!(true, "{} asdasd", 1);

- toho!("{}fmt", 0);

+ panic!("{}", 0);

+ panic!("more {}", 1);

+ assert!(true, "{}", 1);

+ assert!(true, "{} asdasd", 1);

+ toho!("{}fmt", 0);

let i: u64 = 3;

let o: u64;

"mov {0}, {1}",

"add {0}, 5",

out(reg) o,

in(reg) i,

- );

+ );

const CONSTANT: () = ():

let mut m = ();

- format_args!(concat!("{}"), "{}");

- format_args!("{} {} {} {} {} {} {backslash} {CONSTANT} {m}", backslash, format_args!("{}", 0), foo, "bar", toho!(), backslash);

- reuse_twice!("{backslash}");

+ format_args!(concat!("{}"), "{}");

+ format_args!("{} {} {} {} {} {} {backslash} {CONSTANT} {m}", backslash, format_args!("{}", 0), foo, "bar", toho!(), backslash);

+ reuse_twice!("{backslash}");

}</code></pre> \ No newline at end of file

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
index d9beac3089..9a46d9f402 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_unsafe.html

@@ -92,13 +92,13 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd

let x = &5 as *const _ as *const usize;

let u = Union { b: 0 };

- id! {

+ id! {

unsafe { unsafe_deref!() }

- };

+ };

unsafe {

- unsafe_deref!();

- id! { unsafe_deref!() };

+ unsafe_deref!();

+ id! { unsafe_deref!() };

// unsafe fn and method calls

unsafe_fn();