Fix issue of comment indentation on opening line of a block

[whizsid]

Fixes #3255 , #3994

[calebcartwright]

Thanks for the PR! However, I don't want to get into the position of moving comments more than they already are, and would rather simply try to honor their original placement. I feel like moving up instead of down would just trade one set of problems/incorrect placement of comments with another set.

In addition to intentional same-line comments, we'll also inevitably have folks that temporarily comment something out that shouldn't be moved at all and many that likely run into that with format-on-save feature in their editors.

Do you want to try to update this to maintain the same line positioning instead?