mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #7076

Browse Source 
7076: Properly parse path separators in format-like postfix r=Veykril a=Veykril



Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
This commit is contained in:
bors[bot] 2020-12-29 12:12:19 +00:00 committed by GitHub
commit 7b246a6a14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crates/completion/src/completions/postfix/format_like.rs
View File

@ -108,7 +108,8 @@ pub(crate) fn parse(&mut self) -> Result<(), ()> {
// "{MyStruct { val_a: 0, val_b: 1 }}". // "{MyStruct { val_a: 0, val_b: 1 }}".
let mut inexpr_open_count = 0; let mut inexpr_open_count = 0;
for chr in self.input.chars() { let mut chars = self.input.chars().peekable();
while let Some(chr) = chars.next() {
match (self.state, chr) { match (self.state, chr) {
(State::NotExpr, '{') => { (State::NotExpr, '{') => {
self.output.push(chr); self.output.push(chr);
@ -157,6 +158,11 @@ pub(crate) fn parse(&mut self) -> Result<(), ()> {
inexpr_open_count -= 1; inexpr_open_count -= 1;
} }
} }
(State::Expr, ':') if chars.peek().copied() == Some(':') => {
// path seperator
current_expr.push_str("::");
chars.next();
}
(State::Expr, ':') => { (State::Expr, ':') => {
if inexpr_open_count == 0 { if inexpr_open_count == 0 {
// We're outside of braces, thus assume that it's a specifier, like "{Some(value):?}" // We're outside of braces, thus assume that it's a specifier, like "{Some(value):?}"
@ -249,6 +255,9 @@ fn format_str_parser() {
expect![["{:?}; SomeStruct { val_a: 0, val_b: 1 }"]], expect![["{:?}; SomeStruct { val_a: 0, val_b: 1 }"]],
), ),
("{ 2 + 2 }", expect![["{}; 2 + 2"]]), ("{ 2 + 2 }", expect![["{}; 2 + 2"]]),
("{strsim::jaro_winkle(a)}", expect![["{}; strsim::jaro_winkle(a)"]]),
("{foo::bar::baz()}", expect![["{}; foo::bar::baz()"]]),
("{foo::bar():?}", expect![["{:?}; foo::bar()"]]),
]; ];
for (input, output) in test_vector { for (input, output) in test_vector {