fixed WhitespacePolicy compile error

AlexHaxe · AlexHaxe · commit 3f0103fffc64 · 2024-10-22T14:58:42.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.17.1 (2024-10-22)
+
+- Fixed WhitespacePolicy compilation error
+
 ## version 1.17.0 (2024-10-06)
 
 - **Breaking Change** replaced `whitespace.openingBracketPolicy` and `whitespace.closingBracketPolicy` settings with `whitespace.bracketConfig`, fixes [#592](https://github.com/HaxeCheckstyle/haxe-formatter/issues/592)
diff --git a/haxelib.json b/haxelib.json
@@ -8,8 +8,8 @@
 		"style"
 	],
 	"description": "A code formatter for Haxe",
-	"version": "1.17.0",
-	"releasenote": "Added more wrapping conditions; fixed various issues affecting a whole bunch of special cases - see CHANGELOG for details.",
+	"version": "1.17.1",
+	"releasenote": "Fixed WhitespacePolicy error - see CHANGELOG for details.",
 	"contributors": [
 		"AlexHaxe",
 		"Gama11"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@haxecheckstyle/haxe-formatter",
-	"version": "1.17.0",
+	"version": "1.17.1",
 	"description": "A code formatter for Haxe",
 	"repository": {
 		"type": "git",
diff --git a/resources/default-hxformat.json b/resources/default-hxformat.json
@@ -921,20 +921,6 @@
 				}
 			]
 		},
-		"opAssignWrap": {
-			"defaultWrap": "noWrap",
-			"rules": [
-				{
-					"conditions": [
-						{
-							"cond": "exceedsMaxLineLength",
-							"value": 1
-						}
-					],
-					"type": "fillLineWithLeadingBreak"
-				}
-			]
-		},
 		"opBoolChain": {
 			"defaultWrap": "noWrap",
 			"rules": [
diff --git a/resources/hxformat-schema.json b/resources/hxformat-schema.json
@@ -1283,10 +1283,6 @@
 					"description": "call parameter wrapping rules",
 					"$ref": "#/definitions/formatter.config.WrapRules"
 				},
-				"opAssignWrap": {
-					"description": "chain wrapping rules for case patterns",
-					"$ref": "#/definitions/formatter.config.WrapRules"
-				},
 				"arrayMatrixWrap": {
 					"description": "detect arrays in matrix configuration from source noMatrixWrap = no detection matrixWrapNoAlign = detect and format as matrix without alignment matrixWrapWithAlign = detect and format as matrix and align columns",
 					"$ref": "#/definitions/formatter.config.ArrayMatrixWrap",
diff --git a/src/formatter/config/WhitespacePolicy.hx b/src/formatter/config/WhitespacePolicy.hx
@@ -11,7 +11,7 @@ enum abstract WhitespacePolicy(String) {
 	var Around = "around";
 
 	public static function has(policy:WhitespacePolicy, wantPolicy:WhitespacePolicy):Bool {
-		return (policy.remove(wantPolicy) != policy);
+		return (remove(policy, wantPolicy) != policy);
 	}
 
 	public static function remove(policy:WhitespacePolicy, removePolicy:WhitespacePolicy):WhitespacePolicy {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@haxecheckstyle/haxe-formatter",`
`3`		`- "version": "1.17.0",`
	`3`	`+ "version": "1.17.1",`
`4`	`4`	`"description": "A code formatter for Haxe",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ enum abstract WhitespacePolicy(String) {`
`11`	`11`	`var Around = "around";`
`12`	`12`
`13`	`13`	`public static function has(policy:WhitespacePolicy, wantPolicy:WhitespacePolicy):Bool {`
`14`		`- return (policy.remove(wantPolicy) != policy);`
	`14`	`+ return (remove(policy, wantPolicy) != policy);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`public static function remove(policy:WhitespacePolicy, removePolicy:WhitespacePolicy):WhitespacePolicy {`