TouchInstinct
/
checkstyle
307
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug with multiple imports, part of issue #706

This commit is contained in:
liscju 2015-03-06 12:55:43 +01:00 committed by Roman Ivanov
parent 2a587d5274
commit b9f232ffe0
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheck.java
View File

@ -243,8 +243,7 @@ public class EmptyLineSeparatorCheck extends Check
nextToken.getText());
}
}
if (!allowMultipleEmptyLines && isTypeField(ast)
&& isPrePreviousLineEmpty(ast))
if (isTypeField(ast) && hasNotAllowedTwoEmptyLinesBefore(ast))
{
log(ast.getLineNo(), MSG_MULTIPLE_LINES, ast.getText());
}
@ -256,7 +255,7 @@ public class EmptyLineSeparatorCheck extends Check
{
log(nextToken.getLineNo(), MSG_SHOULD_BE_SEPARATED, nextToken.getText());
}
if (!allowMultipleEmptyLines && isPrePreviousLineEmpty(ast)) {
if (hasNotAllowedTwoEmptyLinesBefore(ast)) {
log(ast.getLineNo(), MSG_MULTIPLE_LINES, ast.getText());
}
break;
@ -264,20 +263,31 @@ public class EmptyLineSeparatorCheck extends Check
if (ast.getLineNo() > 1 && !hasEmptyLineBefore(ast)) {
log(ast.getLineNo(), MSG_SHOULD_BE_SEPARATED, ast.getText());
}
if (!allowMultipleEmptyLines && isPrePreviousLineEmpty(ast)) {
if (hasNotAllowedTwoEmptyLinesBefore(ast)) {
log(ast.getLineNo(), MSG_MULTIPLE_LINES, ast.getText());
}
default:
if (nextToken.getType() != TokenTypes.RCURLY && !hasEmptyLineAfter(ast)) {
log(nextToken.getLineNo(), MSG_SHOULD_BE_SEPARATED, nextToken.getText());
}
if (!allowMultipleEmptyLines && isPrePreviousLineEmpty(ast)) {
if (hasNotAllowedTwoEmptyLinesBefore(ast)) {
log(ast.getLineNo(), MSG_MULTIPLE_LINES, ast.getText());
}
}
}
}
/**
* Checks if a token has empty two previous lines and multiple empty lines is not allowed
* @param token DetailAST token
* @return true, if token has empty two lines before and allowMultipleEmptyLines is false
*/
private boolean hasNotAllowedTwoEmptyLinesBefore(DetailAST token)
{
return !allowMultipleEmptyLines && hasEmptyLineBefore(token)
&& isPrePreviousLineEmpty(token);
}
/**
* Checks if a token has empty pre-previous line.
* @param token DetailAST token.
@ -318,6 +328,9 @@ public class EmptyLineSeparatorCheck extends Check
private boolean hasEmptyLineBefore(DetailAST token)
{
final int lineNo = token.getLineNo();
if (lineNo == 1) {
return false;
}
// [lineNo - 2] is the number of the previous line because the numbering starts from zero.
final String lineBefore = getLines()[lineNo - 2];
return lineBefore.trim().isEmpty();

11
src/test/java/com/puppycrawl/tools/checkstyle/checks/whitespace/EmptyLineSeparatorCheckTest.java
View File

@ -110,4 +110,15 @@ public class EmptyLineSeparatorCheckTest
verify(checkConfig, getPath("whitespace/InputEmptyLineSeparatorMultipleFieldsInClass.java"), expected);
}
@Test
public void testAllowMultipleImportSeparatedFromPackage() throws Exception
{
DefaultConfiguration checkConfig = createCheckConfig(EmptyLineSeparatorCheck.class);
checkConfig.addAttribute("allowMultipleEmptyLines", "false");
final String[] expected = {
};
verify(checkConfig, getPath("whitespace/InputEmptyLineSeparatorMultipleImportEmptyClass.java"), expected);
}
}

8
src/test/resources/com/puppycrawl/tools/checkstyle/whitespace/InputEmptyLineSeparatorMultipleImportEmptyClass.java Normal file
View File

@ -0,0 +1,8 @@
package com.puppycrawl.tools.checkstyle.whitespace;
import java.util.Calendar;
import java.util.Date;
public class InputEmptyLineSeparatorMultipleImportEmptyClass
{
}