prepare release 1.0.11 (#117)

HaxeCheckstyle · Sep 3, 2018 · fb57da8 · fb57da8
1 parent d1cf599
commit fb57da8
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## dev branch / next version (1.x.x)
 
+## version 1.0.11 (2018-09-03)
+
 - Fixed position of semicolon [#113](https://github.com/HaxeCheckstyle/tokentree/issues/113)
 - Fixed handling of unary expressions [#113](https://github.com/HaxeCheckstyle/tokentree/issues/113)
 - Fixed detection of type check on numbers [#114](https://github.com/HaxeCheckstyle/tokentree/issues/114)

diff --git a/haxelib.json b/haxelib.json
@@ -7,8 +7,8 @@
     "contributors": [
         "AlexHaxe"
     ],
-    "releasenote": "added Colon type detection, fixed arrow and bropen detection - see CHANGELOG for details",
-    "version": "1.0.10",
+    "releasenote": "bugfixes - see CHANGELOG for details",
+    "version": "1.0.11",
     "url": "https://github.com/HaxeCheckstyle/tokentree",
     "dependencies": {}
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tokentree",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "description": "TokenTree library used by haxe-checkstyle",
     "repository": {
         "type": "git",

diff --git a/src/tokentree/utils/TokenTreeCheckUtils.hx b/src/tokentree/utils/TokenTreeCheckUtils.hx
@@ -46,7 +46,16 @@ class TokenTreeCheckUtils {
 
 	public static function isOpGtTypedefExtension(token:TokenTree):Bool {
 		return switch (token.tok) {
-			case Binop(OpGt): (token.access().parent().is(BrOpen).parent().is(Binop(OpAssign)).parent().isCIdent().parent().is(Kwd(KwdTypedef)).token != null);
+			case Binop(OpGt): (token.access()
+					.parent()
+					.is(BrOpen)
+					.parent()
+					.is(Binop(OpAssign))
+					.parent()
+					.isCIdent()
+					.parent()
+					.is(Kwd(KwdTypedef))
+					.token != null);
 			default: false;
 		}
 	}

diff --git a/src/tokentree/walk/WalkClass.hx b/src/tokentree/walk/WalkClass.hx
@@ -84,8 +84,13 @@ class WalkClass {
 	}
 
 	static function walkClassContinueAfterSharp(stream:TokenStream, parent:TokenTree) {
-		var brOpen:TokenTreeAccessHelper = TokenTreeAccessHelper.access(parent).lastChild().is(Sharp("if")).lastOf(Kwd(KwdFunction)).firstChild().lastChild().is(
-			BrOpen);
+		var brOpen:TokenTreeAccessHelper = TokenTreeAccessHelper.access(parent)
+			.lastChild()
+			.is(Sharp("if"))
+			.lastOf(Kwd(KwdFunction))
+			.firstChild()
+			.lastChild()
+			.is(BrOpen);
 		if (brOpen.token == null) return;
 		if (brOpen.lastChild().is(BrClose).token != null) return;
 		WalkBlock.walkBlockContinue(stream, parent);

diff --git a/src/tokentree/walk/WalkSwitch.hx b/src/tokentree/walk/WalkSwitch.hx
@@ -106,24 +106,24 @@ class WalkSwitch {
 
 	static function relocateSharpTree(parent:TokenTree, dblDot:TokenTree) {
 		/*
-			* 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
-			*/
+		 * 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) return;
 		var body:TokenTree = sharp.children[1];