Skip to content

Commit e65d48d

Browse files
bors[bot]matklad
andauthored
Merge #5823
5823: Don't underline function definition if self is &mut r=Nashenas88 a=matklad The self is right there, and is already underlined, so it makes little sense to emit even more underlines. before: ![before](https://user-images.githubusercontent.com/1711539/90672843-0d379500-e257-11ea-840f-b0caed4410f1.png) after: ![after](https://user-images.githubusercontent.com/1711539/90672840-0c9efe80-e257-11ea-9739-23af433841c6.png) Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
2 parents d7466c9 + 8000d1d commit e65d48d

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
@@ -748,12 +748,6 @@ fn highlight_def(db: &RootDatabase, def: Definition) -> Highlight {
748748
if func.is_unsafe(db) {
749749
h |= HighlightModifier::Unsafe;
750750
}
751-
if let Some(self_param) = func.self_param(db) {
752-
match self_param.access(db) {
753-
hir::Access::Exclusive => h |= HighlightModifier::Mutable,
754-
hir::Access::Shared | hir::Access::Owned => (),
755-
}
756-
}
757751
return h;
758752
}
759753
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)