Skip to content

Commit 22b75c4

Browse files
committed
Highlight the name in macro declarations
1 parent 11c0a5b commit 22b75c4

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

crates/ra_ide/src/snapshots/highlight_strings.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
.keyword.unsafe { color: #BC8383; font-weight: bold; }
2828
.control { font-style: italic; }
2929
</style>
30-
<pre><code><span class="macro">macro_rules!</span> println {
30+
<pre><code><span class="macro">macro_rules!</span> <span class="macro declaration">println</span> {
3131
($($arg:tt)*) =&gt; ({
3232
$<span class="keyword">crate</span>::io::_print($<span class="keyword">crate</span>::format_args_nl!($($arg)*));
3333
})
3434
}
3535
#[rustc_builtin_macro]
36-
<span class="macro">macro_rules!</span> format_args_nl {
36+
<span class="macro">macro_rules!</span> <span class="macro declaration">format_args_nl</span> {
3737
($fmt:expr) =&gt; {{ <span class="comment">/* compiler built-in */</span> }};
3838
($fmt:expr, $($args:tt)*) =&gt; {{ <span class="comment">/* compiler built-in */</span> }};
3939
}

crates/ra_ide/src/snapshots/highlighting.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@
3333
<span class="keyword">pub</span> <span class="field declaration">y</span>: <span class="builtin_type">i32</span>,
3434
}
3535

36+
<span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable">STATIC_MUT</span>: <span class="builtin_type">i32</span> = <span class="numeric_literal">0</span>;
37+
3638
<span class="keyword">fn</span> <span class="function declaration">foo</span>&lt;<span class="lifetime declaration">'a</span>, <span class="type_param declaration">T</span>&gt;() -&gt; <span class="type_param">T</span> {
3739
<span class="function">foo</span>::&lt;<span class="lifetime">'a</span>, <span class="builtin_type">i32</span>&gt;()
3840
}
3941

40-
<span class="macro">macro_rules!</span> def_fn {
42+
<span class="macro">macro_rules!</span> <span class="macro declaration">def_fn</span> {
4143
($($tt:tt)*) =&gt; {$($tt)*}
4244
}
4345

crates/ra_ide/src/syntax_highlighting.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,19 @@ pub(crate) fn highlight(
167167
binding_hash: None,
168168
});
169169
}
170+
if let Some(name) = mc.is_macro_rules() {
171+
if let Some((highlight, binding_hash)) = highlight_element(
172+
&sema,
173+
&mut bindings_shadow_count,
174+
name.syntax().clone().into(),
175+
) {
176+
stack.add(HighlightedRange {
177+
range: name.syntax().text_range(),
178+
highlight,
179+
binding_hash,
180+
});
181+
}
182+
}
170183
continue;
171184
}
172185
WalkEvent::Leave(Some(mc)) => {

0 commit comments

Comments
 (0)