@@ -1002,10 +1002,8 @@ fn merge_text_and_snippet_edits(
1002
1002
let mut new_text = current_indel. insert ;
1003
1003
1004
1004
// find which snippet bits need to be escaped
1005
- let escape_places = new_text
1006
- . rmatch_indices ( [ '\\' , '$' , '{' , '}' ] )
1007
- . map ( |( insert, _) | insert)
1008
- . collect_vec ( ) ;
1005
+ let escape_places =
1006
+ new_text. rmatch_indices ( [ '\\' , '$' , '}' ] ) . map ( |( insert, _) | insert) . collect_vec ( ) ;
1009
1007
let mut escape_places = escape_places. into_iter ( ) . peekable ( ) ;
1010
1008
let mut escape_prior_bits = |new_text : & mut String , up_to : usize | {
1011
1009
for before in escape_places. peeking_take_while ( |insert| * insert >= up_to) {
@@ -2176,7 +2174,7 @@ fn bar(_: usize) {}
2176
2174
character: 0,
2177
2175
},
2178
2176
},
2179
- new_text: "\\$${1:ab\\ {\\}\\$c\\\\d}ef",
2177
+ new_text: "\\$${1:ab{\\}\\$c\\\\d}ef",
2180
2178
insert_text_format: Some(
2181
2179
Snippet,
2182
2180
),
@@ -2272,7 +2270,7 @@ struct ProcMacro {
2272
2270
character: 5,
2273
2271
},
2274
2272
},
2275
- new_text: "$0disabled = false;\n ProcMacro \\ {\n disabled,\n \\}",
2273
+ new_text: "$0disabled = false;\n ProcMacro {\n disabled,\n \\}",
2276
2274
insert_text_format: Some(
2277
2275
Snippet,
2278
2276
),
@@ -2336,7 +2334,7 @@ struct P {
2336
2334
character: 5,
2337
2335
},
2338
2336
},
2339
- new_text: "$0disabled = false;\n ProcMacro \\ {\n disabled,\n \\}",
2337
+ new_text: "$0disabled = false;\n ProcMacro {\n disabled,\n \\}",
2340
2338
insert_text_format: Some(
2341
2339
Snippet,
2342
2340
),
@@ -2401,7 +2399,7 @@ struct ProcMacro {
2401
2399
character: 5,
2402
2400
},
2403
2401
},
2404
- new_text: "${0:disabled} = false;\n ProcMacro \\ {\n disabled,\n \\}",
2402
+ new_text: "${0:disabled} = false;\n ProcMacro {\n disabled,\n \\}",
2405
2403
insert_text_format: Some(
2406
2404
Snippet,
2407
2405
),
@@ -2466,7 +2464,7 @@ struct P {
2466
2464
character: 5,
2467
2465
},
2468
2466
},
2469
- new_text: "${0:disabled} = false;\n ProcMacro \\ {\n disabled,\n \\}",
2467
+ new_text: "${0:disabled} = false;\n ProcMacro {\n disabled,\n \\}",
2470
2468
insert_text_format: Some(
2471
2469
Snippet,
2472
2470
),
0 commit comments