phoedos/pmd
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change a ton of stuff in CPD

Browse Source
This commit is contained in:
Clément Fournier
2023-02-10 18:21:23 +01:00
parent d4c05d1fb5
commit cf81809990
64 changed files with 543 additions and 901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pmd-scala-modules/pmd-scala-common/src/main/java/net/sourceforge/pmd/cpd/ScalaTokenizer.java
View File

@ -4,7 +4,6 @@
package net.sourceforge.pmd.cpd;
import java.io.IOException;
import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
@ -13,7 +12,6 @@ import net.sourceforge.pmd.cpd.token.internal.BaseTokenFilter;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.TokenManager;
import net.sourceforge.pmd.lang.ast.TokenMgrError;
import net.sourceforge.pmd.lang.document.CpdCompat;
import net.sourceforge.pmd.lang.document.TextDocument;
import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
@ -62,20 +60,20 @@ public class ScalaTokenizer implements Tokenizer {
}
@Override
public void tokenize(TextDocument sourceCode, Tokens tokenEntries) throws IOException {
public void tokenize(TextDocument sourceCode, TokenFactory tokenEntries) {
try (TextDocument textDoc = TextDocument.create(CpdCompat.cpdCompat(sourceCode))) {
String fullCode = textDoc.getText().toString();
try {
String fullCode = sourceCode.getText().toString();
// create the input file for scala
Input.VirtualFile vf = new Input.VirtualFile(sourceCode.getFileName(), fullCode);
Input.VirtualFile vf = new Input.VirtualFile(sourceCode.getDisplayName(), fullCode);
ScalametaTokenizer tokenizer = new ScalametaTokenizer(vf, dialect);
// tokenize with a filter
scala.meta.tokens.Tokens tokens = tokenizer.tokenize();
// use extensions to the standard PMD TokenManager and Filter
ScalaTokenManager scalaTokenManager = new ScalaTokenManager(tokens.iterator(), textDoc);
ScalaTokenManager scalaTokenManager = new ScalaTokenManager(tokens.iterator(), sourceCode);
ScalaTokenFilter filter = new ScalaTokenFilter(scalaTokenManager);
ScalaTokenAdapter token;
@ -83,21 +81,19 @@ public class ScalaTokenizer implements Tokenizer {
if (StringUtils.isEmpty(token.getImage())) {
continue;
}
TokenEntry cpdToken = new TokenEntry(token.getImage(),
token.getReportLocation());
tokenEntries.add(cpdToken);
tokenEntries.recordToken(token.getImage(),
token.getReportLocation());
}
} catch (Exception e) {
if (e instanceof TokenizeException) { // NOPMD
// cannot catch it as it's a checked exception and Scala sneaky throws
TokenizeException tokE = (TokenizeException) e;
Position pos = tokE.pos();
throw new TokenMgrError(pos.startLine() + 1, pos.startColumn() + 1, sourceCode.getFileName(), "Scalameta threw", tokE);
throw new TokenMgrError(
pos.startLine() + 1, pos.startColumn() + 1, sourceCode.getDisplayName(), "Scalameta threw", tokE);
} else {
throw e;
}
} finally {
tokenEntries.add(TokenEntry.getEOF());
}
}

7
pmd-scala-modules/pmd-scala-common/src/test/java/net/sourceforge/pmd/cpd/ScalaTokenizerTest.java
View File

@ -6,8 +6,6 @@ package net.sourceforge.pmd.cpd;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.util.Properties;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
@ -24,11 +22,6 @@ class ScalaTokenizerTest extends CpdTextComparisonTest {
return "../lang/scala/cpd/testdata";
}
@Override
public Tokenizer newTokenizer(Properties properties) {
return new ScalaTokenizer();
}
@Test
void testSample() {
doTest("sample-LiftActor");