@@ -334,11 +334,12 @@ pub fn source_edit_from_references(
334334 _ => false ,
335335 } ;
336336 if !has_emitted_edit && !edited_ranges. contains ( & range. start ( ) ) {
337- let new_name = match name {
338- ast:: NameLike :: Lifetime ( _) => {
339- format ! ( "'{}" , new_name. trim_start_matches( "'" ) )
340- }
341- _ => new_name. into ( ) ,
337+ let ( range, new_name) = match name {
338+ ast:: NameLike :: Lifetime ( _) => (
339+ TextRange :: new ( range. start ( ) + syntax:: TextSize :: from ( 1 ) , range. end ( ) ) ,
340+ new_name. strip_prefix ( '\'' ) . unwrap_or ( new_name) . to_owned ( ) ,
341+ ) ,
342+ _ => ( range, new_name. to_owned ( ) ) ,
342343 } ;
343344
344345 edit. replace ( range, new_name) ;
@@ -507,14 +508,14 @@ fn source_edit_from_def(
507508 }
508509 }
509510 if edit. is_empty ( ) {
510- let new_name = match def {
511+ let ( range , new_name) = match def {
511512 Definition :: GenericParam ( hir:: GenericParam :: LifetimeParam ( _) )
512- | Definition :: Label ( _) => {
513- format ! ( "'{}" , new_name. trim_start_matches( "'" ) )
514- }
515- _ => new_name. into ( ) ,
513+ | Definition :: Label ( _) => (
514+ TextRange :: new ( range. start ( ) + syntax:: TextSize :: from ( 1 ) , range. end ( ) ) ,
515+ new_name. strip_prefix ( '\'' ) . unwrap_or ( new_name) . to_owned ( ) ,
516+ ) ,
517+ _ => ( range, new_name. to_owned ( ) ) ,
516518 } ;
517-
518519 edit. replace ( range, new_name) ;
519520 }
520521 Ok ( ( file_id, edit. finish ( ) ) )
0 commit comments