Skip to content

Commit 03e0bf7

Browse files
bors[bot]chetankhilosiya
bors[bot]
and
chetankhilosiya
authored
Merge #8354
8354: Distinguishing between different operators in semantic highlighting r=matklad a=chetankhilosiya Co-authored-by: Chetan Khilosiya <[email protected]>
2 parents e6728a8 + b232549 commit 03e0bf7

File tree

7 files changed

+87
-21
lines changed

7 files changed

+87
-21
lines changed

‎crates/ide/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub use crate::{
8282
references::{rename::RenameError, ReferenceSearchResult},
8383
runnables::{Runnable, RunnableKind, TestId},
8484
syntax_highlighting::{
85-
tags::{Highlight, HlMod, HlMods, HlPunct, HlTag},
85+
tags::{Highlight, HlMod, HlMods, HlOperator, HlPunct, HlTag},
8686
HlRange,
8787
},
8888
};

‎crates/ide/src/syntax_highlighting/highlight.rs‎

Lines changed: 47 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ use syntax::{
1212
SyntaxNode, SyntaxToken, T,
1313
};
1414

15-
use crate::{syntax_highlighting::tags::HlPunct, Highlight, HlMod, HlTag};
15+
use crate::{
16+
syntax_highlighting::tags::{HlOperator, HlPunct},
17+
Highlight, HlMod, HlTag,
18+
};
1619

1720
pub(super) fn element(
1821
sema: &Semantics<RootDatabase>,
@@ -132,7 +135,7 @@ pub(super) fn element(
132135
INT_NUMBER | FLOAT_NUMBER => HlTag::NumericLiteral.into(),
133136
BYTE => HlTag::ByteLiteral.into(),
134137
CHAR => HlTag::CharLiteral.into(),
135-
QUESTION => Highlight::new(HlTag::Operator) | HlMod::ControlFlow,
138+
QUESTION => Highlight::new(HlTag::Operator(HlOperator::Other)) | HlMod::ControlFlow,
136139
LIFETIME => {
137140
let lifetime = element.into_node().and_then(ast::Lifetime::cast).unwrap();
138141

@@ -146,8 +149,11 @@ pub(super) fn element(
146149
}
147150
}
148151
p if p.is_punct() => match p {
152+
T![&] if element.parent().and_then(ast::BinExpr::cast).is_some() => {
153+
HlTag::Operator(HlOperator::Bitwise).into()
154+
}
149155
T![&] => {
150-
let h = HlTag::Operator.into();
156+
let h = HlTag::Operator(HlOperator::Other).into();
151157
let is_unsafe = element
152158
.parent()
153159
.and_then(ast::RefExpr::cast)
@@ -159,13 +165,18 @@ pub(super) fn element(
159165
h
160166
}
161167
}
162-
T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => HlTag::Operator.into(),
168+
T![::] | T![->] | T![=>] | T![..] | T![=] | T![@] | T![.] => {
169+
HlTag::Operator(HlOperator::Other).into()
170+
}
163171
T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
164172
HlTag::Symbol(SymbolKind::Macro).into()
165173
}
166174
T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => {
167175
HlTag::BuiltinType.into()
168176
}
177+
T![!] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
178+
HlTag::Operator(HlOperator::Logical).into()
179+
}
169180
T![*] if element.parent().and_then(ast::PtrType::cast).is_some() => {
170181
HlTag::Keyword.into()
171182
}
@@ -175,9 +186,9 @@ pub(super) fn element(
175186
let expr = prefix_expr.expr()?;
176187
let ty = sema.type_of_expr(&expr)?;
177188
if ty.is_raw_ptr() {
178-
HlTag::Operator | HlMod::Unsafe
189+
HlTag::Operator(HlOperator::Other) | HlMod::Unsafe
179190
} else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() {
180-
HlTag::Operator.into()
191+
HlTag::Operator(HlOperator::Other).into()
181192
} else {
182193
HlTag::Punctuation(HlPunct::Other).into()
183194
}
@@ -188,19 +199,43 @@ pub(super) fn element(
188199
let expr = prefix_expr.expr()?;
189200
match expr {
190201
ast::Expr::Literal(_) => HlTag::NumericLiteral,
191-
_ => HlTag::Operator,
202+
_ => HlTag::Operator(HlOperator::Other),
192203
}
193204
.into()
194205
}
195206
_ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
196-
HlTag::Operator.into()
207+
HlTag::Operator(HlOperator::Other).into()
208+
}
209+
T![+] | T![-] | T![*] | T![/] | T![+=] | T![-=] | T![*=] | T![/=]
210+
if element.parent().and_then(ast::BinExpr::cast).is_some() =>
211+
{
212+
HlTag::Operator(HlOperator::Arithmetic).into()
213+
}
214+
T![|] | T![&] | T![!] | T![^] | T![|=] | T![&=] | T![^=]
215+
if element.parent().and_then(ast::BinExpr::cast).is_some() =>
216+
{
217+
HlTag::Operator(HlOperator::Bitwise).into()
218+
}
219+
T![&&] | T![||] if element.parent().and_then(ast::BinExpr::cast).is_some() => {
220+
HlTag::Operator(HlOperator::Logical).into()
221+
}
222+
T![>] | T![<] | T![==] | T![>=] | T![<=] | T![!=]
223+
if element.parent().and_then(ast::BinExpr::cast).is_some() =>
224+
{
225+
HlTag::Operator(HlOperator::Comparision).into()
226+
}
227+
_ if element.parent().and_then(ast::BinExpr::cast).is_some() => {
228+
HlTag::Operator(HlOperator::Other).into()
197229
}
198-
_ if element.parent().and_then(ast::BinExpr::cast).is_some() => HlTag::Operator.into(),
199230
_ if element.parent().and_then(ast::RangeExpr::cast).is_some() => {
200-
HlTag::Operator.into()
231+
HlTag::Operator(HlOperator::Other).into()
232+
}
233+
_ if element.parent().and_then(ast::RangePat::cast).is_some() => {
234+
HlTag::Operator(HlOperator::Other).into()
235+
}
236+
_ if element.parent().and_then(ast::RestPat::cast).is_some() => {
237+
HlTag::Operator(HlOperator::Other).into()
201238
}
202-
_ if element.parent().and_then(ast::RangePat::cast).is_some() => HlTag::Operator.into(),
203-
_ if element.parent().and_then(ast::RestPat::cast).is_some() => HlTag::Operator.into(),
204239
_ if element.parent().and_then(ast::Attr::cast).is_some() => HlTag::Attribute.into(),
205240
kind => HlTag::Punctuation(match kind {
206241
T!['['] | T![']'] => HlPunct::Bracket,

‎crates/ide/src/syntax_highlighting/tags.rs‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub enum HlTag {
2828
FormatSpecifier,
2929
Keyword,
3030
NumericLiteral,
31-
Operator,
31+
Operator(HlOperator),
3232
Punctuation(HlPunct),
3333
StringLiteral,
3434
UnresolvedReference,
@@ -87,6 +87,20 @@ pub enum HlPunct {
8787
Other,
8888
}
8989

90+
#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord)]
91+
pub enum HlOperator {
92+
/// |, &, !, ^, |=, &=, ^=
93+
Bitwise,
94+
/// +, -, *, /, +=, -=, *=, /=
95+
Arithmetic,
96+
/// &&, ||, !
97+
Logical,
98+
/// >, <, ==, >=, <=, !=
99+
Comparision,
100+
///
101+
Other,
102+
}
103+
90104
impl HlTag {
91105
fn as_str(self) -> &'static str {
92106
match self {
@@ -133,7 +147,13 @@ impl HlTag {
133147
HlPunct::Other => "punctuation",
134148
},
135149
HlTag::NumericLiteral => "numeric_literal",
136-
HlTag::Operator => "operator",
150+
HlTag::Operator(op) => match op {
151+
HlOperator::Bitwise => "bitwise",
152+
HlOperator::Arithmetic => "arithmetic",
153+
HlOperator::Logical => "logical",
154+
HlOperator::Comparision => "comparision",
155+
HlOperator::Other => "operator",
156+
},
137157
HlTag::StringLiteral => "string_literal",
138158
HlTag::UnresolvedReference => "unresolved_reference",
139159
HlTag::None => "none",

‎crates/ide/src/syntax_highlighting/test_data/highlight_doctest.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<span class="comment documentation">/// </span><span class="comment injected">// calls bar on foo</span>
7777
<span class="comment documentation">/// </span><span class="macro injected">assert!</span><span class="parenthesis injected">(</span><span class="none injected">foo</span><span class="operator injected">.</span><span class="none injected">bar</span><span class="parenthesis injected">(</span><span class="parenthesis injected">)</span><span class="parenthesis injected">)</span><span class="semicolon injected">;</span>
7878
<span class="comment documentation">///</span>
79-
<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="variable declaration injected">bar</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="variable injected">foo</span><span class="operator injected">.</span><span class="field injected">bar</span><span class="none injected"> </span><span class="operator injected">||</span><span class="none injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="constant injected">bar</span><span class="semicolon injected">;</span>
79+
<span class="comment documentation">/// </span><span class="keyword injected">let</span><span class="none injected"> </span><span class="variable declaration injected">bar</span><span class="none injected"> </span><span class="operator injected">=</span><span class="none injected"> </span><span class="variable injected">foo</span><span class="operator injected">.</span><span class="field injected">bar</span><span class="none injected"> </span><span class="logical injected">||</span><span class="none injected"> </span><span class="struct injected">Foo</span><span class="operator injected">::</span><span class="constant injected">bar</span><span class="semicolon injected">;</span>
8080
<span class="comment documentation">///</span>
8181
<span class="comment documentation">/// </span><span class="comment injected">/* multi-line</span>
8282
<span class="comment documentation">/// </span><span class="comment injected"> comment */</span>

‎crates/ide/src/syntax_highlighting/test_data/highlighting.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@
213213
<span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="numeric_literal">-</span><span class="numeric_literal">42</span><span class="semicolon">;</span>
214214
<span class="keyword">let</span> <span class="variable declaration">baz</span> <span class="operator">=</span> <span class="operator">-</span><span class="variable">baz</span><span class="semicolon">;</span>
215215

216-
<span class="keyword">let</span> <span class="punctuation">_</span> <span class="operator">=</span> <span class="operator">!</span><span class="bool_literal">true</span><span class="semicolon">;</span>
216+
<span class="keyword">let</span> <span class="punctuation">_</span> <span class="operator">=</span> <span class="logical">!</span><span class="bool_literal">true</span><span class="semicolon">;</span>
217217

218218
<span class="label declaration">'foo</span><span class="colon">:</span> <span class="keyword control">loop</span> <span class="brace">{</span>
219219
<span class="keyword control">break</span> <span class="label">'foo</span><span class="semicolon">;</span>

‎crates/rust-analyzer/src/semantic_tokens.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,26 @@ macro_rules! define_semantic_token_types {
3939

4040
define_semantic_token_types![
4141
(ANGLE, "angle"),
42+
(ARITHMETIC, "arithmetic"),
4243
(ATTRIBUTE, "attribute"),
44+
(BITWISE, "bitwise"),
4345
(BOOLEAN, "boolean"),
4446
(BRACE, "brace"),
4547
(BRACKET, "bracket"),
4648
(BUILTIN_TYPE, "builtinType"),
4749
(CHAR_LITERAL, "characterLiteral"),
4850
(COLON, "colon"),
4951
(COMMA, "comma"),
52+
(COMPARISION, "comparision"),
5053
(CONST_PARAMETER, "constParameter"),
5154
(DOT, "dot"),
5255
(ESCAPE_SEQUENCE, "escapeSequence"),
5356
(FORMAT_SPECIFIER, "formatSpecifier"),
5457
(GENERIC, "generic"),
5558
(LABEL, "label"),
5659
(LIFETIME, "lifetime"),
60+
(LOGICAL, "logical"),
61+
(OPERATOR, "operator"),
5762
(PARENTHESIS, "parenthesis"),
5863
(PUNCTUATION, "punctuation"),
5964
(SELF_KEYWORD, "selfKeyword"),

‎crates/rust-analyzer/src/to_proto.rs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ use std::{
77
use ide::{
88
Annotation, AnnotationKind, Assist, AssistKind, CallInfo, CompletionItem, CompletionItemKind,
99
CompletionRelevance, Documentation, FileId, FileRange, FileSystemEdit, Fold, FoldKind,
10-
Highlight, HlMod, HlPunct, HlRange, HlTag, Indel, InlayHint, InlayKind, InsertTextFormat,
11-
Markup, NavigationTarget, ReferenceAccess, RenameError, Runnable, Severity, SourceChange,
12-
StructureNodeKind, SymbolKind, TextEdit, TextRange, TextSize,
10+
Highlight, HlMod, HlOperator, HlPunct, HlRange, HlTag, Indel, InlayHint, InlayKind,
11+
InsertTextFormat, Markup, NavigationTarget, ReferenceAccess, RenameError, Runnable, Severity,
12+
SourceChange, StructureNodeKind, SymbolKind, TextEdit, TextRange, TextSize,
1313
};
1414
use itertools::Itertools;
1515
use serde_json::to_value;
@@ -463,7 +463,13 @@ fn semantic_token_type_and_modifiers(
463463
HlTag::FormatSpecifier => semantic_tokens::FORMAT_SPECIFIER,
464464
HlTag::Keyword => lsp_types::SemanticTokenType::KEYWORD,
465465
HlTag::None => semantic_tokens::GENERIC,
466-
HlTag::Operator => lsp_types::SemanticTokenType::OPERATOR,
466+
HlTag::Operator(op) => match op {
467+
HlOperator::Bitwise => semantic_tokens::BITWISE,
468+
HlOperator::Arithmetic => semantic_tokens::ARITHMETIC,
469+
HlOperator::Logical => semantic_tokens::LOGICAL,
470+
HlOperator::Comparision => semantic_tokens::COMPARISION,
471+
HlOperator::Other => semantic_tokens::OPERATOR,
472+
},
467473
HlTag::StringLiteral => lsp_types::SemanticTokenType::STRING,
468474
HlTag::UnresolvedReference => semantic_tokens::UNRESOLVED_REFERENCE,
469475
HlTag::Punctuation(punct) => match punct {

0 commit comments

Comments
 (0)