Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 14:03:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16618 - DropDemBits:structured-snippet-fix-escape-left-curly, r=Veykril

Browse source 
fix: Don't add `\` before `{`

Fixes #16607 for `{`. The `}` case is already fixed by #16475.

The [LSP snippet grammar](https://microsoft.github.io/language-server-protocol/specifications/lsp/3.17/specification/#snippet_syntax) only specifies that `$`, `}`, and `\` can be escaped with backslashes, but not `{`.
This commit is contained in:
bors 2024-02-20 20:11:03 +00:00
commit 543d7e98db
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
crates/rust-analyzer/src/lsp/to_proto.rs
View file

@ -1002,10 +1002,8 @@ fn merge_text_and_snippet_edits(
let mut new_text = current_indel.insert;
// find which snippet bits need to be escaped
let escape_places = new_text
.rmatch_indices(['\\', '$', '{', '}'])
.map(|(insert, _)| insert)
.collect_vec();
let escape_places =
new_text.rmatch_indices(['\\', '$', '}']).map(|(insert, _)| insert).collect_vec();
let mut escape_places = escape_places.into_iter().peekable();
let mut escape_prior_bits = |new_text: &mut String, up_to: usize| {
for before in escape_places.peeking_take_while(|insert| *insert >= up_to) {
@ -2176,7 +2174,7 @@ fn bar(_: usize) {}
character: 0,
},
},
new_text: "\\$${1:ab\\{\\}\\$c\\\\d}ef",
new_text: "\\$${1:ab{\\}\\$c\\\\d}ef",
insert_text_format: Some(
Snippet,
),
@ -2272,7 +2270,7 @@ struct ProcMacro {
character: 5,
},
},
new_text: "$0disabled = false;\n ProcMacro \\{\n disabled,\n \\}",
new_text: "$0disabled = false;\n ProcMacro {\n disabled,\n \\}",
insert_text_format: Some(
Snippet,
),
@ -2336,7 +2334,7 @@ struct P {
character: 5,
},
},
new_text: "$0disabled = false;\n ProcMacro \\{\n disabled,\n \\}",
new_text: "$0disabled = false;\n ProcMacro {\n disabled,\n \\}",
insert_text_format: Some(
Snippet,
),
@ -2401,7 +2399,7 @@ struct ProcMacro {
character: 5,
},
},
new_text: "${0:disabled} = false;\n ProcMacro \\{\n disabled,\n \\}",
new_text: "${0:disabled} = false;\n ProcMacro {\n disabled,\n \\}",
insert_text_format: Some(
Snippet,
),
@ -2466,7 +2464,7 @@ struct P {
character: 5,
},
},
new_text: "${0:disabled} = false;\n ProcMacro \\{\n disabled,\n \\}",
new_text: "${0:disabled} = false;\n ProcMacro {\n disabled,\n \\}",
insert_text_format: Some(
Snippet,
),