Merge branch 'master' into pr/4402

This commit is contained in:
Clément Fournier
2023-04-28 23:39:05 +02:00
122 changed files with 1482 additions and 841 deletions

View File

@ -4,7 +4,7 @@
package net.sourceforge.pmd.cpd;
import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
import net.sourceforge.pmd.cpd.impl.JavaCCTokenizer;
import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
import net.sourceforge.pmd.lang.ast.impl.javacc.JavaccToken;

View File

@ -9,9 +9,9 @@ import net.sourceforge.pmd.cpd.AbstractLanguage;
/**
* @author pguyot@kallisys.net
*/
public class TypescriptLanguage extends AbstractLanguage {
public class TypeScriptLanguage extends AbstractLanguage {
public TypescriptLanguage() {
super("Typescript", "typescript", new TypescriptTokenizer(), ".ts");
public TypeScriptLanguage() {
super("TypeScript", "typescript", new TypeScriptTokenizer(), ".ts");
}
}

View File

@ -7,10 +7,10 @@ package net.sourceforge.pmd.lang.typescript.cpd;
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.Lexer;
import net.sourceforge.pmd.cpd.internal.AntlrTokenizer;
import net.sourceforge.pmd.cpd.impl.AntlrTokenizer;
import net.sourceforge.pmd.lang.typescript.ast.TypeScriptLexer;
public class TypescriptTokenizer extends AntlrTokenizer {
public class TypeScriptTokenizer extends AntlrTokenizer {
@Override
protected Lexer getLexerForSource(CharStream charStream) {
return new TypeScriptLexer(charStream);

View File

@ -11,15 +11,15 @@ import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.cpd.Tokenizer;
import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
class TypescriptTokenizerTest extends CpdTextComparisonTest {
class TypeScriptTokenizerTest extends CpdTextComparisonTest {
TypescriptTokenizerTest() {
TypeScriptTokenizerTest() {
super(".ts");
}
@Override
public Tokenizer newTokenizer(Properties properties) {
return new TypescriptTokenizer();
return new TypeScriptTokenizer();
}
@Override