Instead of running ctrl+shift+F on the entire file, just run it on the blocks that you've edited for committing. If you want to change formating for the entire file later, you should do that in a separate branch and pull request. This makes it easier for me to merge your changes in since I don't have to deal with lines like this.