From eee15fdfe66901f360ea90a445b9267c4807c066 Mon Sep 17 00:00:00 2001 From: PauliusKu Date: Wed, 5 Mar 2025 18:49:56 +0200 Subject: [PATCH 1/3] test --- src/formatters/expression/ExpressionFormatter.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/formatters/expression/ExpressionFormatter.ts b/src/formatters/expression/ExpressionFormatter.ts index 394030cf..e56880b3 100644 --- a/src/formatters/expression/ExpressionFormatter.ts +++ b/src/formatters/expression/ExpressionFormatter.ts @@ -32,8 +32,7 @@ export class ExpressionFormatter extends AFormatter implements IFormatter { node.type === SyntaxNodeType.ComparisonExpression || node.type === SyntaxNodeType.ParenthesizedExpression || node.type === SyntaxNodeType.AdditiveExpression || - node.type === SyntaxNodeType.MultiplicativeExpression || - node.type === SyntaxNodeType.UnaryExpression + node.type === SyntaxNodeType.MultiplicativeExpression ) { if (this.hasWhilePhraseParent(node)) { return false; From 6dcf7c30e0f92b86f2e32d0d0fa1fd7f930b057f Mon Sep 17 00:00:00 2001 From: PauliusKu Date: Wed, 5 Mar 2025 19:00:21 +0200 Subject: [PATCH 2/3] test 2 --- src/formatters/expression/ExpressionFormatter.ts | 4 +++- src/model/SyntaxNodeType.ts | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/formatters/expression/ExpressionFormatter.ts b/src/formatters/expression/ExpressionFormatter.ts index e56880b3..da3195e0 100644 --- a/src/formatters/expression/ExpressionFormatter.ts +++ b/src/formatters/expression/ExpressionFormatter.ts @@ -32,7 +32,9 @@ export class ExpressionFormatter extends AFormatter implements IFormatter { node.type === SyntaxNodeType.ComparisonExpression || node.type === SyntaxNodeType.ParenthesizedExpression || node.type === SyntaxNodeType.AdditiveExpression || - node.type === SyntaxNodeType.MultiplicativeExpression + node.type === SyntaxNodeType.MultiplicativeExpression || + (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 index 40736684..221632fd 100644 --- 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", From f7b1aa47e2c5dd70b543647444ec57f05c8ee3c2 Mon Sep 17 00:00:00 2001 From: PauliusKu Date: Wed, 5 Mar 2025 19:08:22 +0200 Subject: [PATCH 3/3] added bug example to tests --- .../expression/4assign-unary-numerical/input.p | 4 ++++ .../expression/4assign-unary-numerical/target.p | 4 ++++ 2 files changed, 8 insertions(+) create mode 100644 resources/functionalTests/expression/4assign-unary-numerical/input.p create mode 100644 resources/functionalTests/expression/4assign-unary-numerical/target.p diff --git a/resources/functionalTests/expression/4assign-unary-numerical/input.p b/resources/functionalTests/expression/4assign-unary-numerical/input.p new file mode 100644 index 00000000..0e0a8212 --- /dev/null +++ b/resources/functionalTests/expression/4assign-unary-numerical/input.p @@ -0,0 +1,4 @@ +/* formatterSettingsOverride */ +/* { "AblFormatter.expressionFormatting": true}*/ + +a = -c. \ No newline at end of file diff --git a/resources/functionalTests/expression/4assign-unary-numerical/target.p b/resources/functionalTests/expression/4assign-unary-numerical/target.p new file mode 100644 index 00000000..f661ade5 --- /dev/null +++ b/resources/functionalTests/expression/4assign-unary-numerical/target.p @@ -0,0 +1,4 @@ +/* formatterSettingsOverride */ +/* { "AblFormatter.expressionFormatting": true}*/ + +a = -c. \ No newline at end of file