Fix the spans of catch blocks to include the `do` #43463

nrc · 2017-07-24T23:40:42Z

No description provided.

rust-highfive · 2017-07-24T23:40:52Z

r? @nikomatsakis

(rust_highfive has picked a reviewer for you, use r? to override)

petrochenkov · 2017-07-25T00:06:59Z

@bors r+ rollup

bors · 2017-07-25T00:07:00Z

📌 Commit 5388470 has been approved by petrochenkov

topecongiro · 2017-07-25T03:29:24Z

src/libsyntax/parse/parser.rs

@@ -2243,9 +2243,9 @@ impl<'a> Parser<'a> {
                        attrs);
                }
                if self.is_catch_expr() {
+                    let lo = self.span;


Shouldn't this come after self.eat_keyword(keywords::Do) instead of before?

I changed from using prev_span to span, so we can move it before the eat(Do) expression

Sorry, I missed the change. Thank you for your reply, and sorry for the noise.

nikomatsakis

r=me with a test; the most straightforward thing would be to add a src/test/ui test that has incorrect highlighting with the current span.

Fix the spans of catch blocks to include the `do`

Rollup of 10 pull requests - Successful merges: #42959, #43447, #43455, #43456, #43458, #43462, #43463, #43465, #43471, #43480 - Failed merges:

Fix the spans of catch blocks to include the do

5388470

rust-highfive assigned nikomatsakis Jul 24, 2017

topecongiro mentioned this pull request Jul 25, 2017

Format attributes on stmt and single line block rust-lang/rustfmt#1814

Closed

topecongiro reviewed Jul 25, 2017

View reviewed changes

nikomatsakis requested changes Jul 25, 2017

View reviewed changes

Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 26, 2017

Rollup merge of rust-lang#43463 - nrc:catch-span, r=petrochenkov

f7d06b3

Fix the spans of catch blocks to include the `do`

Mark-Simulacrum mentioned this pull request Jul 26, 2017

Rollup of 10 pull requests #43487

Merged

bors added a commit that referenced this pull request Jul 26, 2017

Auto merge of #43487 - Mark-Simulacrum:rollup, r=Mark-Simulacrum

599be0d

Rollup of 10 pull requests - Successful merges: #42959, #43447, #43455, #43456, #43458, #43462, #43463, #43465, #43471, #43480 - Failed merges:

bors merged commit 5388470 into rust-lang:master Jul 26, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the spans of catch blocks to include the `do` #43463

Fix the spans of catch blocks to include the `do` #43463

nrc commented Jul 24, 2017

rust-highfive commented Jul 24, 2017

petrochenkov commented Jul 25, 2017

bors commented Jul 25, 2017

topecongiro Jul 25, 2017

nrc Jul 25, 2017

topecongiro Jul 25, 2017

nikomatsakis left a comment

Fix the spans of catch blocks to include the do #43463

Fix the spans of catch blocks to include the do #43463

Conversation

nrc commented Jul 24, 2017

rust-highfive commented Jul 24, 2017

petrochenkov commented Jul 25, 2017

bors commented Jul 25, 2017

topecongiro Jul 25, 2017

Choose a reason for hiding this comment

nrc Jul 25, 2017

Choose a reason for hiding this comment

topecongiro Jul 25, 2017

Choose a reason for hiding this comment

nikomatsakis left a comment

Choose a reason for hiding this comment

Fix the spans of catch blocks to include the `do` #43463

Fix the spans of catch blocks to include the `do` #43463