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

merge fixes

Browse Source
This commit is contained in:
lsoncini
2019-02-17 20:28:57 -03:00
parent 9b12f1e3d0
commit 55c2c00e7a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-core/src/main/java/net/sourceforge/pmd/cpd/token/internal/BaseTokenFilter.java
View File

@ -69,7 +69,7 @@ public abstract class BaseTokenFilter<T extends GenericToken> implements TokenFi
* @param currentToken The token to be analyzed * @param currentToken The token to be analyzed
* @see #isLanguageSpecificDiscarding() * @see #isLanguageSpecificDiscarding()
*/ */
protected void analyzeToken(final GenericToken currentToken) { protected void analyzeToken(final T currentToken) {
// noop // noop
} }

3
pmd-kotlin/src/main/java/net/sourceforge/pmd/cpd/KotlinTokenizer.java
View File

@ -45,7 +45,6 @@ public class KotlinTokenizer extends AntlrTokenizer {
@Override @Override
protected void analyzeToken(final AntlrToken currentToken) { protected void analyzeToken(final AntlrToken currentToken) {
super.analyzeToken(currentToken);
skipPackageAndImport(currentToken); skipPackageAndImport(currentToken);
skipNewLines(currentToken); skipNewLines(currentToken);
} }
@ -65,7 +64,7 @@ public class KotlinTokenizer extends AntlrTokenizer {
@Override @Override
protected boolean isLanguageSpecificDiscarding() { protected boolean isLanguageSpecificDiscarding() {
return discardingPackageAndImport || discardingNL || super.isLanguageSpecificDiscarding(); return discardingPackageAndImport || discardingNL;
} }
} }
} }