bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Escape { and } as well

Browse source 
These are used in placeholder snippets, which may occur elsewhere in the insert text.
This commit is contained in:
DropDemBits 2024-02-16 00:18:00 -05:00
parent 1d8ed3408e
commit e8457bb78b
No known key found for this signature in database
GPG key ID: 7FE02A6C1EDFA075
1 changed files with 77 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1001,8 +1001,10 @@ fn merge_text_and_snippet_edits(
let mut new_text = current_indel.insert; let mut new_text = current_indel.insert;
// find which snippet bits need to be escaped // find which snippet bits need to be escaped
let escape_places = let escape_places = new_text
new_text.rmatch_indices(['\\', '$']).map(|(insert, _)| insert).collect_vec(); .rmatch_indices(['\\', '$', '{', '}'])
.map(|(insert, _)| insert)
.collect_vec();
let mut escape_places = escape_places.into_iter().peekable(); let mut escape_places = escape_places.into_iter().peekable();
let mut escape_prior_bits = |new_text: &mut String, up_to: usize| { let mut escape_prior_bits = |new_text: &mut String, up_to: usize| {
for before in escape_places.peeking_take_while(|insert| *insert >= up_to) { for before in escape_places.peeking_take_while(|insert| *insert >= up_to) {
@ -2173,7 +2175,7 @@ fn bar(_: usize) {}
character: 0, character: 0,
}, },
}, },
new_text: "\\$${1:ab{}\\$c\\\\d}ef", new_text: "\\$${1:ab\\{\\}\\$c\\\\d}ef",
insert_text_format: Some( insert_text_format: Some(
Snippet, Snippet,
), ),
@ -2242,41 +2244,41 @@ struct ProcMacro {
edit, edit,
snippets, snippets,
expect![[r#" expect![[r#"
[ [
SnippetTextEdit { SnippetTextEdit {
range: Range { range: Range {
start: Position { start: Position {
line: 1, line: 1,
character: 4, character: 4,
}, },
end: Position { end: Position {
line: 1, line: 1,
character: 13, character: 13,
}, },
}, },
new_text: "let", new_text: "let",
insert_text_format: None, insert_text_format: None,
annotation_id: None, annotation_id: None,
}, },
SnippetTextEdit { SnippetTextEdit {
range: Range { range: Range {
start: Position { start: Position {
line: 1, line: 1,
character: 14, character: 14,
}, },
end: Position { end: Position {
line: 3, line: 3,
character: 5, character: 5,
}, },
}, },
new_text: "$0disabled = false;\n ProcMacro {\n disabled,\n }", new_text: "$0disabled = false;\n ProcMacro \\{\n disabled,\n \\}",
insert_text_format: Some( insert_text_format: Some(
Snippet, Snippet,
), ),
annotation_id: None, annotation_id: None,
}, },
] ]
"#]], "#]],
); );
} }
@ -2306,41 +2308,41 @@ struct P {
edit, edit,
snippets, snippets,
expect![[r#" expect![[r#"
[ [
SnippetTextEdit { SnippetTextEdit {
range: Range { range: Range {
start: Position { start: Position {
line: 1, line: 1,
character: 4, character: 4,
}, },
end: Position { end: Position {
line: 1, line: 1,
character: 5, character: 5,
}, },
}, },
new_text: "let", new_text: "let",
insert_text_format: None, insert_text_format: None,
annotation_id: None, annotation_id: None,
}, },
SnippetTextEdit { SnippetTextEdit {
range: Range { range: Range {
start: Position { start: Position {
line: 1, line: 1,
character: 6, character: 6,
}, },
end: Position { end: Position {
line: 3, line: 3,
character: 5, character: 5,
}, },
}, },
new_text: "$0disabled = false;\n ProcMacro {\n disabled,\n }", new_text: "$0disabled = false;\n ProcMacro \\{\n disabled,\n \\}",
insert_text_format: Some( insert_text_format: Some(
Snippet, Snippet,
), ),
annotation_id: None, annotation_id: None,
}, },
] ]
"#]], "#]],
); );
} }
@ -2398,7 +2400,7 @@ struct ProcMacro {
character: 5, 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( insert_text_format: Some(
Snippet, Snippet,
), ),
@ -2463,7 +2465,7 @@ struct P {
character: 5, 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( insert_text_format: Some(
Snippet, Snippet,
), ),