Handle single statement condition blocks better

See test case for full detail of what is fixed. Essentially it is that if you have something like:

    if (true)
        doWork();

and the cursor is on the semicolon, pressing enter should decrease indent level to that of the if statement.

BUG: 385472