Skip to content

Commit e8edbb5

Browse files
committed
Add a macro case for the keyword highlighting test fixture
1 parent d460b7c commit e8edbb5

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

crates/ide/src/syntax_highlighting/test_data/highlight_general.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
<span class="field declaration">x</span><span class="colon">:</span> <span class="builtin_type">u32</span><span class="comma">,</span>
6060
<span class="brace">}</span>
6161

62-
<span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="keyword">where</span> <span class="self_type_keyword">Self</span><span class="colon">:</span> <span class="brace">{</span>
62+
<span class="keyword">trait</span> <span class="trait declaration">Bar</span> <span class="brace">{</span>
6363
<span class="keyword">fn</span> <span class="function associated declaration reference trait">bar</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword declaration reference">self</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span><span class="semicolon">;</span>
6464
<span class="brace">}</span>
6565

66-
<span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="keyword">where</span> <span class="self_type_keyword">Self</span><span class="colon">:</span> <span class="brace">{</span>
66+
<span class="keyword">impl</span> <span class="trait">Bar</span> <span class="keyword">for</span> <span class="struct">Foo</span> <span class="brace">{</span>
6767
<span class="keyword">fn</span> <span class="function associated declaration reference trait">bar</span><span class="parenthesis">(</span><span class="operator">&</span><span class="self_keyword declaration reference">self</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">i32</span> <span class="brace">{</span>
6868
<span class="self_keyword reference">self</span><span class="operator">.</span><span class="field">x</span>
6969
<span class="brace">}</span>
@@ -210,7 +210,7 @@
210210

211211
<span class="keyword">impl</span> <span class="enum public">Bool</span> <span class="brace">{</span>
212212
<span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function associated consuming declaration public">to_primitive</span><span class="parenthesis">(</span><span class="self_keyword declaration">self</span><span class="parenthesis">)</span> <span class="operator">-&gt;</span> <span class="builtin_type">bool</span> <span class="brace">{</span>
213-
<span class="unresolved_reference">matches</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="keyword">self</span><span class="comma">,</span> <span class="self_type_keyword">Self</span><span class="colon">:</span><span class="colon">:</span>True<span class="parenthesis">)</span>
213+
<span class="bool_literal">true</span>
214214
<span class="brace">}</span>
215215
<span class="brace">}</span>
216216
<span class="keyword">const</span> <span class="constant declaration">USAGE_OF_BOOL</span><span class="colon">:</span><span class="builtin_type">bool</span> <span class="operator">=</span> <span class="enum public">Bool</span><span class="operator">::</span><span class="enum_variant public">True</span><span class="operator">.</span><span class="function associated consuming public">to_primitive</span><span class="parenthesis">(</span><span class="parenthesis">)</span><span class="semicolon">;</span>

crates/ide/src/syntax_highlighting/test_data/highlight_keywords.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,5 +49,9 @@
4949
<span class="keyword">use</span> <span class="keyword crate_root">super</span><span class="operator">::</span><span class="punctuation">*</span><span class="semicolon">;</span>
5050
<span class="brace">}</span>
5151

52+
<span class="keyword">macro_rules</span><span class="punctuation">!</span> <span class="macro declaration">void</span> <span class="brace">{</span>
53+
<span class="parenthesis">(</span><span class="punctuation">$</span><span class="parenthesis">(</span><span class="punctuation">$</span>tt<span class="colon">:</span>tt<span class="parenthesis">)</span><span class="parenthesis">)</span> <span class="operator">=</span><span class="angle">&gt;</span> <span class="brace">{</span><span class="brace">}</span>
54+
<span class="brace">}</span>
55+
<span class="macro">void</span><span class="macro_bang">!</span><span class="parenthesis">(</span><span class="keyword">Self</span><span class="parenthesis">)</span><span class="semicolon">;</span>
5256
<span class="keyword">struct</span> <span class="struct declaration">__</span> <span class="keyword">where</span> <span class="self_type_keyword">Self</span><span class="colon">:</span><span class="semicolon">;</span>
5357
<span class="keyword">fn</span> <span class="function declaration">__</span><span class="parenthesis">(</span><span class="punctuation">_</span><span class="colon">:</span> <span class="unresolved_reference">Self</span><span class="parenthesis">)</span> <span class="brace">{</span><span class="brace">}</span></code></pre>

crates/ide/src/syntax_highlighting/tests.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ struct Foo {
113113
x: u32,
114114
}
115115
116-
trait Bar where Self: {
116+
trait Bar {
117117
fn bar(&self) -> i32;
118118
}
119119
120-
impl Bar for Foo where Self: {
120+
impl Bar for Foo {
121121
fn bar(&self) -> i32 {
122122
self.x
123123
}
@@ -264,7 +264,7 @@ pub enum Bool { True, False }
264264
265265
impl Bool {
266266
pub const fn to_primitive(self) -> bool {
267-
matches!(self, Self::True)
267+
true
268268
}
269269
}
270270
const USAGE_OF_BOOL:bool = Bool::True.to_primitive();
@@ -346,6 +346,10 @@ mod __ {
346346
use super::*;
347347
}
348348
349+
macro_rules! void {
350+
($($tt:tt)) => {}
351+
}
352+
void!(Self);
349353
struct __ where Self:;
350354
fn __(_: Self) {}
351355
"#,

0 commit comments

Comments
 (0)