Improve start block formatting

BalticAmadeus · Sep 13, 2024 · 9c97e8f · 9c97e8f
1 parent c317e9a
commit 9c97e8f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/resources/functionalTests/block/6do-start/input.p b/resources/functionalTests/block/6do-start/input.p
@@ -0,0 +1,5 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.blockFormatting": true}*/
+
+do while true: a = 3. 
+end.
diff --git a/resources/functionalTests/block/6do-start/target.p b/resources/functionalTests/block/6do-start/target.p
@@ -0,0 +1,6 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.blockFormatting": true}*/
+
+do while true:
+    a = 3. 
+end.
diff --git a/src/v2/formatters/block/BlockFormatter.ts b/src/v2/formatters/block/BlockFormatter.ts
@@ -67,7 +67,7 @@ export class BlockFormater extends AFormatter implements IFormatter {
         let indexOfColon = -1;
         let blockStatementsStartRows = node.children
             .filter((child) => {
-                if (child.type === ":") {
+                if (child.type === SyntaxNodeType.ColonKeyword) {
                     indexOfColon = child.startPosition.column;
                     return false;
                 }
@@ -129,13 +129,17 @@ export class BlockFormater extends AFormatter implements IFormatter {
 
             // adjust delta
             if (blockStatementsStartRows[n] === lineNumber) {
-                lineChangeDelta =
-                    parentIndentation +
-                    indentationStep -
-                    FormatterHelper.getActualTextIndentation(
-                        codeLine,
-                        fullText
-                    );
+                if (index === 0) {
+                    lineChangeDelta = 0;
+                } else {
+                    lineChangeDelta =
+                        parentIndentation +
+                        indentationStep -
+                        FormatterHelper.getActualTextIndentation(
+                            codeLine,
+                            fullText
+                        );
+                }
 
                 n++;
             }