Also needs to make sorting imports a default.
and stop removing extra leading whitespace before inline comments (#7684)
and stop removing extra leading whitespace before inline comments (#7684)