Skip to content

Commit 5ca3855

Browse files
committed
On second thought, we want to preserve the textMate here where all punctuation that are from a Attr be highlited as Attribute
1 parent 04d8dc4 commit 5ca3855

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

crates/ra_ide/src/syntax_highlighting.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,6 @@ fn highlight_element(
540540
}
541541
}
542542
p if p.is_punct() => match p {
543-
T![#] => HighlightTag::Attribute.into(),
544543
T![::] | T![->] | T![=>] | T![&] | T![..] | T![=] | T![@] => {
545544
HighlightTag::Operator.into()
546545
}
@@ -581,6 +580,9 @@ fn highlight_element(
581580
_ if element.parent().and_then(ast::DotDotPat::cast).is_some() => {
582581
HighlightTag::Operator.into()
583582
}
583+
_ if element.parent().and_then(ast::Attr::cast).is_some() => {
584+
HighlightTag::Attribute.into()
585+
}
584586
_ => HighlightTag::Punctuation.into(),
585587
},
586588

crates/ra_ide/test_data/highlight_doctest.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<span class="comment documentation">/// # Examples</span>
5151
<span class="comment documentation">///</span>
5252
<span class="comment documentation">/// ```</span>
53-
<span class="comment documentation">/// #</span><span class="generic injected"> </span><span class="attribute injected">#</span><span class="punctuation injected">!</span><span class="punctuation injected">[</span><span class="function attribute injected">allow</span><span class="punctuation injected">(</span><span class="attribute injected">unused_mut</span><span class="punctuation injected">)</span><span class="punctuation injected">]</span>
53+
<span class="comment documentation">/// #</span><span class="generic injected"> </span><span class="attribute injected">#</span><span class="attribute injected">!</span><span class="attribute injected">[</span><span class="function attribute injected">allow</span><span class="punctuation injected">(</span><span class="attribute injected">unused_mut</span><span class="punctuation injected">)</span><span class="attribute injected">]</span>
5454
<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="generic injected"> </span><span class="keyword injected">mut</span><span class="generic injected"> </span><span class="variable declaration injected mutable">foo</span><span class="punctuation injected">:</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="generic injected"> </span><span class="operator injected">=</span><span class="generic injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="function injected">new</span><span class="punctuation injected">(</span><span class="punctuation injected">)</span><span class="punctuation injected">;</span><span class="punctuation injected">
5555
</span> <span class="comment documentation">/// ```</span>
5656
<span class="keyword">pub</span> <span class="keyword">const</span> <span class="keyword">fn</span> <span class="function declaration">new</span><span class="punctuation">(</span><span class="punctuation">)</span> <span class="operator">-&gt;</span> <span class="struct">Foo</span> <span class="punctuation">{</span>

crates/ra_ide/test_data/highlighting.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
.unresolved_reference { color: #FC5555; text-decoration: wavy underline; }
3737
</style>
38-
<pre><code><span class="attribute">#</span><span class="punctuation">[</span><span class="function attribute">derive</span><span class="punctuation">(</span><span class="attribute">Clone</span><span class="punctuation">,</span><span class="attribute"> Debug</span><span class="punctuation">)</span><span class="punctuation">]</span>
38+
<pre><code><span class="attribute">#</span><span class="attribute">[</span><span class="function attribute">derive</span><span class="punctuation">(</span><span class="attribute">Clone</span><span class="punctuation">,</span><span class="attribute"> Debug</span><span class="punctuation">)</span><span class="attribute">]</span>
3939
<span class="keyword">struct</span> <span class="struct declaration">Foo</span> <span class="punctuation">{</span>
4040
<span class="keyword">pub</span> <span class="field declaration">x</span><span class="punctuation">:</span> <span class="builtin_type">i32</span><span class="punctuation">,</span>
4141
<span class="keyword">pub</span> <span class="field declaration">y</span><span class="punctuation">:</span> <span class="builtin_type">i32</span><span class="punctuation">,</span>

0 commit comments

Comments
 (0)