Merge pull request #204 from BalticAmadeus/202-the-colon-of-some-bloc…

…ks-jumps-to-the-next-line-if-there-are-spaces-before-it

202 the colon of some blocks jumps to the next line if there are spaces before it

resources/functionalTests/block/10finally-block-colon/input.p

@@ -0,0 +1,6 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.blockFormatting": true}*/
+
+finally :
+ message "Inside FINALLY block." view-as alert-box.
+end finally.

resources/functionalTests/block/10finally-block-colon/target.p

@@ -0,0 +1,6 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.blockFormatting": true}*/
+
+finally :
+    message "Inside FINALLY block." view-as alert-box.
+end finally.

resources/functionalTests/block/54catch/input.p

@@ -0,0 +1,7 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.blockFormatting": true}*/
+
+catch oFunkyError as Progress.Lang.AppError : oGroovyResponse:errorStatus = true.
+      oGroovyResponse:addMessage(oFunkyError:GetMessage(1)).
+                  return oGroovyResponse.
+end catch.

resources/functionalTests/block/54catch/target.p

@@ -0,0 +1,8 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.blockFormatting": true}*/
+
+catch oFunkyError as Progress.Lang.AppError:
+    oGroovyResponse:errorStatus = true.
+    oGroovyResponse:addMessage(oFunkyError:GetMessage(1)).
+    return oGroovyResponse.
+end catch.

src/v2/formatters/block/BlockFormatter.ts

@@ -102,14 +102,21 @@ export class BlockFormater extends AFormatter implements IFormatter {
         if (indexOfColon !== -1) {
             // indexOfColon += parentIndentation;
             indexOfColon -= parent.startPosition.column;
+            for (let i = indexOfColon + 1; i >= indexOfColon - 1; i--) {
+                if (firstLine[i] === ":") {
+                    indexOfColon = i;
+                    break;
+                }
+            }
             const partAfterColon = firstLine
                 .slice(indexOfColon + 1)
                 .trimStart();
+            const statementWithColon =
+                firstLine.slice(0, indexOfColon).trimEnd() + ":";
             // If the part after the colon is not only whitespace, put it on the next line
-            if (partAfterColon.trim().length !== 0) {
-                const firstPart = firstLine.slice(0, indexOfColon + 1);
+            if (partAfterColon.trim().length !== 0 && partAfterColon !== ":") {
                 codeLines.shift(); // pop from the start of the list
-                codeLines.unshift(firstPart, partAfterColon);
+                codeLines.unshift(statementWithColon, partAfterColon);
                 const firstBlockStatementRow = blockStatementsStartRows[0];
                 blockStatementsStartRows.shift();
                 blockStatementsStartRows.unshift(