fix token tree structure for Sharp(If) inside Kwd(KwdCase) (#394)

* fix token tree structure for Sharp(If) inside Kwd(KwdCase)
* updated CHANGES.md
* expanded test case

Author: AlexHaxe

CHANGES.md

@@ -1,6 +1,7 @@
 ## next version (2.x.x)
 
 - Fixed handling of default setters/getters in indentation check [#391](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/391)
+- Fixed token tree structure for Sharp(If) inside Kwd(KwdCase) [#394](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/394)
 - Added unittests for ParserQueue and CheckerPool [#393](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/393)
 - Improved wrapped code detection [#392](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/392)
 

src/checkstyle/token/walk/WalkSwitch.hx

@@ -85,6 +85,31 @@ class WalkSwitch {
 					WalkComment.walkComment(stream, parent);
 				case Sharp(_):
 					WalkSharp.walkSharp(stream, parent, WalkSwitch.walkSwitchCases);
+					/*
+					 * relocate sharp subtree from:
+					 *  |- BrOpen
+					 *      |- Kwd(KwdCase)
+					 *      |   |- expression
+					 *      |   |- DblDot
+					 *      |       |- statement
+					 *      |- Sharp(If)
+					 *      |   |- condition
+					 *      |   |- statement (if not a new case)
+					 * to:
+					 *      |- Kwd(KwdCase)
+					 *      |   |- expression
+					 *      |   |- DblDot
+					 *      |       |- statement
+					 *      |       |- Sharp(If)
+					 *      |           |- condition
+					 *      |           |- statement
+					 */
+					var sharp:TokenTree = parent.getLastChild();
+					if (sharp.children.length < 2) continue;
+					var body:TokenTree = sharp.children[1];
+					if (body.is(Kwd(KwdCase))) continue;
+					parent.children.pop();
+					dblDot.addChild(sharp);
 				default:
 					WalkStatement.walkStatement(stream, dblDot);
 			}

test/checks/whitespace/IndentationCheckTest.hx

@@ -131,6 +131,17 @@ long comment
 				4,
 				5:
 				doSomething();
+			case 6:
+				#if php
+				doSomething();
+				#else
+				doSomething();
+				#end
+				doSomething();
+			#if (haxe_ver < 4.0)
+			case 7:
+				doSomething();
+			#end
 			default:
 				doSomething();
 		}