[forge-commits] [forge/java-parser] 7ec717: merge bugfix and tests from refactor branch