pmd / pmd / 836

80%

push

github

[groovy] Fix #7100: CPD fails on GStrings ending in an interpolated variable (#7110)

* Fix #7100: CPD fails on GStrings ending in an interpolated variable

GroovyCpdLexer used org.apache.groovy.parser.antlr4.GroovyLexer directly.
That lexer depends on its subclass GroovyLangLexer (the one the Groovy
compiler uses) to roll back one character after a GString path such as
"$i". Without it the character after the variable is swallowed: for
"x $i y" the following GString part lost its leading space, and for
"$i" or "x-$i" the closing quote was consumed, which made lexing fail.

Use GroovyLangLexer instead, and report GroovySyntaxError (an
AssertionError thrown by the Groovy lexer for some errors) as a
LexException so that it is handled like any other lexical error.

* [docs] Update release notes

---------

Co-authored-by: Sören Glimm <git@uncleowen.de>

20274 of 26466 branches covered (76.6%)

Branch coverage included in aggregate %.

5 of 5 new or added lines in 2 files covered. (100.0%)

43604 of 53640 relevant lines covered (81.29%)

0.82 hits per line