fixed nested conditionals

HaxeCheckstyle · Oct 3, 2024 · 075abf0 · 075abf0
1 parent 4cc97e3
commit 075abf0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.2.17 (2024-10-04)
+
+- Fixed nested conditionals
+
 ## version 1.2.16 (2024-10-03)
 
 - Fixed conditionals after PClose

diff --git a/haxelib.json b/haxelib.json
@@ -7,8 +7,8 @@
     "contributors": [
         "AlexHaxe"
     ],
-    "releasenote": "fixed conditionals after PClose - see CHANGELOG for details",
-    "version": "1.2.16",
+    "releasenote": "fixed nested conditionals - see CHANGELOG for details",
+    "version": "1.2.17",
     "url": "https://github.com/HaxeCheckstyle/tokentree",
     "dependencies": {}
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tokentree",
-    "version": "1.2.16",
+    "version": "1.2.17",
     "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver",
     "repository": {
         "type": "git",

diff --git a/src/tokentree/walk/WalkPOpen.hx b/src/tokentree/walk/WalkPOpen.hx
@@ -19,7 +19,10 @@ class WalkPOpen {
 					pOpen.addChild(arrow);
 					WalkBlock.walkBlock(stream, arrow);
 				case Sharp(WalkSharpConsts.IF):
-					WalkSharp.walkSharp(stream, parent, WalkStatement.walkStatement);
+					switch (parent.tok) {
+						case Sharp(WalkSharpConsts.IF):
+						default: WalkSharp.walkSharp(stream, parent, WalkStatement.walkStatement);
+					}
 				default:
 			}
 		}