Skip to content

Commit 8000d1d

Browse files
committed
Don't underline function definition if self is &mut
The self is right there, and is already underlined, so it makes little sense to emit even more underlines.
1 parent eb7bb2c commit 8000d1d

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

crates/ide/src/syntax_highlighting.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -747,12 +747,6 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
747747
if func.is_unsafe(db) {
748748
h |= HighlightModifier::Unsafe;
749749
}
750-
if let Some(self_param) = func.self_param(db) {
751-
match self_param.access(db) {
752-
hir::Access::Exclusive => h |= HighlightModifier::Mutable,
753-
hir::Access::Shared | hir::Access::Owned => (),
754-
}
755-
}
756750
return h;
757751
}
758752
hir::ModuleDef::Adt(hir::Adt::Struct(_)) => HighlightTag::Struct,

crates/ide/test_data/highlighting.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
<span class="self_keyword">self</span><span class="punctuation">.</span><span class="field">x</span>
6666
<span class="punctuation">}</span>
6767

68-
<span class="keyword">fn</span> <span class="function declaration mutable">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
68+
<span class="keyword">fn</span> <span class="function declaration">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
6969
<span class="self_keyword mutable">self</span><span class="punctuation">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span>
7070
<span class="punctuation">}</span>
7171

@@ -84,7 +84,7 @@
8484
<span class="self_keyword">self</span><span class="punctuation">.</span><span class="field">x</span>
8585
<span class="punctuation">}</span>
8686

87-
<span class="keyword">fn</span> <span class="function declaration mutable">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
87+
<span class="keyword">fn</span> <span class="function declaration">qux</span><span class="punctuation">(</span><span class="operator">&</span><span class="keyword">mut</span> <span class="self_keyword mutable">self</span><span class="punctuation">)</span> <span class="punctuation">{</span>
8888
<span class="self_keyword mutable">self</span><span class="punctuation">.</span><span class="field">x</span> <span class="operator">=</span> <span class="numeric_literal">0</span><span class="punctuation">;</span>
8989
<span class="punctuation">}</span>
9090

0 commit comments

Comments
 (0)