[FORMAT] Improve spacing

hexalang · Jul 12, 2024 · a64e503 · a64e503
1 parent 7fc2266
commit a64e503
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 654 deletions.
diff --git a/docs/target-haxe.md b/docs/target-haxe.md
diff --git a/library/haxe/haxe.hexa b/library/haxe/haxe.hexa
diff --git a/source/server/format.hexa b/source/server/format.hexa
@@ -32,7 +32,7 @@ fun autoFormatWholeFile(file: String): String {
 		var tabStack = ['']
 		var tabCase = [false]
 		var depth = 0
-		let assignOp = [Token.Add, Token.Multiply, Token.Subtract]
+		let assignOp = [Token.Add, Token.Multiply, Token.Subtract, Token.BitwiseAnd, Token.BitwiseOr]
 		var parenthesis = -1000000
 
 		fun updateTab() {
@@ -124,26 +124,42 @@ fun autoFormatWholeFile(file: String): String {
 				lastToken == Token.Dot or
 				token == Token.Dot or
 
+				// `+=`
 				(token == Token.Assign and assignOp.includes(lastToken)) or
 
+				// `~123`
+				lastToken == Token.BitwiseNot or
+
 				// `(something`
 				lastToken == Token.CallOpen or
 				// `(`
 				(
 					token == Token.CallOpen and
 					(
+						// Keywords
 						lastToken != Token.KIn and
-						lastToken != Token.Add and
-						lastToken != Token.Subtract and
 						lastToken != Token.KReturn and
 						lastToken != Token.KIf and
 						lastToken != Token.KFun and
-						lastToken != Token.LogicalAnd and
-						lastToken != Token.LogicalOr and
 						lastToken != Token.KNew and
 						lastToken != Token.KNot and
 						lastToken != Token.KSwitch and
+						lastToken != Token.KWhile and
+						lastToken != Token.KDo and
+						lastToken != Token.KFor and
+						lastToken != Token.LogicalAnd and
+						lastToken != Token.LogicalOr and
+
+						// Operators
 						lastToken != Token.Assign and
+						lastToken != Token.Add and
+						lastToken != Token.Subtract and
+						lastToken != Token.BitwiseAnd and
+						lastToken != Token.BitwiseOr and
+						lastToken != Token.Comma and
+						lastToken != Token.Equal and
+						lastToken != Token.Unequal and
+						lastToken != Token.Question and
 
 						// `@demo()` but not `@demo ()`
 						not (
@@ -158,7 +174,7 @@ fun autoFormatWholeFile(file: String): String {
 				// @sds() TODO error () no args not allowed
 				token == Token.CallClose or
 
-				// `[]`
+				// `[`
 				lastToken == Token.IndexOpen or
 				(
 					token == Token.IndexOpen and

diff --git a/source/targets/genC.hexa b/source/targets/genC.hexa
@@ -881,7 +881,7 @@ class GenCxx {
 				if c.external {
 					if c.jsRequire != null {
 						// todo MAKE IT possible to use plain-c include's!
-						// like "declare" vs "deep extern declare" for Haxe
+						// like "declare" vs "deep extern declare"
 						out += '\n ' + '/*var ' + c.name + ' = require("' + c.jsRequire + '")*/'
 						continue
 					}

diff --git a/source/targets/genCxx.hexa b/source/targets/genCxx.hexa
@@ -443,7 +443,7 @@
 				if (c.external) {
 					if (c.jsRequire != null) {
 						// todo MAKE IT possible to use plain-c include's!
-						// like "declare" vs "deep extern declare" for Haxe
+						// like "declare" vs "deep extern declare"
 						out += '\n ' + '/*var ' + c.name + ' = require("' + c.jsRequire + '")*/'
 						continue
 					}