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

Merge branch 'pmd/7.0.x' into pmd7-junit5-part2

Browse Source
This commit is contained in:
Andreas Dangel
2022-09-12 19:34:11 +02:00
parent 67cc06e60d f6176f37bc
commit bc7a45699f
254 changed files with 4141 additions and 1972 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pmd-javascript/etc/grammar/Ecmascript5.jj
View File

@ -15,7 +15,7 @@ options {
PARSER_BEGIN(Ecmascript5ParserImpl)
package net.sourceforge.pmd.lang.ecmascript5.ast;
import net.sourceforge.pmd.lang.ast.CharStream;
import net.sourceforge.pmd.lang.ast.impl.javacc.CharStream;
import net.sourceforge.pmd.lang.ast.TokenMgrError;
public class Ecmascript5ParserImpl {

2
pmd-javascript/src/main/java/net/sourceforge/pmd/cpd/EcmascriptTokenizer.java
View File

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

3
pmd-javascript/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java
View File

@ -9,7 +9,6 @@ import java.util.Collection;
import org.junit.runners.Parameterized.Parameters;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.ecmascript.EcmascriptLanguageModule;
@ -23,6 +22,6 @@ public class LanguageVersionTest extends AbstractLanguageVersionTest {
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] { { EcmascriptLanguageModule.NAME, EcmascriptLanguageModule.TERSE_NAME,
"ES6",
LanguageRegistry.getLanguage(EcmascriptLanguageModule.NAME).getDefaultVersion(), }, });
getLanguage(EcmascriptLanguageModule.NAME).getDefaultVersion(), }, });
}
}

3
pmd-javascript/src/test/java/net/sourceforge/pmd/cli/CLITest.java
View File

@ -24,8 +24,7 @@ public class CLITest extends BaseCLITest {
"xml",
"-R",
"rulesets/testing/js-rset1.xml",
"-l",
"ecmascript",
"--no-progress",
"--debug");
assertThat(log, containsPattern("Adding file .*\\.js \\(lang: ecmascript ES6\\)"));
}