language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-28 18:43:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix syntactic highlighting for renames

Browse source
This commit is contained in:
Laurențiu Nicola 2025-01-27 15:45:37 +02:00
parent 6862329068
commit 7d8f53d55c
3 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/ide/src/syntax_highlighting/highlight.rs
View file

@ -669,6 +669,12 @@ fn highlight_name_by_syntax(name: ast::Name) -> Highlight {
STATIC => SymbolKind::Static, STATIC => SymbolKind::Static,
IDENT_PAT => SymbolKind::Local, IDENT_PAT => SymbolKind::Local,
FORMAT_ARGS_ARG => SymbolKind::Local, FORMAT_ARGS_ARG => SymbolKind::Local,
RENAME => SymbolKind::Local,
MACRO_RULES => SymbolKind::Macro,
CONST_PARAM => SymbolKind::ConstParam,
SELF_PARAM => SymbolKind::SelfParam,
TRAIT_ALIAS => SymbolKind::TraitAlias,
ASM_OPERAND_NAMED => SymbolKind::Local,
_ => return default.into(), _ => return default.into(),
}; };

4
crates/ide/src/syntax_highlighting/test_data/highlight_strings.html
View file

@ -82,6 +82,10 @@ pre { color: #DCDCCC; background: #3F3F3F; font-size: 22px; padd
<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> <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>
<span class="brace">}</span> <span class="brace">}</span>
<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>
<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>
<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>
<span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span> <span class="keyword">fn</span> <span class="function declaration">main</span><span class="parenthesis">(</span><span class="parenthesis">)</span> <span class="brace">{</span>
<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> <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>
<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> <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>

4
crates/ide/src/syntax_highlighting/tests.rs
View file

@ -466,6 +466,10 @@ macro_rules! reuse_twice {
($literal:literal) => {{stringify!($literal); format_args!($literal)}}; ($literal:literal) => {{stringify!($literal); format_args!($literal)}};
} }
use foo::bar as baz;
trait Bar = Baz;
trait Foo = Bar;
fn main() { fn main() {
let a = '\n'; let a = '\n';
let a = '\t'; let a = '\t';