@@ -334,11 +334,12 @@ pub fn source_edit_from_references(
334
334
_ => false ,
335
335
} ;
336
336
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 ( ) ) ,
342
343
} ;
343
344
344
345
edit. replace ( range, new_name) ;
@@ -507,14 +508,14 @@ fn source_edit_from_def(
507
508
}
508
509
}
509
510
if edit. is_empty ( ) {
510
- let new_name = match def {
511
+ let ( range , new_name) = match def {
511
512
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 ( ) ) ,
516
518
} ;
517
-
518
519
edit. replace ( range, new_name) ;
519
520
}
520
521
Ok ( ( file_id, edit. finish ( ) ) )
0 commit comments