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

Merge branch 'master' into issue-4349-cleanup-deprecations

Browse Source
This commit is contained in:
Andreas Dangel
2024-02-08 18:23:41 +01:00
parent b6adbf5bb5 9748580ee2
commit 5599a8fd65
416 changed files with 2924 additions and 4282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/KotlinLanguageModule.java
View File

@@ -5,11 +5,11 @@
package net.sourceforge.pmd.lang.kotlin;
import net.sourceforge.pmd.annotation.Experimental;
import net.sourceforge.pmd.cpd.Tokenizer;
import net.sourceforge.pmd.cpd.CpdLexer;
import net.sourceforge.pmd.lang.LanguagePropertyBundle;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.impl.SimpleLanguageModuleBase;
import net.sourceforge.pmd.lang.kotlin.cpd.KotlinTokenizer;
import net.sourceforge.pmd.lang.kotlin.cpd.KotlinCpdLexer;
/**
* Language Module for Kotlin
@@ -35,7 +35,7 @@ public class KotlinLanguageModule extends SimpleLanguageModuleBase {
}
@Override
public Tokenizer createCpdTokenizer(LanguagePropertyBundle bundle) {
return new KotlinTokenizer();
public CpdLexer createCpdLexer(LanguagePropertyBundle bundle) {
return new KotlinCpdLexer();
}
}

6
pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/cpd/KotlinTokenizer.java → pmd-kotlin/src/main/java/net/sourceforge/pmd/lang/kotlin/cpd/KotlinCpdLexer.java
View File

@@ -7,16 +7,18 @@ package net.sourceforge.pmd.lang.kotlin.cpd;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Lexer;
import net.sourceforge.pmd.cpd.impl.AntlrCpdLexer;
import net.sourceforge.pmd.cpd.impl.AntlrTokenFilter;
import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.ast.impl.antlr4.AntlrToken;
import net.sourceforge.pmd.lang.kotlin.ast.KotlinLexer;
/**
* The Kotlin Tokenizer
*
* <p>Note: This class has been called KotlinTokenizer in PMD 6</p>.
*/
public class KotlinTokenizer extends AntlrTokenizer {
public class KotlinCpdLexer extends AntlrCpdLexer {
@Override
protected Lexer getLexerForSource(CharStream charStream) {

4
pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/cpd/KotlinTokenizerTest.java → pmd-kotlin/src/test/java/net/sourceforge/pmd/lang/kotlin/cpd/KotlinCpdLexerTest.java
View File

@@ -8,9 +8,9 @@ import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
class KotlinTokenizerTest extends CpdTextComparisonTest {
class KotlinCpdLexerTest extends CpdTextComparisonTest {
KotlinTokenizerTest() {
KotlinCpdLexerTest() {
super("kotlin", ".kt");
}