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

Merge branch 'master' of https://github.com/kdaemonv/pmd into pr-217

Browse Source
This commit is contained in:
Andreas Dangel
2017-02-02 20:53:49 +01:00
parent d92688a07d 769935ad4c
commit 09b2644688
7 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pmd-core/pmd-core-checkstyle-suppressions.xml
View File

@ -6,6 +6,6 @@
<suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
<!-- ModifiedControlVariable / JumbledIncrementer -->
<suppress checks="ModifiedControlVariable" files="net/sourceforge/pmd/cpd/MatchAlgorithm\.java"/>
<suppress checks="ModifiedControlVariable" files="net/sourceforge/pmd/lang/dfa/SequenceChecker\.java"/>
<suppress checks="ModifiedControlVariable" files="net[\\/]sourceforge[\\/]pmd[\\/]cpd[\\/]MatchAlgorithm\.java"/>
<suppress checks="ModifiedControlVariable" files="net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]dfa[\\/]SequenceChecker\.java"/>
</suppressions>

4
pmd-java/pmd-java-checkstyle-suppressions.xml
View File

@ -5,8 +5,8 @@
<suppressions>
<suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
<suppress files="/src/main/java/net/sourceforge/pmd/lang/java/rule/AbstractJavaRule.java"
<suppress files="[\\/]src[\\/]main[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]java[\\/]rule[\\/]AbstractJavaRule\.java"
checks="AvoidStarImport" />
<suppress files="/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java"
<suppress files="[\\/]src[\\/]test[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]typeresolution[\\/]testdata[\\/]ExtraTopLevelClass\.java"
checks="OneTopLevelClass" />
</suppressions>

2
pmd-java/src/test/java/net/sourceforge/pmd/typeresolution/testdata/ExtraTopLevelClass.java vendored
View File

@ -7,5 +7,5 @@ package net.sourceforge.pmd.typeresolution.testdata;
public class ExtraTopLevelClass {
}
class TheExtraTopLevelClass { // SUPPRESS CHECKSTYLE explicityl testing two classes in one file
class TheExtraTopLevelClass {
}

42
pmd-javascript/src/test/java/net/sourceforge/pmd/cpd/EcmascriptTokenizerTest.java
View File

@ -115,30 +115,30 @@ public class EcmascriptTokenizerTest {
public void testTemplateStrings() throws IOException {
Tokenizer t = new EcmascriptTokenizer();
SourceCode sourceCode = new SourceCode(new SourceCode.StringCodeLoader(
"export default class DrawLocation extends joint.shapes.basic.Generic {\n"
+ " constructor(location: ILocation) {\n"
+ " this.markup = `<g>\n"
+ " <path class=\"location\"/>\n"
+ " <text x=\"0\" y=\"0\" text-anchor=\"middle\" class=\"location-text\"></text>\n"
+ "\n"
+ " <path class=\"location\"/>\n"
+ " <circle class=\"location-circle\"/>\n"
+ " ${drawIndicators.Check.markup}\n"
+ "\n"
+ " </g>`;\n"
+ " }\n"
+ "\n"
"export default class DrawLocation extends joint.shapes.basic.Generic {" + PMD.EOL
+ " constructor(location: ILocation) {" + PMD.EOL
+ " this.markup = `<g>" + PMD.EOL
+ " <path class=\"location\"/>" + PMD.EOL
+ " <text x=\"0\" y=\"0\" text-anchor=\"middle\" class=\"location-text\"></text>" + PMD.EOL
+ PMD.EOL
+ " <path class=\"location\"/>" + PMD.EOL
+ " <circle class=\"location-circle\"/>" + PMD.EOL
+ " ${drawIndicators.Check.markup}" + PMD.EOL
+ PMD.EOL
+ " </g>`;" + PMD.EOL
+ " }" + PMD.EOL
+ "" + PMD.EOL
+ "}"));
final Tokens tokens = new Tokens();
t.tokenize(sourceCode, tokens);
final String templateString = "`<g>\n"
+ " <path class=\"location\"/>\n"
+ " <text x=\"0\" y=\"0\" text-anchor=\"middle\" class=\"location-text\"></text>\n"
+ "\n"
+ " <path class=\"location\"/>\n"
+ " <circle class=\"location-circle\"/>\n"
+ " ${drawIndicators.Check.markup}\n"
+ "\n"
final String templateString = "`<g>" + PMD.EOL
+ " <path class=\"location\"/>" + PMD.EOL
+ " <text x=\"0\" y=\"0\" text-anchor=\"middle\" class=\"location-text\"></text>" + PMD.EOL
+ PMD.EOL
+ " <path class=\"location\"/>" + PMD.EOL
+ " <circle class=\"location-circle\"/>" + PMD.EOL
+ " ${drawIndicators.Check.markup}" + PMD.EOL
+ PMD.EOL
+ " </g>`";
assertEquals(templateString, tokens.getTokens().get(24).toString());
}

2
pmd-plsql/pmd-plsql-checkstyle-suppressions.xml
View File

@ -5,5 +5,5 @@
<suppressions>
<suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
<suppress checks="AvoidStarImport" files="src/main/java/net/sourceforge/pmd/lang/plsql/rule/AbstractPLSQLRule.java"/>
<suppress checks="AvoidStarImport" files="src[\\/]main[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]plsql[\\/]rule[\\/]AbstractPLSQLRule\.java"/>
</suppressions>

2
pmd-scala/pmd-scala-checkstyle-suppressions.xml
View File

@ -6,5 +6,5 @@
<suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
<!-- Part of pmd-scala is under LGPL -->
<suppress checks="RegexpHeader" files="org/sonar/plugins/scala/.*"/>
<suppress checks="RegexpHeader" files="org[\\/]sonar[\\/]plugins[\\/]scala[\\/].*"/>
</suppressions>

4
pmd-vm/pmd-vm-checkstyle-suppressions.xml
View File

@ -6,7 +6,7 @@
<suppress files="[\\/]generated-sources[\\/]" checks="[a-zA-Z0-9]*"/>
<!-- The velocity language is under the Apache License. -->
<suppress checks="RegexpHeaderCheck" files="net/sourceforge/pmd/lang/vm/.*"/>
<suppress checks="RegexpHeaderCheck" files="net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]vm[\\/].*"/>
<suppress checks="ModifiedControlVariable" files="src/main/java/net/sourceforge/pmd/lang/vm/ast/NodeUtils.java"/>
<suppress checks="ModifiedControlVariable" files="src[\\/]main[\\/]java[\\/]net[\\/]sourceforge[\\/]pmd[\\/]lang[\\/]vm[\\/]ast[\\/]NodeUtils\.java"/>
</suppressions>