hiifong/pmd
1
0
Fork 0
forked from phoedos/pmd
Code Pull Requests Activity

Same for kotlin

Browse Source
This commit is contained in:
Clément Fournier
2020-08-30 18:59:48 +02:00
parent 1474ed6e79
commit 9ef8c151e2
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pmd-kotlin/pom.xml
View File

@ -17,6 +17,27 @@
<groupId>org.antlr</groupId> <groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId> <artifactId>antlr4-maven-plugin</artifactId>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>antlr-cleanup</id>
<phase>generate-sources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<target>
<ant antfile="${antlr4.ant.wrapper}" target="cpd-language">
<property name="lang-name" value="Kotlin" />
<property name="lang-terse-name" value="kotlin" />
</ant>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>

2
pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/antlr4/Kotlin.g4 → pmd-kotlin/src/main/antlr4/net/sourceforge/pmd/lang/kotlin/ast/KotlinLexer.g4
View File

@ -10,7 +10,7 @@
* https://github.com/JetBrains/kotlin/tree/master/compiler/testData/psi * https://github.com/JetBrains/kotlin/tree/master/compiler/testData/psi
*/ */
lexer grammar Kotlin; lexer grammar KotlinLexer;
/** /**
* Taken from http://www.antlr3.org/grammar/1345144569663/AntlrUnicode.txt * Taken from http://www.antlr3.org/grammar/1345144569663/AntlrUnicode.txt

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

@ -10,7 +10,7 @@ import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
import net.sourceforge.pmd.cpd.token.AntlrTokenFilter; import net.sourceforge.pmd.cpd.token.AntlrTokenFilter;
import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrToken; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrToken;
import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager; import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrTokenManager;
import net.sourceforge.pmd.lang.kotlin.antlr4.Kotlin; import net.sourceforge.pmd.lang.kotlin.ast.KotlinLexer;
/** /**
* The Kotlin Tokenizer * The Kotlin Tokenizer
@ -20,7 +20,7 @@ public class KotlinTokenizer extends AntlrTokenizer {
@Override @Override
protected AntlrTokenManager getLexerForSource(SourceCode sourceCode) { protected AntlrTokenManager getLexerForSource(SourceCode sourceCode) {
CharStream charStream = AntlrTokenizer.getCharStreamFromSourceCode(sourceCode); CharStream charStream = AntlrTokenizer.getCharStreamFromSourceCode(sourceCode);
return new AntlrTokenManager(new Kotlin(charStream), sourceCode.getFileName()); return new AntlrTokenManager(new KotlinLexer(charStream), sourceCode.getFileName());
} }
@Override @Override
@ -52,15 +52,15 @@ public class KotlinTokenizer extends AntlrTokenizer {
private void skipPackageAndImport(final AntlrToken currentToken) { private void skipPackageAndImport(final AntlrToken currentToken) {
final int type = currentToken.getKind(); final int type = currentToken.getKind();
if (type == Kotlin.PACKAGE || type == Kotlin.IMPORT) { if (type == KotlinLexer.PACKAGE || type == KotlinLexer.IMPORT) {
discardingPackageAndImport = true; discardingPackageAndImport = true;
} else if (discardingPackageAndImport && (type == Kotlin.SEMICOLON || type == Kotlin.NL)) { } else if (discardingPackageAndImport && (type == KotlinLexer.SEMICOLON || type == KotlinLexer.NL)) {
discardingPackageAndImport = false; discardingPackageAndImport = false;
} }
} }
private void skipNewLines(final AntlrToken currentToken) { private void skipNewLines(final AntlrToken currentToken) {
discardingNL = currentToken.getKind() == Kotlin.NL; discardingNL = currentToken.getKind() == KotlinLexer.NL;
} }
@Override @Override