Fix test_keyword_highlighting test

Author: Veykril

src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2015.html

@@ -54,21 +54,21 @@
 <spanclass="brace">}</span>
 
 <spanclass="keyword">macro_rules</span><spanclass="macro_bang">!</span><spanclass="macro declaration public">void</span><spanclass="brace">{</span>
-<spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="operator">=</span><spanclass="operator">&gt;</span><spanclass="brace">{</span><spanclass="brace">}</span>
+<spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="operator">=</span><spanclass="operator">&gt;</span><spanclass="brace">{</span>discard<spanclass="punctuation">!</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="brace">}</span>
 <spanclass="brace">}</span>
 
 <spanclass="keyword">struct</span><spanclass="struct declaration">__</span><spanclass="keyword">where</span><spanclass="self_type_keyword">Self</span><spanclass="colon">:</span><spanclass="semicolon">;</span>
 <spanclass="keyword">fn</span><spanclass="function declaration">__</span><spanclass="parenthesis">(</span><spanclass="punctuation">_</span><spanclass="colon">:</span><spanclass="unresolved_reference">Self</span><spanclass="parenthesis">)</span><spanclass="brace">{</span><spanclass="brace">}</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">Self</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">Self</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 
 <spanclass="comment">// edition dependent</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>tryasyncawaitgen<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="none macro">try</span><spanclass="none macro">async</span><spanclass="none macro">await</span><spanclass="none macro">gen</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// edition and context dependent</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>dyn<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="none macro">dyn</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// builtin custom syntax</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>builtinoffset_offormat_argsasm<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="none macro">builtin</span><spanclass="none macro">offset_of</span><spanclass="none macro">format_args</span><spanclass="none macro">asm</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// contextual</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>macro_rules<spanclass="comma">,</span> union<spanclass="comma">,</span> default<spanclass="comma">,</span> raw<spanclass="comma">,</span> auto<spanclass="comma">,</span> yeet<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="none macro">macro_rules</span><spanclass="comma macro">,</span><spanclass="none macro">union</span><spanclass="comma macro">,</span><spanclass="none macro">default</span><spanclass="comma macro">,</span><spanclass="none macro">raw</span><spanclass="comma macro">,</span><spanclass="none macro">auto</span><spanclass="comma macro">,</span><spanclass="none macro">yeet</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// reserved</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">abstract</span><spanclass="keyword">become</span><spanclass="keyword">box</span><spanclass="keyword">do</span><spanclass="keyword">final</span><spanclass="keyword">macro</span><spanclass="keyword">override</span><spanclass="keyword">priv</span><spanclass="keyword">typeof</span><spanclass="keyword">unsized</span><spanclass="keyword">virtual</span><spanclass="keyword control">yield</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">abstract</span><spanclass="keyword macro">become</span><spanclass="keyword macro">box</span><spanclass="keyword macro">do</span><spanclass="keyword macro">final</span><spanclass="keyword macro">macro</span><spanclass="keyword macro">override</span><spanclass="keyword macro">priv</span><spanclass="keyword macro">typeof</span><spanclass="keyword macro">unsized</span><spanclass="keyword macro">virtual</span><spanclass="keyword control macro">yield</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>'static 'self 'unsafe<spanclass="parenthesis">)</span></code></pre>

src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2018.html

@@ -54,21 +54,21 @@
 <spanclass="brace">}</span>
 
 <spanclass="keyword">macro_rules</span><spanclass="macro_bang">!</span><spanclass="macro declaration public">void</span><spanclass="brace">{</span>
-<spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="operator">=</span><spanclass="operator">&gt;</span><spanclass="brace">{</span><spanclass="brace">}</span>
+<spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="operator">=</span><spanclass="operator">&gt;</span><spanclass="brace">{</span>discard<spanclass="punctuation">!</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="brace">}</span>
 <spanclass="brace">}</span>
 
 <spanclass="keyword">struct</span><spanclass="struct declaration">__</span><spanclass="keyword">where</span><spanclass="self_type_keyword">Self</span><spanclass="colon">:</span><spanclass="semicolon">;</span>
 <spanclass="keyword">fn</span><spanclass="function declaration">__</span><spanclass="parenthesis">(</span><spanclass="punctuation">_</span><spanclass="colon">:</span><spanclass="unresolved_reference">Self</span><spanclass="parenthesis">)</span><spanclass="brace">{</span><spanclass="brace">}</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">Self</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">Self</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 
 <spanclass="comment">// edition dependent</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">try</span><spanclass="keyword async">async</span><spanclass="keyword async control">await</span> gen<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">try</span><spanclass="keyword async macro">async</span><spanclass="keyword async control macro">await</span><spanclass="none macro">gen</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// edition and context dependent</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">dyn</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">dyn</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// builtin custom syntax</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>builtinoffset_offormat_argsasm<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="none macro">builtin</span><spanclass="none macro">offset_of</span><spanclass="none macro">format_args</span><spanclass="none macro">asm</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// contextual</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>macro_rules<spanclass="comma">,</span> union<spanclass="comma">,</span> default<spanclass="comma">,</span> raw<spanclass="comma">,</span> auto<spanclass="comma">,</span> yeet<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="none macro">macro_rules</span><spanclass="comma macro">,</span><spanclass="none macro">union</span><spanclass="comma macro">,</span><spanclass="none macro">default</span><spanclass="comma macro">,</span><spanclass="none macro">raw</span><spanclass="comma macro">,</span><spanclass="none macro">auto</span><spanclass="comma macro">,</span><spanclass="none macro">yeet</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// reserved</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">abstract</span><spanclass="keyword">become</span><spanclass="keyword">box</span><spanclass="keyword">do</span><spanclass="keyword">final</span><spanclass="keyword">macro</span><spanclass="keyword">override</span><spanclass="keyword">priv</span><spanclass="keyword">typeof</span><spanclass="keyword">unsized</span><spanclass="keyword">virtual</span><spanclass="keyword control">yield</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">abstract</span><spanclass="keyword macro">become</span><spanclass="keyword macro">box</span><spanclass="keyword macro">do</span><spanclass="keyword macro">final</span><spanclass="keyword macro">macro</span><spanclass="keyword macro">override</span><spanclass="keyword macro">priv</span><spanclass="keyword macro">typeof</span><spanclass="keyword macro">unsized</span><spanclass="keyword macro">virtual</span><spanclass="keyword control macro">yield</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>'static 'self 'unsafe<spanclass="parenthesis">)</span></code></pre>

src/tools/rust-analyzer/crates/ide/src/syntax_highlighting/test_data/highlight_keywords_2021.html

@@ -54,21 +54,21 @@
 <spanclass="brace">}</span>
 
 <spanclass="keyword">macro_rules</span><spanclass="macro_bang">!</span><spanclass="macro declaration public">void</span><spanclass="brace">{</span>
-<spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="operator">=</span><spanclass="operator">&gt;</span><spanclass="brace">{</span><spanclass="brace">}</span>
+<spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="operator">=</span><spanclass="operator">&gt;</span><spanclass="brace">{</span>discard<spanclass="punctuation">!</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span><spanclass="parenthesis">(</span><spanclass="punctuation">$</span>tt<spanclass="colon">:</span>tt<spanclass="parenthesis">)</span><spanclass="punctuation">*</span><spanclass="parenthesis">)</span><spanclass="brace">}</span>
 <spanclass="brace">}</span>
 
 <spanclass="keyword">struct</span><spanclass="struct declaration">__</span><spanclass="keyword">where</span><spanclass="self_type_keyword">Self</span><spanclass="colon">:</span><spanclass="semicolon">;</span>
 <spanclass="keyword">fn</span><spanclass="function declaration">__</span><spanclass="parenthesis">(</span><spanclass="punctuation">_</span><spanclass="colon">:</span><spanclass="unresolved_reference">Self</span><spanclass="parenthesis">)</span><spanclass="brace">{</span><spanclass="brace">}</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">Self</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">Self</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 
 <spanclass="comment">// edition dependent</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">try</span><spanclass="keyword async">async</span><spanclass="keyword async control">await</span> gen<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">try</span><spanclass="keyword async macro">async</span><spanclass="keyword async control macro">await</span><spanclass="none macro">gen</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// edition and context dependent</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">dyn</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">dyn</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// builtin custom syntax</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>builtinoffset_offormat_argsasm<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="none macro">builtin</span><spanclass="none macro">offset_of</span><spanclass="none macro">format_args</span><spanclass="none macro">asm</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// contextual</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>macro_rules<spanclass="comma">,</span> union<spanclass="comma">,</span> default<spanclass="comma">,</span> raw<spanclass="comma">,</span> auto<spanclass="comma">,</span> yeet<spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="none macro">macro_rules</span><spanclass="comma macro">,</span><spanclass="none macro">union</span><spanclass="comma macro">,</span><spanclass="none macro">default</span><spanclass="comma macro">,</span><spanclass="none macro">raw</span><spanclass="comma macro">,</span><spanclass="none macro">auto</span><spanclass="comma macro">,</span><spanclass="none macro">yeet</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="comment">// reserved</span>
-<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword">abstract</span><spanclass="keyword">become</span><spanclass="keyword">box</span><spanclass="keyword">do</span><spanclass="keyword">final</span><spanclass="keyword">macro</span><spanclass="keyword">override</span><spanclass="keyword">priv</span><spanclass="keyword">typeof</span><spanclass="keyword">unsized</span><spanclass="keyword">virtual</span><spanclass="keyword control">yield</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
+<spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span><spanclass="keyword macro">abstract</span><spanclass="keyword macro">become</span><spanclass="keyword macro">box</span><spanclass="keyword macro">do</span><spanclass="keyword macro">final</span><spanclass="keyword macro">macro</span><spanclass="keyword macro">override</span><spanclass="keyword macro">priv</span><spanclass="keyword macro">typeof</span><spanclass="keyword macro">unsized</span><spanclass="keyword macro">virtual</span><spanclass="keyword control macro">yield</span><spanclass="parenthesis">)</span><spanclass="semicolon">;</span>
 <spanclass="macro public">void</span><spanclass="macro_bang">!</span><spanclass="parenthesis">(</span>'static 'self 'unsafe<spanclass="parenthesis">)</span></code></pre>