diff --git a/CHANGELOG.md b/CHANGELOG.md index 9327a1a..84ae661 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## dev branch / next version (1.x.x) +## version 1.0.28 (2020-06-07) + - Expanded `POpen` types in getPOpenType to distinguish between different condition expressions ([#185](https://github.com/HaxeCheckstyle/tokentree/issues/185)) - Fixed type hint detection for anon types ([#186](https://github.com/HaxeCheckstyle/tokentree/issues/186)) - Fixed final position for Haxe 3 ([#186](https://github.com/HaxeCheckstyle/tokentree/issues/186)) diff --git a/haxelib.json b/haxelib.json index 8c0f3dd..59c2190 100644 --- a/haxelib.json +++ b/haxelib.json @@ -7,8 +7,8 @@ "contributors": [ "AlexHaxe" ], - "releasenote": "fixed null pointer for `private final class` - see CHANGELOG for details", - "version": "1.0.27", + "releasenote": "fixed @in handling, detects more POpen types - see CHANGELOG for details", + "version": "1.0.28", "url": "https://github.com/HaxeCheckstyle/tokentree", "dependencies": {} } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1652528..fba42a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,13 +1,13 @@ { "name": "tokentree", - "version": "1.0.27", + "version": "1.0.28", "lockfileVersion": 1, "requires": true, "dependencies": { "lix": { - "version": "15.8.11", - "resolved": "https://registry.npmjs.org/lix/-/lix-15.8.11.tgz", - "integrity": "sha512-DqCAvConfo0d37VNj1tCDubPK7B61rt8Y3yvXIsp6qUOjEVn48NC2ZNJmKMmtdHZT2E86TJUiODN+4QejcBNWw==", + "version": "15.9.0", + "resolved": "https://registry.npmjs.org/lix/-/lix-15.9.0.tgz", + "integrity": "sha512-XyIVUZ9Mr3DNPXwbvKrAS3t1XeeBugbrva/YoMUQSJLrmCwVNlx1/ishj4bkZ/WdH1x0m1Smd767zwyr6wy/8g==", "dev": true } } diff --git a/package.json b/package.json index 5ce8dc5..fbfec3e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tokentree", - "version": "1.0.27", + "version": "1.0.28", "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver", "repository": { "type": "git", @@ -16,7 +16,7 @@ "email": "Alexander.Blum@gmail.com" }, "devDependencies": { - "lix": "^15.8.11" + "lix": "^15.9.0" }, "bugs": "https://github.com/HaxeCheckstyle/tokentree/issues", "license": "MIT" diff --git a/src/tokentree/utils/TokenTreeCheckUtils.hx b/src/tokentree/utils/TokenTreeCheckUtils.hx index e6bf7c3..824e311 100644 --- a/src/tokentree/utils/TokenTreeCheckUtils.hx +++ b/src/tokentree/utils/TokenTreeCheckUtils.hx @@ -611,7 +611,10 @@ class TokenTreeCheckUtils { case DblDot: case At: return true; - case Kwd(KwdDefault): + case Kwd(_): + #if haxe4 + case Binop(OpIn): + #end default: return false; }