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

Fix build

Browse Source
This commit is contained in:
Clément Fournier
2023-02-12 18:21:54 +01:00
parent fb9f49624d
commit ddbfc90c14
40 changed files with 174 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,20 +38,20 @@ public class ScalaTokenizer implements Tokenizer {
}
@Override
public void tokenize(TextDocument sourceCode, TokenFactory tokenEntries) {
public void tokenize(TextDocument document, TokenFactory tokenEntries) {
try {
String fullCode = sourceCode.getText().toString();
String fullCode = document.getText().toString();
// create the input file for scala
Input.VirtualFile vf = new Input.VirtualFile(sourceCode.getDisplayName(), fullCode);
Input.VirtualFile vf = new Input.VirtualFile(document.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(), sourceCode);
ScalaTokenManager scalaTokenManager = new ScalaTokenManager(tokens.iterator(), document);
ScalaTokenFilter filter = new ScalaTokenFilter(scalaTokenManager);
ScalaTokenAdapter token;
@ -68,7 +68,7 @@ public class ScalaTokenizer implements Tokenizer {
TokenizeException tokE = (TokenizeException) e;
Position pos = tokE.pos();
throw new TokenMgrError(
pos.startLine() + 1, pos.startColumn() + 1, sourceCode.getDisplayName(), "Scalameta threw", tokE);
pos.startLine() + 1, pos.startColumn() + 1, document.getDisplayName(), "Scalameta threw", tokE);
} else {
throw e;
}