[core] Rename Tokenizer to CpdLexer

See #4065
This commit is contained in:
Andreas Dangel
2024-01-11 17:04:48 +01:00
parent 55d91791c3
commit 6163f67b06
119 changed files with 423 additions and 352 deletions

View File

@@ -4,10 +4,10 @@
package net.sourceforge.pmd.lang.html;
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.html.ast.HtmlTokenizer;
import net.sourceforge.pmd.lang.html.ast.HtmlCpdLexer;
import net.sourceforge.pmd.lang.impl.SimpleLanguageModuleBase;
public final class HtmlLanguageModule extends SimpleLanguageModuleBase {
@@ -27,7 +27,7 @@ public final class HtmlLanguageModule extends SimpleLanguageModuleBase {
}
@Override
public Tokenizer createCpdTokenizer(LanguagePropertyBundle bundle) {
return new HtmlTokenizer();
public CpdLexer createCpdLexer(LanguagePropertyBundle bundle) {
return new HtmlCpdLexer();
}
}

View File

@@ -7,8 +7,8 @@ package net.sourceforge.pmd.lang.html.ast;
import java.io.IOException;
import java.io.UncheckedIOException;
import net.sourceforge.pmd.cpd.CpdLexer;
import net.sourceforge.pmd.cpd.TokenFactory;
import net.sourceforge.pmd.cpd.Tokenizer;
import net.sourceforge.pmd.lang.LanguageProcessor;
import net.sourceforge.pmd.lang.LanguageProcessorRegistry;
import net.sourceforge.pmd.lang.ast.Parser.ParserTask;
@@ -16,7 +16,10 @@ import net.sourceforge.pmd.lang.ast.SemanticErrorReporter;
import net.sourceforge.pmd.lang.document.TextDocument;
import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
public class HtmlTokenizer implements Tokenizer {
/**
* <p>Note: This class has been called HtmlTokenizer in PMD 6</p>.
*/
public class HtmlCpdLexer implements CpdLexer {
@Override
public void tokenize(TextDocument document, TokenFactory tokens) {

View File

@@ -10,9 +10,9 @@ import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
import net.sourceforge.pmd.lang.html.HtmlLanguageModule;
class HtmlTokenizerTest extends CpdTextComparisonTest {
class HtmlCpdLexerTest extends CpdTextComparisonTest {
HtmlTokenizerTest() {
HtmlCpdLexerTest() {
super(HtmlLanguageModule.getInstance(), ".html");
}