Upgrade to latest eclipse format