phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Antlr token implementation respect its contract

Browse Source
This commit is contained in:
Clément Fournier
2020-03-22 00:49:55 +01:00
parent 16f30c9ece
commit f6260463d7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrToken.java
View File

@ -16,6 +16,7 @@ public class AntlrToken implements GenericToken<AntlrToken> {
private final Token token;
private final AntlrToken previousComment;
AntlrToken next;
/**
* Constructor
@ -30,8 +31,7 @@ public class AntlrToken implements GenericToken<AntlrToken> {
@Override
public AntlrToken getNext() {
// Antlr implementation does not require this
return null;
return next;
}
@Override

3
pmd-core/src/main/java/net/sourceforge/pmd/lang/ast/impl/antlr4/AntlrTokenManager.java
View File

@ -45,6 +45,9 @@ public class AntlrTokenManager implements TokenManager<AntlrToken> {
private AntlrToken getNextTokenFromAnyChannel() {
final AntlrToken previousComment = previousToken != null && previousToken.isHidden() ? previousToken : null;
final AntlrToken currentToken = new AntlrToken(lexer.nextToken(), previousComment);
if (previousToken != null) {
previousToken.next = currentToken;
}
previousToken = currentToken;
return currentToken;