| T![return]
| T![while]
| T![in] => h | HighlightModifier::ControlFlow,
- T![for] if !is_child_of_impl(element) => h | HighlightModifier::ControlFlow,
+ T![for] if !is_child_of_impl(&element) => h | HighlightModifier::ControlFlow,
T![unsafe] => h | HighlightModifier::Unsafe,
T![true] | T![false] => HighlightTag::BoolLiteral.into(),
- T![self] => HighlightTag::SelfKeyword.into(),
+ T![self] => {
+ let self_param_is_mut = element
+ .parent()
+ .and_then(ast::SelfParam::cast)
+ .and_then(|p| p.mut_token())
+ .is_some();
+ // closure to enforce lazyness
+ let self_path = || {
+ sema.resolve_path(&element.parent()?.parent().and_then(ast::Path::cast)?)
+ };
+ if self_param_is_mut
+ || matches!(self_path(),
+ Some(hir::PathResolution::Local(local))
+ if local.is_self(db)
+ && (local.is_mut(db) || local.ty(db).is_mutable_reference())
+ )
+ {
+ HighlightTag::SelfKeyword | HighlightModifier::Mutable
+ } else {
+ HighlightTag::SelfKeyword.into()
+ }
+ }
_ => h,
}
}
}
}
-fn is_child_of_impl(element: SyntaxElement) -> bool {
+fn is_child_of_impl(element: &SyntaxElement) -> bool {
match element.parent() {
Some(e) => e.kind() == IMPL_DEF,
_ => false,
}
}
+<span class="keyword">impl</span> <span class="struct">Foo</span> {
+ <span class="keyword">fn</span> <span class="function declaration">baz</span>(<span class="keyword">mut</span> <span class="self_keyword mutable">self</span>) -> <span class="builtin_type">i32</span> {
+ <span class="self_keyword">self</span>.<span class="field">x</span>
+ }
+
+ <span class="keyword">fn</span> <span class="function declaration">qux</span>(&<span class="keyword">mut</span> <span class="self_keyword mutable">self</span>) {
+ <span class="self_keyword mutable">self</span>.<span class="field">x</span> = <span class="numeric_literal">0</span>;
+ }
+}
+
<span class="keyword">static</span> <span class="keyword">mut</span> <span class="static declaration mutable">STATIC_MUT</span>: <span class="builtin_type">i32</span> = <span class="numeric_literal">0</span>;
<span class="keyword">fn</span> <span class="function declaration">foo</span><<span class="lifetime declaration">'a</span>, <span class="type_param declaration">T</span>>() -> <span class="type_param">T</span> {