@@ -4,7 +4,7 @@ mod injection;
44#[ cfg( test) ]
55mod tests;
66
7- use hir:: { Name , Semantics , VariantDef } ;
7+ use hir:: { Local , Name , Semantics , VariantDef } ;
88use ide_db:: {
99 defs:: { classify_name, classify_name_ref, Definition , NameClass , NameRefClass } ,
1010 RootDatabase ,
@@ -13,8 +13,8 @@ use rustc_hash::FxHashMap;
1313use syntax:: {
1414 ast:: { self , HasFormatSpecifier } ,
1515 AstNode , AstToken , Direction , NodeOrToken , SyntaxElement ,
16- SyntaxKind :: * ,
17- TextRange , WalkEvent , T ,
16+ SyntaxKind :: { self , * } ,
17+ SyntaxNode , SyntaxToken , TextRange , WalkEvent , T ,
1818} ;
1919
2020use crate :: FileId ;
@@ -454,6 +454,32 @@ fn macro_call_range(macro_call: &ast::MacroCall) -> Option<TextRange> {
454454 Some ( TextRange :: new ( range_start, range_end) )
455455}
456456
457+ /// Returns true if the parent nodes of `node` all match the `SyntaxKind`s in `kinds` exactly.
458+ fn parents_match ( mut node : NodeOrToken < SyntaxNode , SyntaxToken > , mut kinds : & [ SyntaxKind ] ) -> bool {
459+ while let ( Some ( parent) , [ kind, rest @ ..] ) = ( & node. parent ( ) , kinds) {
460+ if parent. kind ( ) != * kind {
461+ return false ;
462+ }
463+
464+ // FIXME: Would be nice to get parent out of the match, but binding by-move and by-value
465+ // in the same pattern is unstable: rust-lang/rust#68354.
466+ node = node. parent ( ) . unwrap ( ) . into ( ) ;
467+ kinds = rest;
468+ }
469+
470+ // Only true if we matched all expected kinds
471+ kinds. len ( ) == 0
472+ }
473+
474+ fn is_consumed_lvalue (
475+ node : NodeOrToken < SyntaxNode , SyntaxToken > ,
476+ local : & Local ,
477+ db : & RootDatabase ,
478+ ) -> bool {
479+ // When lvalues are passed as arguments and they're not Copy, then mark them as Consuming.
480+ parents_match ( node, & [ PATH_SEGMENT , PATH , PATH_EXPR , ARG_LIST ] ) && !local. ty ( db) . is_copy ( db)
481+ }
482+
457483fn highlight_element (
458484 sema : & Semantics < RootDatabase > ,
459485 bindings_shadow_count : & mut FxHashMap < Name , u32 > ,
@@ -522,6 +548,12 @@ fn highlight_element(
522548
523549 let mut h = highlight_def ( db, def) ;
524550
551+ if let Definition :: Local ( local) = & def {
552+ if is_consumed_lvalue ( name_ref. syntax ( ) . clone ( ) . into ( ) , local, db) {
553+ h |= HighlightModifier :: Consuming ;
554+ }
555+ }
556+
525557 if let Some ( parent) = name_ref. syntax ( ) . parent ( ) {
526558 if matches ! ( parent. kind( ) , FIELD_EXPR | RECORD_PAT_FIELD ) {
527559 if let Definition :: Field ( field) = def {
@@ -645,21 +677,30 @@ fn highlight_element(
645677 . and_then ( ast:: SelfParam :: cast)
646678 . and_then ( |p| p. mut_token ( ) )
647679 . is_some ( ) ;
648- // closure to enforce lazyness
649- let self_path = || {
650- sema. resolve_path ( & element. parent ( ) ?. parent ( ) . and_then ( ast:: Path :: cast) ?)
651- } ;
680+ let self_path = & element
681+ . parent ( )
682+ . as_ref ( )
683+ . and_then ( SyntaxNode :: parent)
684+ . and_then ( ast:: Path :: cast)
685+ . and_then ( |p| sema. resolve_path ( & p) ) ;
686+ let mut h = HighlightTag :: SelfKeyword . into ( ) ;
652687 if self_param_is_mut
653- || matches ! ( self_path( ) ,
688+ || matches ! ( self_path,
654689 Some ( hir:: PathResolution :: Local ( local) )
655690 if local. is_self( db)
656691 && ( local. is_mut( db) || local. ty( db) . is_mutable_reference( ) )
657692 )
658693 {
659- HighlightTag :: SelfKeyword | HighlightModifier :: Mutable
660- } else {
661- HighlightTag :: SelfKeyword . into ( )
694+ h |= HighlightModifier :: Mutable
662695 }
696+
697+ if let Some ( hir:: PathResolution :: Local ( local) ) = self_path {
698+ if is_consumed_lvalue ( element, & local, db) {
699+ h |= HighlightModifier :: Consuming ;
700+ }
701+ }
702+
703+ h
663704 }
664705 T ! [ ref] => element
665706 . parent ( )
![bors[bot]](https://avatars.githubusercontent.com/in/1847?v=4&size=40){kind=avatar}
0 commit comments