expanded whitespace options for parens and braces, fixes #251 (#282)

* expanded whitespace options for parens and braces, fixes #251 * removed CompileTime.getAllClasses since it uses Context.onMacroContextReused (see HaxeFoundation/haxe#5746)
HaxeCheckstyle · Dec 1, 2018 · 4c0e90f · 4c0e90f
1 parent 3dfd0f6
commit 4c0e90f
Show file tree

Hide file tree

Showing 15 changed files with 588 additions and 219 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## dev branch / next version (1.x.x)
 
+- **Breaking Change** replaced `whitespace.openingParenPolicy` and `whitespace.closingParenPolicy` settings with `whitespace.parenConfig` [#282](https://github.com/HaxeCheckstyle/haxe-formatter/issues/282)
+- **Breaking Change** replaced `whitespace.openingBracePolicy` `whitespace.closingBracePolicy`, `whitespace.objectOpeningBracePolicy` and `whitespace.objectClosingBracePolicy` settings with `whitespace.bracesConfig` [#282](https://github.com/HaxeCheckstyle/haxe-formatter/issues/282)
 - Added check to prevent tokentree parser issues from deleting code [#281](https://github.com/HaxeCheckstyle/haxe-formatter/issues/281)
 - Fixed properties in anon types [#276](https://github.com/HaxeCheckstyle/haxe-formatter/issues/276)
 - Fixed empty lines between single line types with meta [#277](https://github.com/HaxeCheckstyle/haxe-formatter/issues/277)

diff --git a/resources/default-hxformat.json b/resources/default-hxformat.json
@@ -131,11 +131,36 @@
 	"whitespace": {
 		"arrowFunctionsPolicy": "around",
 		"binopPolicy": "around",
+		"bracesConfig": {
+			"anonTypeBraces": {
+				"openingPolicy": "before",
+				"closingPolicy": "onlyAfter",
+				"removeInnerWhenEmpty": true
+			},
+			"blockBraces": {
+				"openingPolicy": "before",
+				"closingPolicy": "onlyAfter",
+				"removeInnerWhenEmpty": true
+			},
+			"objectLiteralBraces": {
+				"openingPolicy": "before",
+				"closingPolicy": "onlyAfter",
+				"removeInnerWhenEmpty": true
+			},
+			"typedefBraces": {
+				"openingPolicy": "before",
+				"closingPolicy": "onlyAfter",
+				"removeInnerWhenEmpty": true
+			},
+			"unknownBraces": {
+				"openingPolicy": "before",
+				"closingPolicy": "onlyAfter",
+				"removeInnerWhenEmpty": true
+			}
+		},
 		"caseColonPolicy": "onlyAfter",
 		"catchPolicy": "after",
-		"closingBracePolicy": "after",
 		"closingBracketPolicy": "none",
-		"closingParenPolicy": "onlyAfter",
 		"colonPolicy": "none",
 		"commaPolicy": "onlyAfter",
 		"compressSuccessiveParenthesis": true,
@@ -147,12 +172,45 @@
 		"functionTypeHaxe4Policy": "around",
 		"ifPolicy": "after",
 		"intervalPolicy": "none",
-		"objectClosingBracePolicy": "onlyAfter",
 		"objectFieldColonPolicy": "after",
-		"objectOpeningBracePolicy": "onlyBefore",
-		"openingBracePolicy": "before",
 		"openingBracketPolicy": "noneAfter",
-		"openingParenPolicy": "noneAfter",
+		"parenConfig": {
+			"anonFuncParamParens": {
+				"closingPolicy": "onlyAfter",
+				"openingPolicy": "none",
+				"removeInnerWhenEmpty": true
+			},
+			"callParens": {
+				"closingPolicy": "onlyAfter",
+				"openingPolicy": "none",
+				"removeInnerWhenEmpty": true
+			},
+			"conditionParens": {
+				"openingPolicy": "noneAfter",
+				"closingPolicy": "onlyAfter",
+				"removeInnerWhenEmpty": true
+			},
+			"expressionParens": {
+				"openingPolicy": "noneAfter",
+				"closingPolicy": "onlyAfter",
+				"removeInnerWhenEmpty": true
+			},
+			"forLoopParens": {
+				"openingPolicy": "noneAfter",
+				"closingPolicy": "onlyAfter",
+				"removeInnerWhenEmpty": true
+			},
+			"funcParamParens": {
+				"closingPolicy": "onlyAfter",
+				"openingPolicy": "none",
+				"removeInnerWhenEmpty": true
+			},
+			"metadataParens": {
+				"closingPolicy": "onlyAfter",
+				"openingPolicy": "none",
+				"removeInnerWhenEmpty": true
+			}
+		},
 		"semicolonPolicy": "onlyAfter",
 		"switchPolicy": "after",
 		"ternaryPolicy": "around",