emacs mode indentation is wrong when function return -> is on its own line

[steveklabnik]

Issue by nikomatsakis
Wednesday Apr 16, 2014 at 19:39 GMT

For earlier discussion, see rust-lang/rust#13566

This issue was labelled with: A-tools in the Rust repository

---

The following code indents as shown here, which is weird:

pub fn from_pointer_kind(base_mutbl: MutabilityCategory,
                         ptr: PointerKind)
                         -> MutabilityCategory {
                             match ptr {
                             }
                         }

I expect it to be:

pub fn from_pointer_kind(base_mutbl: MutabilityCategory,
                         ptr: PointerKind)
                         -> MutabilityCategory {
    match ptr {
    }
}

[strega-nil]

Okay, the problem is with (rust-rewind-to-beginning-of-current-level-expr).
When run in the first case:

pub fn test(...
           |...) -> Test {
           ^ Point is here
}

it moves to

pub fn test|(...
           ^ Point is here now
             ...) -> Test {
}

However, when run with the ->, goes from

pub fn test(...)
           |-> Test {
           ^ Point is here
}

to

pub fn test(...)
           |-> Test {
           ^ Point is here
}

As you can see, the point doesn't actually move at all. I'm working on some fixes.

The reason for this is that there is a check for

(while (> (rust-paren-level) current-level)

Which is obviously only true when you are within the parentheses of the argument list.

[nikomatsakis]

🐎 If you fix this bug, you'll be my official rust-mode "Hero of the Day". :)

[strega-nil]

I have fixed this bug, but the pull request has not been accepted :P

On Thu, Apr 16, 2015 at 4:25 PM Niko Matsakis [email protected]
wrote:

[image: 🐎] If you fix this bug, you'll be my official rust-mode
"Hero of the Day". :)

—
Reply to this email directly or view it on GitHub
#8 (comment).

[strega-nil]

Check out #52

[strega-nil]

Oh, right. Making sure you read this, @nikomatsakis :P