fixed ETypeCheck with conditional, fixes #395

HaxeCheckstyle · Apr 6, 2019 · 38ca3df · 38ca3df
1 parent 0fef341
commit 38ca3df
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,11 @@
 - Fixed missing empty lines in classes with conditionals, fixes [#419](https://github.com/HaxeCheckstyle/haxe-formatter/issues/419)
 - Fixed wrapping of concatenated strings
 - Fixed ECheckType detection with cast, fixes [#374](https://github.com/HaxeCheckstyle/haxe-formatter/issues/374)
+- Fixed same line handling of cases with object pattern, fixes [#306](https://github.com/HaxeCheckstyle/haxe-formatter/issues/306)
+- Fixed ETypeCheck with conditional, fixes [#395](https://github.com/HaxeCheckstyle/haxe-formatter/issues/395)
 - Changed default value for `excludes` to include `node_modules` ([#420](https://github.com/HaxeCheckstyle/haxe-formatter/issues/420))
 - Changed debug code to produce less unneccessary code in non debug mode ([#417](https://github.com/HaxeCheckstyle/haxe-formatter/issues/417))
+- Updated testcases for [#305](https://github.com/HaxeCheckstyle/haxe-formatter/issues/305)
 
 ## version 1.6.0 (2019-03-22)
 

diff --git a/test/testcases/whitespace/issue_395_echecktype_with_conditional.hxtest b/test/testcases/whitespace/issue_395_echecktype_with_conditional.hxtest
@@ -0,0 +1,18 @@
+{}
+
+
+---
+
+class Main {
+	static function main() {
+		__bytePointer.set(#if flash byteArray #else (byteArray : ByteArrayData) #end, byteArray.position);
+	}
+}
+
+---
+
+class Main {
+	static function main() {
+		__bytePointer.set(#if flash byteArray #else (byteArray : ByteArrayData) #end, byteArray.position);
+	}
+}