Code folding will collapse entire line containing closing bracket in some scenarios

[Colengms]

This is based on #5521 , which appears to have partially addressed the issue.

Folding a block before an else (on the same line as closing bracket) will still collapse the line containing the else, in the following scenario:

    if (true) {
      if (false) {
        ;
      }
      ;
    } else {
      ;
    }

Ideally, folding should always avoid folding the else into the first block when on the same line as the closing bracket for the first block.