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

pmd-groovy: checkstyle / formatting

Browse Source
This commit is contained in:
Andreas Dangel
2016-12-02 09:31:39 +01:00
parent cab1980bbd
commit e3e87694bd
5 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyLanguage.java
View File

@ -1,6 +1,7 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
/**

20
pmd-groovy/src/main/java/net/sourceforge/pmd/cpd/GroovyTokenizer.java
View File

@ -1,15 +1,17 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
import org.apache.commons.io.IOUtils;
import org.codehaus.groovy.antlr.parser.GroovyLexer;
import net.sourceforge.pmd.lang.ast.TokenMgrError;
import groovyjarjarantlr.Token;
import groovyjarjarantlr.TokenStream;
import groovyjarjarantlr.TokenStreamException;
import net.sourceforge.pmd.lang.ast.TokenMgrError;
/**
* The Grooovy Tokenizer
@ -22,23 +24,23 @@ public class GroovyTokenizer implements Tokenizer {
GroovyLexer lexer = new GroovyLexer(IOUtils.toInputStream(buffer.toString()));
TokenStream tokenStream = lexer.plumb();
try {
Token token = tokenStream.nextToken();
while (token.getType() != Token.EOF_TYPE) {
TokenEntry tokenEntry =
new TokenEntry(token.getText(), sourceCode.getFileName(), token.getLine());
TokenEntry tokenEntry = new TokenEntry(token.getText(), sourceCode.getFileName(), token.getLine());
tokenEntries.add(tokenEntry);
token = tokenStream.nextToken();
}
} catch (TokenStreamException err) {
// Wrap exceptions of the Groovy tokenizer in a TokenMgrError, so they are correctly handled
// when CPD is executed with the '--skipLexicalErrors' command line option
throw new TokenMgrError(
"Lexical error in file " + sourceCode.getFileName() + " at line " +
lexer.getLine() + ", column " + lexer.getColumn() + ". Encountered: " + err.getMessage(),
// Wrap exceptions of the Groovy tokenizer in a TokenMgrError, so
// they are correctly handled
// when CPD is executed with the '--skipLexicalErrors' command line
// option
throw new TokenMgrError("Lexical error in file " + sourceCode.getFileName() + " at line " + lexer.getLine()
+ ", column " + lexer.getColumn() + ". Encountered: " + err.getMessage(),
TokenMgrError.LEXICAL_ERROR);
} finally {
tokenEntries.add(TokenEntry.getEOF());

1
pmd-groovy/src/main/java/net/sourceforge/pmd/lang/groovy/GroovyLanguageModule.java
View File

@ -1,6 +1,7 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.lang.groovy;
import net.sourceforge.pmd.lang.BaseLanguageModule;

14
pmd-groovy/src/test/java/net/sourceforge/pmd/LanguageVersionTest.java
View File

@ -1,17 +1,18 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd;
import java.util.Arrays;
import java.util.Collection;
import org.junit.runners.Parameterized.Parameters;
import net.sourceforge.pmd.lang.LanguageRegistry;
import net.sourceforge.pmd.lang.LanguageVersion;
import net.sourceforge.pmd.lang.groovy.GroovyLanguageModule;
import org.junit.runners.Parameterized.Parameters;
public class LanguageVersionTest extends AbstractLanguageVersionTest {
public LanguageVersionTest(String name, String terseName, String version, LanguageVersion expected) {
@ -21,7 +22,12 @@ public class LanguageVersionTest extends AbstractLanguageVersionTest {
@Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
{ GroovyLanguageModule.NAME, GroovyLanguageModule.TERSE_NAME, "", LanguageRegistry.getLanguage(GroovyLanguageModule.NAME).getDefaultVersion() }
});
{
GroovyLanguageModule.NAME,
GroovyLanguageModule.TERSE_NAME,
"",
LanguageRegistry.getLanguage(GroovyLanguageModule.NAME).getDefaultVersion(),
},
});
}
}

9
pmd-groovy/src/test/java/net/sourceforge/pmd/cpd/GroovyTokenizerTest.java
View File

@ -1,16 +1,16 @@
/**
* BSD-style license; for more info see http://pmd.sourceforge.net/license.html
*/
package net.sourceforge.pmd.cpd;
import java.io.IOException;
import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
import org.apache.commons.io.IOUtils;
import org.junit.Before;
import org.junit.Test;
import net.sourceforge.pmd.testframework.AbstractTokenizerTest;
public class GroovyTokenizerTest extends AbstractTokenizerTest {
@ -25,8 +25,8 @@ public class GroovyTokenizerTest extends AbstractTokenizerTest {
@Override
public String getSampleCode() throws IOException {
return IOUtils.toString(GroovyTokenizer.class.getResourceAsStream(FILENAME));
}
return IOUtils.toString(GroovyTokenizer.class.getResourceAsStream(FILENAME));
}
@Test
public void tokenizeTest() throws IOException {
@ -34,4 +34,3 @@ public class GroovyTokenizerTest extends AbstractTokenizerTest {
super.tokenizeTest();
}
}