Incorrect whitespace when match_arm_blocks set to false

When the config option for match_arm_blocks is set to false, the formatter adds additional whitespace which causes errors saying: 'error[internal]: left behind trailing whitespace'

For example:

match pos_iter.peek()
    {
        Some(pos) if pos.0 != 0 =>
            add_paragraphs_to_map(&doc[0..pos.0], 0, current_level, &mut paragraphs),
        None => add_paragraphs_to_map(doc, 0, current_level, &mut paragraphs),
        _ => (),
    }

// becomes

match pos_iter.peek()
    {
        Some(pos) if pos.0 != 0 =>
        
            add_paragraphs_to_map(&doc[0..pos.0], 0, current_level, &mut paragraphs),
        None => add_paragraphs_to_map(doc, 0, current_level, &mut paragraphs),
        _ => (),
    }

Start by reproducing the example with match_arm_blocks set to false and inspect the formatter path that handles match arms. Add a regression test covering the shown input and verify that formatting no longer leaves trailing whitespace or inserts the extra blank line.