@@ -51,11 +51,7 @@ fn is_string_literal(item: &str) -> bool {
51
51
if item. len ( ) < 2 {
52
52
return false ;
53
53
}
54
- if item. chars ( ) . nth ( 0 ) != Some ( '"' ) || item. chars ( ) . nth ( item. len ( ) - 1 ) != Some ( '"' ) {
55
- return false ;
56
- }
57
-
58
- true
54
+ item. starts_with ( "\" " ) && item. ends_with ( "\" " )
59
55
}
60
56
61
57
/// Parser for a format-like string. It is more allowing in terms of string contents,
@@ -269,8 +265,8 @@ mod tests {
269
265
( "{correct}}}" , Some ( ( "{}}}" , vec ! [ "correct" ] ) ) ) ,
270
266
( "{correct}}}}}" , Some ( ( "{}}}}}" , vec ! [ "correct" ] ) ) ) ,
271
267
( "{incorrect}}" , None ) ,
272
- ( "placeholders {} {}" , Some ( ( "placeholders {} {}" , vec ! [ "$0 " , "$1 " ] ) ) ) ,
273
- ( "mixed {} {2 + 2} {}" , Some ( ( "mixed {} {} {}" , vec ! [ "$0 " , "2 + 2" , "$1 " ] ) ) ) ,
268
+ ( "placeholders {} {}" , Some ( ( "placeholders {} {}" , vec ! [ "$1 " , "$2 " ] ) ) ) ,
269
+ ( "mixed {} {2 + 2} {}" , Some ( ( "mixed {} {} {}" , vec ! [ "$1 " , "2 + 2" , "$2 " ] ) ) ) ,
274
270
(
275
271
"{SomeStruct { val_a: 0, val_b: 1 }}" ,
276
272
Some ( ( "{}" , vec ! [ "SomeStruct { val_a: 0, val_b: 1 }" ] ) ) ,
@@ -309,11 +305,11 @@ mod tests {
309
305
#[ test]
310
306
fn test_into_suggestion ( ) {
311
307
let test_vector = & [
312
- ( PostfixKind :: Println , "{}" , r#"println!("{}", $0 )"# ) ,
308
+ ( PostfixKind :: Println , "{}" , r#"println!("{}", $1 )"# ) ,
313
309
(
314
310
PostfixKind :: LogInfo ,
315
311
"{} {expr} {} {2 + 2}" ,
316
- r#"log::info!("{} {} {} {}", $0 , expr, $1 , 2 + 2)"# ,
312
+ r#"log::info!("{} {} {} {}", $1 , expr, $2 , 2 + 2)"# ,
317
313
) ,
318
314
( PostfixKind :: Format , "{expr:?}" , r#"format!("{:?}", expr)"# ) ,
319
315
] ;
0 commit comments