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

Cleanups

Browse Source
This commit is contained in:
Clément Fournier 2023-02-12 20:31:18 +01:00
parent 519e9d366f
commit 51b5016163
No known key found for this signature in database
GPG Key ID: 4D8D42402E4F47E2
8 changed files with 31 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
justfile
View File

@ -1,54 +0,0 @@
pmdJavaDeps := "pmd-core,pmd-lang-test,pmd-test,pmd-java"
commonBuildOpts := "-Dkotlin.compiler.incremental"
genJavaAst:
rm -f pmd-java/target/generated-sources/javacc/last-generated-timestamp
mvnd generate-sources -pl pmd-java
reGenAllSources:
rm -rf pmd-*/target/generated-sources
rm pmd-*/target/last-generated-timestamp
mvnd generate-sources
install MOD:
mvnd install -Dmaven.javadoc.skip -Dkotlin.compiler.incremental -pl "pmd-{{MOD}}"
alias i := install
cleanInstallEverything *FLAGS:
mvnd clean install -Dmaven.javadoc.skip -Dkotlin.compiler.incremental -fae {{FLAGS}}
installEverything *FLAGS:
mvnd install -Dmaven.javadoc.skip -Dkotlin.compiler.incremental -fae {{FLAGS}}
testCore *FLAGS:
mvnd test checkstyle:check pmd:check -Dmaven.javadoc.skip -Dkotlin.compiler.incremental -pl pmd-core {{FLAGS}}
testJava *FLAGS:
mvnd test checkstyle:check pmd:check -Dmaven.javadoc.skip -Dkotlin.compiler.incremental -pl pmd-java {{FLAGS}}
installJavaAndDeps *FLAGS:
mvnd install -Dmaven.javadoc.skip -Dkotlin.compiler.incremental -pl {{pmdJavaDeps}} {{FLAGS}}
installJava *FLAGS:
mvnd install -Dmaven.javadoc.skip -Dkotlin.compiler.incremental -pl pmd-java {{FLAGS}}
lintChanged DIFF="master" *FLAGS="":
#!/bin/env zsh
changed=$(git diff --name-only {{DIFF}})
changed=${(f)changed}
projects=${changed%%/*} # remove all but first segment
echo $projects
# todo filter to pmd-*
mvnd checkstyle:check pmd:check -pl $projects -fae
lint projects="pmd-java":
mvnd checkstyle:check pmd:check -pl {{projects}} -fae
lintAll *FLAGS:
mvnd checkstyle:check pmd:check -fae {{FLAGS}}

6
pmd-apex/src/test/java/net/sourceforge/pmd/lang/apex/cpd/ApexTokenizerTest.java
View File

@ -4,6 +4,7 @@
package net.sourceforge.pmd.lang.apex.cpd;
import org.checkerframework.checker.nullness.qual.NonNull;
import org.junit.jupiter.api.Test;
import net.sourceforge.pmd.cpd.Tokenizer;
@ -44,6 +45,11 @@ class ApexTokenizerTest extends CpdTextComparisonTest {
return properties(true);
}
@Override
public @NonNull LanguagePropertyConfig defaultProperties() {
return properties(false);
}
private LanguagePropertyConfig properties(boolean caseSensitive) {
return properties -> properties.setProperty(Tokenizer.CPD_CASE_SENSITIVE, caseSensitive);
}

12
pmd-core/src/main/java/net/sourceforge/pmd/cpd/Tokenizer.java
View File

@ -41,16 +41,24 @@ public interface Tokenizer {
.build();
PropertyDescriptor<Boolean> CPD_CASE_SENSITIVE =
PropertyFactory.booleanProperty("cpdCaseSensitive")
.defaultValue(false)
.desc("Whether CPD should ignore the case of tokens. Affects all tokens.")
.defaultValue(true)
.desc("Whether CPD should respect the case of tokens. Affects all tokens.")
.build();
@Deprecated // TODO what to do with this?
String DEFAULT_SKIP_BLOCKS_PATTERN = "#if 0|#endif";
/**
* Tokenize the source code and record tokens using the provided token factory.
* Implementations should not add an EOF token at the end.
*/
void tokenize(TextDocument document, TokenFactory tokens) throws IOException;
/**
* Wraps a call to {@link #tokenize(TextDocument, TokenFactory)} to properly
* create and close the token factory.
*/
static void tokenize(Tokenizer tokenizer, TextDocument textDocument, Tokens tokens) throws IOException {
try (TokenFactory tf = TokenFactory.forFile(textDocument, tokens)) {
tokenizer.tokenize(textDocument, tf);

29
pmd-core/src/main/java/net/sourceforge/pmd/cpd/Tokens.java
View File

@ -6,7 +6,6 @@ package net.sourceforge.pmd.cpd;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@ -45,15 +44,11 @@ public class Tokens {
return images.entrySet().stream().filter(it -> it.getValue() == i).findFirst().map(Entry::getKey).orElse(null);
}
public TokenEntry peekLastToken() {
return get(size() - 1);
TokenEntry peekLastToken() {
return getToken(size() - 1);
}
public Iterator<TokenEntry> iterator() {
return tokens.iterator();
}
private TokenEntry get(int index) {
private TokenEntry getToken(int index) {
return tokens.get(index);
}
@ -61,8 +56,8 @@ public class Tokens {
return tokens.size();
}
public TokenEntry getEndToken(TokenEntry mark, Match match) {
return get(mark.getIndex() + match.getTokenCount() - 1);
TokenEntry getEndToken(TokenEntry mark, Match match) {
return getToken(mark.getIndex() + match.getTokenCount() - 1);
}
public List<TokenEntry> getTokens() {
@ -70,15 +65,12 @@ public class Tokens {
}
TokenEntry addToken(String image, String fileName, int startLine, int startCol, int endLine, int endCol) {
TokenEntry newToken = new TokenEntry(getImageId(image), fileName,
startLine, startCol,
endLine, endCol,
tokens.size());
TokenEntry newToken = new TokenEntry(getImageId(image), fileName, startLine, startCol, endLine, endCol, tokens.size());
add(newToken);
return newToken;
}
public State savePoint() {
State savePoint() {
return new State(this);
}
@ -89,15 +81,16 @@ public class Tokens {
static final class State {
private final int tokenCount;
private final int tokensMapSize;
private final int curImageId;
State(Tokens tokens) {
this.tokenCount = tokens.tokens.size();
this.tokensMapSize = tokens.images.size();
this.curImageId = tokens.curImageId;
}
public void restore(Tokens tokens) {
tokens.images.entrySet().removeIf(e -> e.getValue() > tokensMapSize);
tokens.images.entrySet().removeIf(e -> e.getValue() >= curImageId);
tokens.curImageId = this.curImageId;
final List<TokenEntry> entries = tokens.getTokens();
entries.subList(tokenCount, entries.size()).clear();

2
pmd-lang-test/src/main/kotlin/net/sourceforge/pmd/cpd/test/CpdTextComparisonTest.kt
View File

@ -94,7 +94,7 @@ abstract class CpdTextComparisonTest(
var curLine = -1
for (token in tokens.iterator()) {
for (token in tokens.tokens) {
if (token.isEof) {
append("EOF").appendLine()

2
pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/VfLanguageModule.java
View File

@ -5,7 +5,7 @@
package net.sourceforge.pmd.lang.vf;
import net.sourceforge.pmd.cpd.Tokenizer;
import net.sourceforge.pmd.cpd.VfTokenizer;
import net.sourceforge.pmd.lang.vf.cpd.VfTokenizer;
import net.sourceforge.pmd.lang.Language;
import net.sourceforge.pmd.lang.LanguagePropertyBundle;
import net.sourceforge.pmd.lang.LanguageRegistry;

2
pmd-visualforce/src/main/java/net/sourceforge/pmd/cpd/VfTokenizer.java → pmd-visualforce/src/main/java/net/sourceforge/pmd/lang/vf/cpd/VfTokenizer.java
View File

@ -2,7 +2,7 @@
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
package net.sourceforge.pmd.lang.vf.cpd;
import net.sourceforge.pmd.cpd.internal.JavaCCTokenizer;
import net.sourceforge.pmd.lang.TokenManager;

2
pmd-visualforce/src/test/java/net/sourceforge/pmd/lang/vf/cpd/VfTokenizerTest.java
View File

@ -12,7 +12,7 @@ import net.sourceforge.pmd.cpd.test.CpdTextComparisonTest;
class VfTokenizerTest extends CpdTextComparisonTest {
VfTokenizerTest() {
super(".page");
super("vf", ".page");
}
@Test