rust-analyzer

diff --git a/crates/hir-ty/src/tests/macros.rs b/crates/hir-ty/src/tests/macros.rs
index 83aceec981..10ab6d3ff8 100644
--- a/crates/hir-ty/src/tests/macros.rs
+++ b/crates/hir-ty/src/tests/macros.rs

@@ -1413,7 +1413,7 @@ fn asm_unit() {

r#"

//- minicore: asm

fn unit() {

- asm!("")

+ core::arch::asm!("")

}

"#,

);

@@ -1425,7 +1425,7 @@ fn asm_no_return() {

r#"

//- minicore: asm

fn unit() -> ! {

- asm!("", options(noreturn))

+ core::arch::asm!("", options(noreturn))

}

"#,

);

@@ -1440,7 +1440,7 @@ fn main() {

unsafe {

let foo = 1;

let mut o = 0;

- asm!(

+ core::arch::asm!(

"%input = OpLoad _ {0}",

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

"OpStore {1} %result",

@@ -1450,7 +1450,7 @@ fn main() {

let thread_id: usize;

- asm!("

+ core::arch::asm!("

mov {0}, gs:[0x30]

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

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

@@ -1460,7 +1460,7 @@ fn main() {

static VirtualFree: usize;

const OffPtr: usize;

const OffFn: usize;

- asm!("

+ core::arch::asm!("

push {free_type}

push {free_size}

push {base}

@@ -1490,16 +1490,16 @@ fn main() {

"#,

expect![[r#"

!0..122 'builti...muto,)': ()

- !0..190 'builti...tack))': ()

+ !0..136 'builti...tack))': ()

!0..449 'builti...urn),)': !

- 10..1254 '{ ... } }': ()

- 16..1252 'unsafe... }': ()

+ 10..1236 '{ ... } }': ()

+ 16..1234 'unsafe... }': ()

37..40 'foo': i32

43..44 '1': i32

58..63 'mut o': i32

66..67 '0': i32

- 281..282 'o': i32

- 296..305 'thread_id': usize

+ 293..294 'o': i32

+ 308..317 'thread_id': usize

"#]],

)

}

diff --git a/crates/ide-completion/src/item.rs b/crates/ide-completion/src/item.rs
index f8c8b12bd2..8c97ebd550 100644
--- a/crates/ide-completion/src/item.rs
+++ b/crates/ide-completion/src/item.rs

@@ -360,6 +360,7 @@ impl CompletionItemKind {

SymbolKind::Field => "fd",

SymbolKind::Function => "fn",

SymbolKind::Impl => "im",

+ SymbolKind::InlineAsmRegOrRegClass => "ar",

SymbolKind::Label => "lb",

SymbolKind::LifetimeParam => "lt",

SymbolKind::Local => "lc",

diff --git a/crates/ide-db/src/defs.rs b/crates/ide-db/src/defs.rs
index 5d4b199908..3d372bab27 100644
--- a/crates/ide-db/src/defs.rs
+++ b/crates/ide-db/src/defs.rs

@@ -50,6 +50,7 @@ pub enum Definition {

BuiltinAttr(BuiltinAttr),

ToolModule(ToolModule),

ExternCrateDecl(ExternCrateDecl),

+ InlineAsmRegOrRegClass(()),

}

impl Definition {

@@ -87,7 +88,8 @@ impl Definition {

| Definition::BuiltinType(_)

| Definition::BuiltinLifetime(_)

| Definition::TupleField(_)

- | Definition::ToolModule(_) => return None,

+ | Definition::ToolModule(_)

+ | Definition::InlineAsmRegOrRegClass(_) => return None,

};

Some(module)

}

@@ -121,7 +123,8 @@ impl Definition {

| Definition::Local(_)

| Definition::GenericParam(_)

| Definition::Label(_)

- | Definition::DeriveHelper(_) => return None,

+ | Definition::DeriveHelper(_)

+ | Definition::InlineAsmRegOrRegClass(_) => return None,

};

Some(vis)

}

@@ -150,6 +153,7 @@ impl Definition {

Definition::ToolModule(_) => return None, // FIXME

Definition::DeriveHelper(it) => it.name(db),

Definition::ExternCrateDecl(it) => return it.alias_or_name(db),

+ Definition::InlineAsmRegOrRegClass(_) => return None, // FIXME

};

Some(name)

}

@@ -212,6 +216,7 @@ impl Definition {

Definition::ToolModule(_) => None,

Definition::DeriveHelper(_) => None,

Definition::TupleField(_) => None,

+ Definition::InlineAsmRegOrRegClass(_) => None,

};

docs.or_else(|| {

@@ -268,6 +273,8 @@ impl Definition {

Definition::DeriveHelper(it) => {

format!("derive_helper {}", it.name(db).display(db, edition))

}

+ // FIXME

+ Definition::InlineAsmRegOrRegClass(_) => "inline_asm_reg_or_reg_class".to_owned(),

}

diff --git a/crates/ide-db/src/lib.rs b/crates/ide-db/src/lib.rs
index ab161f0ce5..3435757ad3 100644
--- a/crates/ide-db/src/lib.rs
+++ b/crates/ide-db/src/lib.rs

@@ -224,6 +224,7 @@ pub enum SymbolKind {

Function,

Method,

Impl,

+ InlineAsmRegOrRegClass,

Label,

LifetimeParam,

Local,

diff --git a/crates/ide-db/src/rename.rs b/crates/ide-db/src/rename.rs
index 262eefeec0..3a1a9aba85 100644
--- a/crates/ide-db/src/rename.rs
+++ b/crates/ide-db/src/rename.rs

@@ -205,7 +205,8 @@ impl Definition {

| Definition::BuiltinAttr(_)

| Definition::SelfType(_)

| Definition::ToolModule(_)

- | Definition::TupleField(_) => return None,

+ | Definition::TupleField(_)

+ | Definition::InlineAsmRegOrRegClass(_) => return None,

// FIXME: This should be doable in theory

Definition::DeriveHelper(_) => return None,

};

diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index 925ae62023..aa632ab12f 100644
--- a/crates/ide/src/doc_links.rs
+++ b/crates/ide/src/doc_links.rs

@@ -219,7 +219,8 @@ pub(crate) fn resolve_doc_path_for_def(

| Definition::Local(_)

| Definition::GenericParam(_)

| Definition::Label(_)

- | Definition::DeriveHelper(_) => None,

+ | Definition::DeriveHelper(_)

+ | Definition::InlineAsmRegOrRegClass(_) => None,

}

.map(Definition::from)

}

@@ -672,7 +673,8 @@ fn filename_and_frag_for_def(

| Definition::BuiltinAttr(_)

| Definition::BuiltinLifetime(_)

| Definition::ToolModule(_)

- | Definition::DeriveHelper(_) => return None,

+ | Definition::DeriveHelper(_)

+ | Definition::InlineAsmRegOrRegClass(_) => return None,

};

Some((def, res, None))

diff --git a/crates/ide/src/moniker.rs b/crates/ide/src/moniker.rs
index 4be1b57098..69c94bc357 100644
--- a/crates/ide/src/moniker.rs
+++ b/crates/ide/src/moniker.rs

@@ -228,6 +228,7 @@ pub(crate) fn def_to_kind(db: &RootDatabase, def: Definition) -> SymbolInformati

Definition::BuiltinAttr(..) => Attribute,

Definition::ToolModule(..) => Module,

Definition::ExternCrateDecl(..) => Module,

+ Definition::InlineAsmRegOrRegClass(..) => Module,

}

@@ -320,7 +321,8 @@ pub(crate) fn def_to_moniker(

| Definition::DeriveHelper(_)

| Definition::BuiltinLifetime(_)

| Definition::BuiltinAttr(_)

- | Definition::ToolModule(_) => return None,

+ | Definition::ToolModule(_)

+ | Definition::InlineAsmRegOrRegClass(_) => return None,

Definition::Local(local) => {

if !local.is_param(db) {

diff --git a/crates/ide/src/navigation_target.rs b/crates/ide/src/navigation_target.rs
index 9ace9fda62..cf1412560d 100644
--- a/crates/ide/src/navigation_target.rs
+++ b/crates/ide/src/navigation_target.rs

@@ -242,6 +242,7 @@ impl TryToNav for Definition {

| Definition::BuiltinType(_)

| Definition::TupleField(_)

| Definition::ToolModule(_)

+ | Definition::InlineAsmRegOrRegClass(_)

| Definition::BuiltinAttr(_) => None,

// FIXME: The focus range should be set to the helper declaration

Definition::DeriveHelper(it) => it.derive().try_to_nav(db),

diff --git a/crates/ide/src/syntax_highlighting/highlight.rs b/crates/ide/src/syntax_highlighting/highlight.rs
index eeba9cf35c..2894cb9cf6 100644
--- a/crates/ide/src/syntax_highlighting/highlight.rs
+++ b/crates/ide/src/syntax_highlighting/highlight.rs

@@ -534,6 +534,9 @@ pub(super) fn highlight_def(

Definition::BuiltinAttr(_) => Highlight::new(HlTag::Symbol(SymbolKind::BuiltinAttr)),

Definition::ToolModule(_) => Highlight::new(HlTag::Symbol(SymbolKind::ToolModule)),

Definition::DeriveHelper(_) => Highlight::new(HlTag::Symbol(SymbolKind::DeriveHelper)),

+ Definition::InlineAsmRegOrRegClass(_) => {

+ Highlight::new(HlTag::Symbol(SymbolKind::InlineAsmRegOrRegClass))

+ }

};

let def_crate = def.krate(db);

diff --git a/crates/ide/src/syntax_highlighting/inject.rs b/crates/ide/src/syntax_highlighting/inject.rs
index bc1ec53007..e2b32c17d6 100644
--- a/crates/ide/src/syntax_highlighting/inject.rs
+++ b/crates/ide/src/syntax_highlighting/inject.rs

@@ -315,6 +315,7 @@ fn module_def_to_hl_tag(def: Definition) -> HlTag {

Definition::BuiltinAttr(_) => SymbolKind::BuiltinAttr,

Definition::ToolModule(_) => SymbolKind::ToolModule,

Definition::DeriveHelper(_) => SymbolKind::DeriveHelper,

+ Definition::InlineAsmRegOrRegClass(_) => SymbolKind::InlineAsmRegOrRegClass,

};

HlTag::Symbol(symbol)

}

diff --git a/crates/ide/src/syntax_highlighting/tags.rs b/crates/ide/src/syntax_highlighting/tags.rs
index e329023606..3b5d1af0ac 100644
--- a/crates/ide/src/syntax_highlighting/tags.rs
+++ b/crates/ide/src/syntax_highlighting/tags.rs

@@ -146,6 +146,7 @@ impl HlTag {

SymbolKind::Field => "field",

SymbolKind::Function => "function",

SymbolKind::Impl => "self_type",

+ SymbolKind::InlineAsmRegOrRegClass => "reg",

SymbolKind::Label => "label",

SymbolKind::LifetimeParam => "lifetime",

SymbolKind::Local => "variable",

diff --git a/crates/ide/src/syntax_highlighting/test_data/highlight_asm.html b/crates/ide/src/syntax_highlighting/test_data/highlight_asm.html
new file mode 100644
index 0000000000..1280d78cc8
--- /dev/null
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_asm.html

@@ -0,0 +1,98 @@

+<style>

+body { margin: 0; }

+pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padding: 0.4em; }

+.lifetime { color: #DFAF8F; font-style: italic; }

+.label { color: #DFAF8F; font-style: italic; }

+.comment { color: #7F9F7F; }

+.documentation { color: #629755; }

+.intra_doc_link { font-style: italic; }

+.injected { opacity: 0.65 ; }

+.struct, .enum { color: #7CB8BB; }

+.enum_variant { color: #BDE0F3; }

+.string_literal { color: #CC9393; }

+.field { color: #94BFF3; }

+.function { color: #93E0E3; }

+.function.unsafe { color: #BC8383; }

+.trait.unsafe { color: #BC8383; }

+.operator.unsafe { color: #BC8383; }

+.mutable.unsafe { color: #BC8383; text-decoration: underline; }

+.keyword.unsafe { color: #BC8383; font-weight: bold; }

+.macro.unsafe { color: #BC8383; }

+.parameter { color: #94BFF3; }

+.text { color: #DCDCCC; }

+.type { color: #7CB8BB; }

+.builtin_type { color: #8CD0D3; }

+.type_param { color: #DFAF8F; }

+.attribute { color: #94BFF3; }

+.numeric_literal { color: #BFEBBF; }

+.bool_literal { color: #BFE6EB; }

+.macro { color: #94BFF3; }

+.proc_macro { color: #94BFF3; text-decoration: underline; }

+.derive { color: #94BFF3; font-style: italic; }

+.module { color: #AFD8AF; }

+.value_param { color: #DCDCCC; }

+.variable { color: #DCDCCC; }

+.format_specifier { color: #CC696B; }

+.mutable { text-decoration: underline; }

+.escape_sequence { color: #94BFF3; }

+.keyword { color: #F0DFAF; font-weight: bold; }

+.control { font-style: italic; }

+.reference { font-style: italic; font-weight: bold; }

+.const { font-weight: bolder; }

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

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

+</style>

+<pre><code>fn main() {

+ unsafe {

+ let foo = 1;

+ let mut o = 0;

+ core::arch::asm!(

+ "%input = OpLoad _ {0}",

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

+ "OpStore {1} %result",

+ in(reg) &foo,

+ in(reg) &mut o,

+ );

+ o

+ let thread_id: usize;

+ mov {0}, gs:[0x30]

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

+ ", 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}

+ mov eax, fs:[30h]

+ mov eax, [eax+8h]

+ add eax, {off_fn}

+ mov [eax-{off_fn}+{off_ptr}], eax

+ push eax

+ jmp {virtual_free}

+ ",

+ off_ptr = const OffPtr,

+ off_fn = const OffFn,

+ free_size = const 0,

+ free_type = const MEM_RELEASE,

+ virtual_free = sym VirtualFree,

+ base = sym UNMAP_BASE,

+ options(noreturn),

+ );

+ }

+}</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 9376ef65a4..ced522e7eb 100644
--- a/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
+++ b/crates/ide/src/syntax_highlighting/test_data/highlight_strings.html

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

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

let i: u64 = 3;

let o: u64;

- asm!(

"mov {0}, {1}",

"add {0}, 5",

out(reg) o,

diff --git a/crates/ide/src/syntax_highlighting/tests.rs b/crates/ide/src/syntax_highlighting/tests.rs
index c06ea155fb..dbe8de8f91 100644
--- a/crates/ide/src/syntax_highlighting/tests.rs
+++ b/crates/ide/src/syntax_highlighting/tests.rs

@@ -549,7 +549,7 @@ fn main() {

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

let i: u64 = 3;

let o: u64;

- asm!(

+ core::arch::asm!(

"mov {0}, {1}",

"add {0}, 5",

out(reg) o,

@@ -1275,3 +1275,65 @@ fn f<'de, T: Deserialize<'de>>() {

);

let _ = analysis.highlight(HL_CONFIG, file_id).unwrap();

}

+#[test]

+fn test_asm_highlighting() {

+ check_highlighting(

+ r#"

+//- minicore: asm, concat

+fn main() {

+ unsafe {

+ let foo = 1;

+ let mut o = 0;

+ core::arch::asm!(

+ "%input = OpLoad _ {0}",

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

+ "OpStore {1} %result",

+ in(reg) &foo,

+ in(reg) &mut o,

+ );

+ o

+ let thread_id: usize;

+ core::arch::asm!("

+ mov {0}, gs:[0x30]

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

+ ", 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;

+ core::arch::asm!("

+ push {free_type}

+ push {free_size}

+ push {base}

+ mov eax, fs:[30h]

+ mov eax, [eax+8h]

+ add eax, {off_fn}

+ mov [eax-{off_fn}+{off_ptr}], eax

+ push eax

+ jmp {virtual_free}

+ ",

+ off_ptr = const OffPtr,

+ off_fn = const OffFn,

+ free_size = const 0,

+ free_type = const MEM_RELEASE,

+ virtual_free = sym VirtualFree,

+ base = sym UNMAP_BASE,

+ options(noreturn),

+ );

+ }

+"#,

+ expect_file!["./test_data/highlight_asm.html"],

+ false,

+ );

diff --git a/crates/rust-analyzer/src/lsp/to_proto.rs b/crates/rust-analyzer/src/lsp/to_proto.rs
index b29268f133..4902c9f88c 100644
--- a/crates/rust-analyzer/src/lsp/to_proto.rs
+++ b/crates/rust-analyzer/src/lsp/to_proto.rs

@@ -80,6 +80,7 @@ pub(crate) fn symbol_kind(symbol_kind: SymbolKind) -> lsp_types::SymbolKind {

| SymbolKind::ValueParam

| SymbolKind::Label => lsp_types::SymbolKind::VARIABLE,

SymbolKind::Union => lsp_types::SymbolKind::STRUCT,

+ SymbolKind::InlineAsmRegOrRegClass => lsp_types::SymbolKind::VARIABLE,

}

@@ -159,6 +160,7 @@ pub(crate) fn completion_item_kind(

SymbolKind::Variant => lsp_types::CompletionItemKind::ENUM_MEMBER,

SymbolKind::BuiltinAttr => lsp_types::CompletionItemKind::FUNCTION,

SymbolKind::ToolModule => lsp_types::CompletionItemKind::MODULE,

+ SymbolKind::InlineAsmRegOrRegClass => lsp_types::CompletionItemKind::KEYWORD,

}

@@ -702,6 +704,7 @@ fn semantic_token_type_and_modifiers(

SymbolKind::ProcMacro => types::PROC_MACRO,

SymbolKind::BuiltinAttr => types::BUILTIN_ATTRIBUTE,

SymbolKind::ToolModule => types::TOOL_MODULE,

+ SymbolKind::InlineAsmRegOrRegClass => types::KEYWORD,

HlTag::AttributeBracket => types::ATTRIBUTE_BRACKET,

HlTag::BoolLiteral => types::BOOLEAN,

diff --git a/crates/test-utils/src/minicore.rs b/crates/test-utils/src/minicore.rs
index 4b7e23388c..fec270a556 100644
--- a/crates/test-utils/src/minicore.rs
+++ b/crates/test-utils/src/minicore.rs

@@ -1475,6 +1475,19 @@ mod panicking {

}

// endregion:panic

+// region:asm

+mod arch {

+ #[rustc_builtin_macro]

+ pub macro asm("assembly template", $(operands,)* $(options($(option),*))?) {

+ /* compiler built-in */

+ }

+ #[rustc_builtin_macro]

+ pub macro global_asm("assembly template", $(operands,)* $(options($(option),*))?) {

+ /* compiler built-in */

+ }

+// endregion:asm

#[macro_use]

mod macros {

// region:panic

@@ -1487,16 +1500,6 @@ mod macros {

}

// endregion:panic

- // region:asm

- #[macro_export]

- #[rustc_builtin_macro]

- macro_rules! asm {

- ($($arg:tt)*) => {

- /* compiler built-in */

- };

- }

- // endregion:asm

// region:assert

#[macro_export]

#[rustc_builtin_macro]