fixed POpenType detection

HaxeCheckstyle · Apr 6, 2020 · 98ccf0f · 98ccf0f
1 parent aa7e6f6
commit 98ccf0f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
 - Added final handling for interfaces [#176](https://github.com/HaxeCheckstyle/tokentree/issues/176)
 - Fixed unary `OpSub` handling [#174](https://github.com/HaxeCheckstyle/tokentree/issues/174)
 - Fixed arrow function detection [#175](https://github.com/HaxeCheckstyle/tokentree/issues/175) + [#177](https://github.com/HaxeCheckstyle/tokentree/issues/177)
-- Fixed `POpen` type detection [#177](https://github.com/HaxeCheckstyle/tokentree/issues/177)
+- Fixed `POpen` type detection [#177](https://github.com/HaxeCheckstyle/tokentree/issues/177) + [#180](https://github.com/HaxeCheckstyle/tokentree/issues/180)
 - Fixed `BrOpen` type detection [#178](https://github.com/HaxeCheckstyle/tokentree/issues/178)
 - Fixed `Binop(OpOr)` position [#178](https://github.com/HaxeCheckstyle/tokentree/issues/178)
 - Fixed expression metadata position [#179](https://github.com/HaxeCheckstyle/tokentree/issues/179)

diff --git a/src/tokentree/utils/TokenTreeCheckUtils.hx b/src/tokentree/utils/TokenTreeCheckUtils.hx
@@ -604,6 +604,7 @@ class TokenTreeCheckUtils {
 				case DblDot:
 				case At:
 					return true;
+				case Kwd(KwdDefault):
 				default:
 					return false;
 			}

diff --git a/test/tokentree/utils/TokenTreeCheckUtilsTest.hx b/test/tokentree/utils/TokenTreeCheckUtilsTest.hx
@@ -278,7 +278,7 @@ class TokenTreeCheckUtilsTest {
 		Assert.isFalse(root.inserted);
 
 		var allBr:Array<TokenTree> = root.filter([POpen], ALL);
-		Assert.areEqual(22, allBr.length);
+		Assert.areEqual(24, allBr.length);
 		var index:Int = 0;
 		// @:deprecated('UnlessshuffleArray(), you should use shuffle() quality.')
 		Assert.areEqual(POpenType.AT, TokenTreeCheckUtils.getPOpenType(allBr[index++]));
@@ -320,6 +320,12 @@ class TokenTreeCheckUtilsTest {
 		Assert.areEqual(POpenType.EXPRESSION, TokenTreeCheckUtils.getPOpenType(allBr[index++]));
 		Assert.areEqual(POpenType.CALL, TokenTreeCheckUtils.getPOpenType(allBr[index++]));
 		Assert.areEqual(POpenType.EXPRESSION, TokenTreeCheckUtils.getPOpenType(allBr[index++]));
+		Assert.areEqual(POpenType.CALL, TokenTreeCheckUtils.getPOpenType(allBr[index++]));
+
+		// @:default(false) @:optional var disableFormatting:Bool;
+		Assert.areEqual(POpenType.AT, TokenTreeCheckUtils.getPOpenType(allBr[index++]));
+		// @:default(auto) @:optional var emptyLines:EmptyLinesConfig;
+		Assert.areEqual(POpenType.AT, TokenTreeCheckUtils.getPOpenType(allBr[index++]));
 	}
 
 	@Test
@@ -737,6 +743,14 @@ abstract TokenTreeCheckUtilsTests(String) to String {
 				(bytes : Bytes).sortI32(0, length, cast f);
 		}
 	}
+	typedef FormatterConfig = {
+		/**
+			turns off formatting for all files in current folder and subfolders
+			unless subfolder contains a `hxformat.json`
+		**/
+		@:default(false) @:optional var disableFormatting:Bool;
+		@:default(auto) @:optional var emptyLines:EmptyLinesConfig;
+	}
 	";
 
 	var MIXED_TYPE_PARAMETER = "