From 7eb5a4e8972c356775d0adbb6da3ec87d437d1a8 Mon Sep 17 00:00:00 2001 From: shamith2 Date: Thu, 25 May 2023 14:15:06 +0530 Subject: [PATCH] Issue #13086: InnerAssignmentCheck failed for one line code in Java 14 switch expression --- .../checks/coding/InnerAssignmentCheck.java | 1 + .../coding/InnerAssignmentCheckTest.java | 8 +++++++ ...nputInnerAssignmentWithEnhancedSwitch.java | 23 +++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 100644 src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentWithEnhancedSwitch.java diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java index 18247669d53..7bb3f0feb48 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheck.java @@ -150,6 +150,7 @@ public class InnerAssignmentCheck TokenTypes.RESOURCE_SPECIFICATION, }, {TokenTypes.EXPR, TokenTypes.LAMBDA}, + {TokenTypes.EXPR, TokenTypes.SWITCH_RULE}, }; /** diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java index f33cc2527ef..6ef6d798399 100644 --- a/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java +++ b/src/test/java/com/puppycrawl/tools/checkstyle/checks/coding/InnerAssignmentCheckTest.java @@ -61,6 +61,14 @@ public void testIt() throws Exception { getPath("InputInnerAssignment.java"), expected); } + @Test + public void testEnhancedSwitchExpression() throws Exception { + final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; + verifyWithInlineConfigParser( + getNonCompilablePath("InputInnerAssignmentWithEnhancedSwitch.java"), + expected); + } + @Test public void testLambdaExpression() throws Exception { final String[] expected = CommonUtil.EMPTY_STRING_ARRAY; diff --git a/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentWithEnhancedSwitch.java b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentWithEnhancedSwitch.java new file mode 100644 index 00000000000..e956e03ef57 --- /dev/null +++ b/src/test/resources-noncompilable/com/puppycrawl/tools/checkstyle/checks/coding/innerassignment/InputInnerAssignmentWithEnhancedSwitch.java @@ -0,0 +1,23 @@ +/* +InnerAssignment + + +*/ + +//non-compiled with javac: Compilable with Java14 +package com.puppycrawl.tools.checkstyle.checks.coding.innerassignment; + +public class InputInnerAssignmentWithEnhancedSwitch { + + void method(final String operation) { + boolean flag = false; + if (flag = false) {} // violation + switch (operation) { + case "Y" -> flag = true; // no violation + case "N" -> { + flag = false; + } + default -> throw new UnsupportedOperationException(); + } + } +}