Merge pull request #344 from BalticAmadeus/342-negative-integer-is-pa…

…rsed-as-unary-expression unary expression fix
BalticAmadeus · Mar 5, 2025 · b8bc76c · b8bc76c
2 parents 59638be + f7b1aa4
commit b8bc76c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 1 deletion.
diff --git a/resources/functionalTests/expression/4assign-unary-numerical/input.p b/resources/functionalTests/expression/4assign-unary-numerical/input.p
@@ -0,0 +1,4 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.expressionFormatting": true}*/
+
+a =    -c.
diff --git a/resources/functionalTests/expression/4assign-unary-numerical/target.p b/resources/functionalTests/expression/4assign-unary-numerical/target.p
@@ -0,0 +1,4 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.expressionFormatting": true}*/
+
+a = -c.
diff --git a/src/formatters/expression/ExpressionFormatter.ts b/src/formatters/expression/ExpressionFormatter.ts
@@ -33,7 +33,8 @@ export class ExpressionFormatter extends AFormatter implements IFormatter {
             node.type === SyntaxNodeType.ParenthesizedExpression ||
             node.type === SyntaxNodeType.AdditiveExpression ||
             node.type === SyntaxNodeType.MultiplicativeExpression ||
-            node.type === SyntaxNodeType.UnaryExpression
+            (node.type === SyntaxNodeType.UnaryExpression &&
+                node.child(0)?.type === SyntaxNodeType.Not)
         ) {
             if (this.hasWhilePhraseParent(node)) {
                 return false;

diff --git a/src/model/SyntaxNodeType.ts b/src/model/SyntaxNodeType.ts
@@ -93,6 +93,7 @@ export enum SyntaxNodeType {
     Divide = "/",
     Modulus = "%",
     EqualsSign = "=",
+    Not = "NOT",
     // comparison operators
     EqualTo = "EQ",
     NotEqualTo = "NE",