Skip to content

Commit acfc694

Browse files
8279: Fix the not operator use and test case fix.
1 parent 3bbc352 commit acfc694

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

crates/ide/src/syntax_highlighting/highlight.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -169,16 +169,13 @@ pub(super) fn element(
169169
HlTag::Operator(HlOperator::Other).into()
170170
}
171171
T![!] if element.parent().and_then(ast::MacroCall::cast).is_some() => {
172-
eprintln!("in macro call: {}", element);
173172
HlTag::Symbol(SymbolKind::Macro).into()
174173
}
175174
T![!] if element.parent().and_then(ast::NeverType::cast).is_some() => {
176-
eprintln!("in never type : {}", element);
177175
HlTag::BuiltinType.into()
178176
}
179177
T![!] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
180-
eprintln!("pre expr for : {}", element);
181-
HlTag::Operator(HlOperator::Bitwise).into()
178+
HlTag::Operator(HlOperator::Logical).into()
182179
}
183180
T![*] if element.parent().and_then(ast::PtrType::cast).is_some() => {
184181
HlTag::Keyword.into()
@@ -197,7 +194,6 @@ pub(super) fn element(
197194
}
198195
}
199196
T![-] if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
200-
eprintln!("the - operator: {}", element);
201197
let prefix_expr = element.parent().and_then(ast::PrefixExpr::cast)?;
202198

203199
let expr = prefix_expr.expr()?;
@@ -208,7 +204,6 @@ pub(super) fn element(
208204
.into()
209205
}
210206
_ if element.parent().and_then(ast::PrefixExpr::cast).is_some() => {
211-
eprintln!("the prefix expr block: {}", element);
212207
HlTag::Operator(HlOperator::Other).into()
213208
}
214209
T![+] | T![-] | T![*] | T![/] | T![+=] | T![-=] | T![*=] | T![/=]
@@ -230,11 +225,9 @@ pub(super) fn element(
230225
HlTag::Operator(HlOperator::Comparision).into()
231226
}
232227
_ if element.parent().and_then(ast::BinExpr::cast).is_some() => {
233-
eprintln!("the bin expr : {}", element);
234228
HlTag::Operator(HlOperator::Other).into()
235229
}
236230
_ if element.parent().and_then(ast::RangeExpr::cast).is_some() => {
237-
eprintln!("the range expr block: {}", element);
238231
HlTag::Operator(HlOperator::Other).into()
239232
}
240233
_ if element.parent().and_then(ast::RangePat::cast).is_some() => {

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

+1-1
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

+1-1
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>

0 commit comments

Comments
 (0)