At the moment statements like break, continue, return, goto do not include the semicolon in the end within getEndLoc(). Add missing SourceLocation to those statements to express their EndLoc.
Warning: this is a proof of concept. It works at least in some cases. However I have no idea what I'm doing here.