Recognize existing indentation when indenting close braces

[mackenza]

this PR addresses #8395 and is a 2nd attempt. I refactored my fix based on feedback from @peterflynn and @redmunds in #8426

[peterflynn]

This can just be plain else since that's the only other clause in the outer if

[mackenza]

I added this 2nd conditional to handle the situation where there is actual text on the line. This will remove the whitespace between the electric char and the first non whitespace. That behaviour is contrary to our conversation in the issue, but it seemed more consistent with the prior case (all whitespace). If this is not desired, then the else condition can be removed.

[redmunds]

@mackenza The 1st condition seems to work great!

Can you describe a concrete case for the 2nd condition where you think this is desirable? In the 1st condition, the desire is to never leave whitespace at the end of a line after non-ws chars. But in the 2nd condition, I can't think of any case where the user intent is clear enough that we'd want to try to be smart about ws between non-ws chars.

[mackenza]

I am not sure I see a concrete use case, so you're probably right, we should probably just leave the whitespace alone... very socialist, and I am Canadian, so this meshes well with me ;)

[redmunds]

I think of it more as agile development: inspect and adapt. We can always update when we find a new annoyance :)

[dangoor]

Updated the title to be more descriptive. Feel free to change if I didn't capture the intent here well enough! Thanks for the PR

[redmunds]

Looks good. Merging.