format macro argument parsing fix

osa1 · osa1 · commit ce4e668e39f7 · 2021-03-27T13:06:36.000+03:00
When the character next to `{}` is "shifted" (when mapping a byte index in the format string to span) we should avoid shifting the span end index, so first map the index of `}` to span, then bump the span, instead of first mapping the next byte index to a span (which causes bumping the end span too much). Regression test added. Fixes rust-lang#83344
diff --git a/tests/ui/write_literal_2.stderr b/tests/ui/write_literal_2.stderr
@@ -75,8 +75,9 @@ LL |         "1", "2", "3",
    |
 help: try this
    |
-LL |         "some 1{} / {}", "2", "3",
-   |               ^        --
+LL |         "some 1/
+LL |         {} / {}", "2", "3",
+   |
 
 error: literal with an empty format string
   --> $DIR/write_literal_2.rs:25:14

Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,9 @@ LL \| "1", "2", "3",`
`75`	`75`	`\|`
`76`	`76`	`help: try this`
`77`	`77`	`\|`
`78`		`-LL \| "some 1{} / {}", "2", "3",`
`79`		`- \| ^ --`
	`78`	`+LL \| "some 1/`
	`79`	`+LL \| {} / {}", "2", "3",`
	`80`	`+ \|`
`80`	`81`
`81`	`82`	`error: literal with an empty format string`
`82`	`83`	`--> $DIR/write_literal_2.rs:25:14`