fix parser errors when handling blocks and object decls, fixes #396 (#397)

* fix parser errors when handling blocks and object decls, fixes #396
* updated CHANGES.md

Author: AlexHaxe

CHANGES.md

@@ -2,6 +2,8 @@
 
 - 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)
+- Fixed comments in function parameters [#395](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/394)
+- Fixed parser errors when handling block and object declarations, fixes [#366](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/396) ([#397](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/WalkArrayAccess.hx

@@ -23,7 +23,7 @@ class WalkArrayAccess {
 				case BrOpen:
 					for (stored in tempStore) bkOpen.addChild(stored);
 					tempStore = [];
-					WalkObjectDecl.walkObjectDecl(stream, bkOpen);
+					WalkBlock.walkBlock(stream, bkOpen);
 				case BkOpen:
 					for (stored in tempStore) bkOpen.addChild(stored);
 					tempStore = [];

src/checkstyle/token/walk/WalkBlock.hx

@@ -13,18 +13,20 @@ class WalkBlock {
 		var rewindPos:Int = stream.currentPos();
 		while (stream.is(At)) tempStore.push(WalkAt.walkAt(stream));
 		if (stream.is(BrOpen)) {
-			if (isBrOpenObjectDecl(parent)) {
-				WalkObjectDecl.walkObjectDecl(stream, parent);
-				return;
-			}
 			var openTok:TokenTree = stream.consumeTokenDef(BrOpen);
 			parent.addChild(openTok);
 			for (tok in tempStore) openTok.addChild(tok);
 
 			var progress:TokenStreamProgress = new TokenStreamProgress(stream);
 			while (progress.streamHasChanged()) {
-				if (stream.is(BrClose)) break;
-				WalkStatement.walkStatement(stream, openTok);
+				switch (stream.token()) {
+					case BrClose: break;
+					case Comma, BkClose, PClose:
+						var child:TokenTree = stream.consumeToken();
+						openTok.addChild(child);
+					default: WalkStatement.walkStatement(stream, openTok);
+
+				}
 			}
 			openTok.addChild(stream.consumeTokenDef(BrClose));
 		}
@@ -33,16 +35,4 @@ class WalkBlock {
 			WalkStatement.walkStatement(stream, parent);
 		}
 	}
-
-	static function isBrOpenObjectDecl(token:TokenTree):Bool {
-		if ((token == null) || (token.tok == null)) return false;
-		return switch (token.tok) {
-			case BkOpen: true;
-			case Kwd(KwdReturn): true;
-			case Kwd(KwdFor): isBrOpenObjectDecl(token.parent);
-			case Kwd(_): false;
-			case Binop(OpAssign): true;
-			default: isBrOpenObjectDecl(token.parent);
-		}
-	}
 }

src/checkstyle/token/walk/WalkObjectDecl.hx

@@ -16,7 +16,7 @@ class WalkPOpen {
 				case POpen:
 					WalkPOpen.walkPOpen(stream, parent);
 				case BrOpen:
-					WalkObjectDecl.walkObjectDecl(stream, parent);
+					WalkBlock.walkBlock(stream, parent);
 				case BkOpen:
 					WalkArrayAccess.walkArrayAccess(stream, parent);
 				case PClose:

src/checkstyle/token/walk/WalkPOpen.hx

@@ -83,9 +83,6 @@ class WalkStatement {
 					WalkStatement.walkStatement(stream, question);
 					return;
 				}
-				if (isDblDotObjectDecl(parent)) {
-					return;
-				}
 				var dblDotTok:TokenTree = stream.consumeToken();
 				parent.addChild(dblDotTok);
 				WalkTypeNameDef.walkTypeNameDef(stream, dblDotTok);
@@ -166,13 +163,4 @@ class WalkStatement {
 		}
 		return null;
 	}
-
-	static function isDblDotObjectDecl(token:TokenTree):Bool {
-		if ((token == null) || (token.tok == null)) return false;
-		return switch (token.tok) {
-			case BrOpen: true;
-			case POpen: false;
-			default: isDblDotObjectDecl(token.parent);
-		}
-	}
 }

src/checkstyle/token/walk/WalkStatement.hx

@@ -123,7 +123,7 @@ class WalkSwitch {
 				case POpen:
 					WalkPOpen.walkPOpen(stream, parent);
 				case BrOpen:
-					WalkObjectDecl.walkObjectDecl(stream, parent);
+					WalkBlock.walkBlock(stream, parent);
 				case BkOpen:
 					WalkArrayAccess.walkArrayAccess(stream, parent);
 				case Kwd(KwdFunction):

src/checkstyle/token/walk/WalkSwitch.hx

@@ -31,6 +31,9 @@ class TokenTreeBuilderParsingTest {
 		assertCodeParses(MACRO_REIFICATION);
 		assertCodeParses(BLOCK_METADATA);
 		assertCodeParses(COMMENTS_IN_FUNCTION_PARAMS);
+		assertCodeParses(BLOCK_OBJECT_DECL_SAMPLES_ISSUE_396_1);
+		assertCodeParses(BLOCK_OBJECT_DECL_SAMPLES_ISSUE_396_2);
+		assertCodeParses(BLOCK_OBJECT_DECL_SAMPLES_ISSUE_396_3);
 	}
 
 	public function assertCodeParses(code:String, ?pos:PosInfos) {
@@ -398,7 +401,46 @@ abstract TokenTreeBuilderParsingTests(String) to String {
 	class Test {
 		function test( /* comment */ a:String /* comment */) { }
 		function test2( /* comment */ /* comment */) { }
-	}
-	";
+	}";
+
+	var BLOCK_OBJECT_DECL_SAMPLES_ISSUE_396_1 = "
+	class Test {
+		function test() {
+			//fails with: bad token Comma != BrClose
+			var test = switch a
+			{
+			    case 3: {a: 1, b: 2};
+			    default: {a: 0, b: 2};
+			}
+		}
+	}";
 
+	var BLOCK_OBJECT_DECL_SAMPLES_ISSUE_396_2 = "
+	class Test {
+		function test() {
+			//fails with: bad token Kwd(KwdFunction) != DblDot
+			return {
+			    #if js
+			    something:
+			    #else
+			    somethingelse:
+			    #end
+			    function (e)
+			    {
+			        e.preventDefault();
+			        callback();
+			    }
+			};
+		}
+	}";
+
+	var BLOCK_OBJECT_DECL_SAMPLES_ISSUE_396_3 = "
+	class Test {
+		function test() {
+			return {
+			    doSomething();
+			    1;
+			}
+		}
+	}";
 }