Skip to content

Commit 606cfef

Browse files
authored
Merge pull request #19047 from lnicola/rename-highlight
fix: Fix syntactic highlighting for renames
2 parents 2f672dd + 7d8f53d commit 606cfef

File tree

3 files changed

+14
-0
lines changed

3 files changed

+14
-0
lines changed

crates/ide/src/syntax_highlighting/highlight.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -677,6 +677,12 @@ fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
677677
STATIC => SymbolKind::Static,
678678
IDENT_PAT => SymbolKind::Local,
679679
FORMAT_ARGS_ARG => SymbolKind::Local,
680+
RENAME => SymbolKind::Local,
681+
MACRO_RULES => SymbolKind::Macro,
682+
CONST_PARAM => SymbolKind::ConstParam,
683+
SELF_PARAM => SymbolKind::SelfParam,
684+
TRAIT_ALIAS => SymbolKind::TraitAlias,
685+
ASM_OPERAND_NAMED => SymbolKind::Local,
680686
_ => return default.into(),
681687
};
682688

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,10 @@
8282
<span class="parenthesis">(</span><span class="punctuation">$</span>literal<span class="colon">:</span>literal<span class="parenthesis">)</span> <span class="operator">=</span><span class="operator">&gt;</span> <span class="brace">{</span><span class="brace">{</span>stringify<span class="punctuation">!</span><span class="parenthesis">(</span><span class="punctuation">$</span>literal<span class="parenthesis">)</span><span class="semicolon">;</span> format_args<span class="punctuation">!</span><span class="parenthesis">(</span><span class="punctuation">$</span>literal<span class="parenthesis">)</span><span class="brace">}</span><span class="brace">}</span><span class="semicolon">;</span>
8383
<span class="brace">}</span>
8484

85+
<span class="keyword">use</span> <span class="unresolved_reference">foo</span><span class="operator">::</span><span class="unresolved_reference">bar</span> <span class="keyword">as</span> <span class="variable declaration">baz</span><span class="semicolon">;</span>
86+
<span class="keyword">trait</span> <span class="trait_alias declaration">Bar</span> <span class="operator">=</span> <span class="unresolved_reference">Baz</span><span class="semicolon">;</span>
87+
<span class="keyword">trait</span> <span class="trait_alias declaration">Foo</span> <span class="operator">=</span> <span class="trait_alias">Bar</span><span class="semicolon">;</span>
88+
8589
<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
8690
<span class="keyword">let</span> <span class="variable declaration">a</span> <span class="operator">=</span> <span class="char_literal">'</span><span class="escape_sequence">\n</span><span class="char_literal">'</span><span class="semicolon">;</span>
8791
<span class="keyword">let</span> <span class="variable declaration">a</span> <span class="operator">=</span> <span class="char_literal">'</span><span class="escape_sequence">\t</span><span class="char_literal">'</span><span class="semicolon">;</span>

crates/ide/src/syntax_highlighting/tests.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,10 @@ macro_rules! reuse_twice {
466466
($literal:literal) => {{stringify!($literal); format_args!($literal)}};
467467
}
468468
469+
use foo::bar as baz;
470+
trait Bar = Baz;
471+
trait Foo = Bar;
472+
469473
fn main() {
470474
let a = '\n';
471475
let a = '\t';

0 commit comments

Comments
 (0)