After spending a relative good amount of time on the indenter I'm more and more of the idea that we need to rewrite a a scanner and an indenter tailored to Scala (the Java doesn't always work).

Here is another example:

object Test {; /* press enter */
}

Pressing enter where I inserted the comment will go to the line without indenting the block.