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

Merge branch 'pmd7-textfile-display-name' into clem.pmd7-refactor-cpd

Browse Source
This commit is contained in:
Clément Fournier
2023-03-20 14:03:22 +01:00
parent 5db8be42a3 9eb5ac9a1f
commit 344b2cc17b
139 changed files with 1332 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ 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.TextDocument;
import net.sourceforge.pmd.lang.document.TextFile;
import net.sourceforge.pmd.lang.scala.ScalaLanguageModule;
import scala.collection.Iterator;
@ -45,7 +46,7 @@ public class ScalaTokenizer implements Tokenizer {
String fullCode = document.getText().toString();
// create the input file for scala
Input.VirtualFile vf = new Input.VirtualFile(document.getDisplayName(), fullCode);
Input.VirtualFile vf = new Input.VirtualFile(document.getFileId().getOriginalPath(), fullCode);
ScalametaTokenizer tokenizer = new ScalametaTokenizer(vf, dialect);
// tokenize with a filter
@ -68,7 +69,7 @@ public class ScalaTokenizer implements Tokenizer {
TokenizeException tokE = (TokenizeException) e;
Position pos = tokE.pos();
throw new TokenMgrError(
pos.startLine() + 1, pos.startColumn() + 1, document.getDisplayName(), "Scalameta threw", tokE);
pos.startLine() + 1, pos.startColumn() + 1, document.getFileId(), "Scalameta threw", tokE);
} else {
throw e;
}