diff --git a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java index 377bbef2e..f52d54849 100644 --- a/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java +++ b/src/it/java/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/RightCurlyTest.java @@ -121,4 +121,19 @@ public class RightCurlyTest extends BaseCheckTestSupport { final Integer[] warnList = getLinesWithWarn(filePath); verify(checkConfig, filePath, expected, warnList); } + + @Test + public void testRightCurlyAloneInLambda() throws Exception { + final String[] expected = { + "12:70: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 70), + "15:46: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 46), + "22:33: " + getCheckMessage(RightCurlyCheck.class, MSG_KEY_LINE_ALONE, "}", 33), + }; + + final Configuration checkConfig = getCheckConfig("RightCurly", "RightCurlyAlone"); + final String filePath = getPath("InputRightCurlyAloneLambda.java"); + + final Integer[] warnList = {12, 15, 22}; + verify(checkConfig, filePath, expected, warnList); + } } diff --git a/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyAloneLambda.java b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyAloneLambda.java new file mode 100644 index 000000000..821e60eb6 --- /dev/null +++ b/src/it/resources/com/google/checkstyle/test/chapter4formatting/rule412nonemptyblocks/InputRightCurlyAloneLambda.java @@ -0,0 +1,30 @@ +package com.puppycrawl.tools.checkstyle.checks.blocks; + +/*Test lambda*/ +public class InputRightCurlyAloneLambda { + + static Runnable k1 = () -> { + String.valueOf("Test rightCurly 1!"); + }; + + static Runnable k2 = () -> String.valueOf("Test rightCurly 2!"); + + static Runnable k3 = () -> {String.valueOf("Test rightCurly 3!");}; // violation + + static Runnable k4 = () -> { + String.valueOf("Test rightCurly 4!");}; // violation + + static Runnable k5 = () -> + { + String.valueOf("Test rightCurly 5!"); + }; + + static Runnable k6 = () -> {}; // violation + + static Runnable k7 = () -> { + }; + + static Runnable k8 = () -> + { + }; +} diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java index 8cc49a5a2..2d80793cf 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheck.java @@ -42,7 +42,8 @@ import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; * {@link TokenTypes#LITERAL_CATCH LITERAL_CATCH}, * {@link TokenTypes#LITERAL_FINALLY LITERAL_FINALLY}, * {@link TokenTypes#LITERAL_IF LITERAL_IF}, - * {@link TokenTypes#LITERAL_ELSE LITERAL_ELSE}. + * {@link TokenTypes#LITERAL_ELSE LITERAL_ELSE}, + * {@link TokenTypes#LAMBDA LAMBDA}. * Other acceptable tokens are: * {@link TokenTypes#CLASS_DEF CLASS_DEF}, * {@link TokenTypes#METHOD_DEF METHOD_DEF}, @@ -52,6 +53,7 @@ import com.puppycrawl.tools.checkstyle.utils.ScopeUtils; * {@link TokenTypes#LITERAL_DO LITERAL_DO}. * {@link TokenTypes#STATIC_INIT STATIC_INIT}. * {@link TokenTypes#INSTANCE_INIT INSTANCE_INIT}. + * {@link TokenTypes#LAMBDA LAMBDA}. *

*

* shouldStartLine - does the check need to check @@ -143,6 +145,7 @@ public class RightCurlyCheck extends AbstractCheck { TokenTypes.LITERAL_FINALLY, TokenTypes.LITERAL_IF, TokenTypes.LITERAL_ELSE, + TokenTypes.LAMBDA, }; } @@ -162,6 +165,7 @@ public class RightCurlyCheck extends AbstractCheck { TokenTypes.LITERAL_DO, TokenTypes.STATIC_INIT, TokenTypes.INSTANCE_INIT, + TokenTypes.LAMBDA, }; } @@ -203,14 +207,11 @@ public class RightCurlyCheck extends AbstractCheck { private static String validate(Details details, RightCurlyOption bracePolicy, boolean shouldStartLine, String targetSourceLine) { final DetailAST rcurly = details.rcurly; - final DetailAST lcurly = details.lcurly; final DetailAST nextToken = details.nextToken; final boolean shouldCheckLastRcurly = details.shouldCheckLastRcurly; String violation = ""; - if (bracePolicy == RightCurlyOption.SAME - && !hasLineBreakBefore(rcurly) - && lcurly.getLineNo() != rcurly.getLineNo()) { + if (shouldHaveBeLineBreakBefore(bracePolicy, details)) { violation = MSG_KEY_LINE_BREAK_BEFORE; } else if (shouldCheckLastRcurly) { @@ -248,14 +249,19 @@ public class RightCurlyCheck extends AbstractCheck { * @return true if a right curly should be alone on a line. */ private static boolean shouldBeAloneOnLine(RightCurlyOption bracePolicy, Details details) { + final int tokenLambda = details.lcurly.getParent().getType(); return bracePolicy == RightCurlyOption.ALONE + && tokenLambda != TokenTypes.LAMBDA && !isAloneOnLine(details) && !isEmptyBody(details.lcurly) || bracePolicy == RightCurlyOption.ALONE_OR_SINGLELINE && !isAloneOnLine(details) && !isSingleLineBlock(details) && !isAnonInnerClassInit(details.lcurly) - && !isEmptyBody(details.lcurly); + && !isEmptyBody(details.lcurly) + || bracePolicy == RightCurlyOption.ALONE + && tokenLambda == TokenTypes.LAMBDA + && !isAloneLambda(details); } /** @@ -295,6 +301,24 @@ public class RightCurlyCheck extends AbstractCheck { && rcurly.getLineNo() != nextToken.getLineNo(); } + /** + * Checks if right curly is alone on line in token the lambda. + * @param details for validation. + * @return true, if right curly is alone on line. + */ + private static boolean isAloneLambda(Details details) { + final DetailAST lcurly = details.lcurly; + final DetailAST rcurly = details.rcurly; + final int lcurlyNo = lcurly.getLineNo(); + final int rcurlyNo = rcurly.getLineNo(); + boolean result = false; + if (lcurlyNo != rcurlyNo) { + result = rcurly.getPreviousSibling() == null + || rcurlyNo != rcurly.getPreviousSibling().getLineNo(); + } + return result; + } + /** * Checks whether lcurly is in anonymous inner class initialization. * @param lcurly left curly token. @@ -377,9 +401,16 @@ public class RightCurlyCheck extends AbstractCheck { rcurly = lcurly.getLastChild(); } break; + case TokenTypes.LAMBDA: + lcurly = ast.findFirstToken(TokenTypes.SLIST); + nextToken = getNextToken(ast); + if (lcurly != null) { + rcurly = lcurly.getLastChild(); + } + break; default: // ATTENTION! We have default here, but we expect case TokenTypes.METHOD_DEF, - // TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_WHILE, only. + // TokenTypes.LITERAL_FOR, TokenTypes.LITERAL_WHILE only. // It has been done to improve coverage to 100%. I couldn't replace it with // if-else-if block because code was ugly and didn't pass pmd check. @@ -435,6 +466,21 @@ public class RightCurlyCheck extends AbstractCheck { return CheckUtils.getFirstNode(next); } + /** + * Checks that before a right curly should be a linebreak. + * @param bracePolicy options for placing the right curly brace. + * @param details Details for validation + * @return true if before a right curly should be a linebreak. + */ + private static boolean shouldHaveBeLineBreakBefore(RightCurlyOption bracePolicy, + Details details) { + final DetailAST rcurly = details.rcurly; + final DetailAST lcurly = details.lcurly; + return bracePolicy == RightCurlyOption.SAME + && !hasLineBreakBefore(rcurly) + && lcurly.getLineNo() != rcurly.getLineNo(); + } + /** * Checks if right curly has line break before. * @param rightCurly right curly token. diff --git a/src/main/resources/google_checks.xml b/src/main/resources/google_checks.xml index 21465861c..179ebc794 100644 --- a/src/main/resources/google_checks.xml +++ b/src/main/resources/google_checks.xml @@ -61,7 +61,7 @@ - + diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java index 1b43a382a..30eef8a10 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/RightCurlyCheckTest.java @@ -259,6 +259,18 @@ public class RightCurlyCheckTest extends BaseCheckTestSupport { verify(checkConfig, getPath("InputRightCurlyAloneOrSingleline.java"), expected); } + @Test + public void testRightCurlyIsAloneInLambda() throws Exception { + checkConfig.addAttribute("option", RightCurlyOption.ALONE.toString()); + checkConfig.addAttribute("tokens", "LAMBDA"); + final String[] expected = { + "14:74: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 74), + "17:49: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 49), + "24:33: " + getCheckMessage(MSG_KEY_LINE_ALONE, "}", 33), + }; + verify(checkConfig, getPath("InputRightCurlyAloneInLambda.java"), expected); + } + @Test public void testCatchWithoutFinally() throws Exception { final String[] expected = { diff --git a/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyAloneInLambda.java b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyAloneInLambda.java new file mode 100644 index 000000000..b5b8400c3 --- /dev/null +++ b/src/test/resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputRightCurlyAloneInLambda.java @@ -0,0 +1,32 @@ +package com.puppycrawl.tools.checkstyle.checks.blocks; + +/* +This is test class for token LAMBDA. + */ +public class InputRightCurlyAloneInLambda { + + static Runnable r1 = () -> { + String.valueOf("Test rightCurly one!"); + }; + + static Runnable r2 = () -> String.valueOf("Test rightCurly two!"); + + static Runnable r3 = () -> {String.valueOf("Test rightCurly three!");}; //violation + + static Runnable r4 = () -> { + String.valueOf("Test rightCurly four!");}; //violation + + static Runnable r5 = () -> + { + String.valueOf("Test rightCurly five!"); + }; + + static Runnable r6 = () -> {}; //violation + + static Runnable r7 = () -> { + }; + + static Runnable r8 = () -> + { + }; +} diff --git a/src/xdocs/config_blocks.xml b/src/xdocs/config_blocks.xml index 2c2c15292..af6eb5321 100644 --- a/src/xdocs/config_blocks.xml +++ b/src/xdocs/config_blocks.xml @@ -799,7 +799,9 @@ for(int i = 0; i < 10; value.incrementValue()); // OK STATIC_INIT, INSTANCE_INIT. + href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#INSTANCE_INIT">INSTANCE_INIT, + LAMBDA. LITERAL_TRY, @@ -810,7 +812,9 @@ for(int i = 0; i < 10; value.incrementValue()); // OK LITERAL_IF, LITERAL_ELSE. + href="apidocs/com/puppycrawl/tools/checkstyle/api/TokenTypes.html#LITERAL_ELSE">LITERAL_ELSE, + LAMBDA.