Merge pull request #133 from BalticAmadeus/41-for-formatting

41 FOR Formatting

package.json

@@ -181,11 +181,11 @@
           "default": "true",
           "description": "Enable USING formatting"
         },
-        "AblFormatter.emptyBlockFormatting": {
+        "AblFormatter.bodyFormatting": {
           "order": 1000,
           "type": "boolean",
           "default": "true",
-          "description": "Enable EMPTY BLOCK formatting"
+          "description": "Enable BODY formatting"
         },
         "AblFormatter.propertyFormatting": {
           "order": 1100,
@@ -202,7 +202,7 @@
         "AblFormatter.ifFunctionFormattingAddParentheses": {
           "order": 1201,
           "type": "string",
-          "default": "Yes",
+          "default": "No",
           "enum": [
             "Yes",
             "No"

resources/functionalTests/block/12for-block-end2/input.p → resources/functionalTests/block/12for-block-end2-disabled/input.p

@@ -1,5 +1,6 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.blockFormatting": false}*/
+/*  { "AblFormatter.bodyFormatting": false,
+"AblFormatter.forFormatting": false}*/
 
 for each Customer no-lock:
 Customer.var += 1.

resources/functionalTests/block/12for-block-end2/target.p → resources/functionalTests/block/12for-block-end2-disabled/target.p

@@ -1,5 +1,6 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.blockFormatting": false}*/
+/*  { "AblFormatter.bodyFormatting": false,
+"AblFormatter.forFormatting": false}*/
 
 for each Customer no-lock:
 Customer.var += 1.

resources/functionalTests/block/15for-block-inner2/input.p → resources/functionalTests/block/15for-block-inner2-disabled/input.p

@@ -1,5 +1,6 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.blockFormatting": false}*/
+/*  { "AblFormatter.bodyFormatting": false,
+"AblFormatter.forFormatting": false}*/
 
 for each Customer no-lock:
 Customer.var += 1.

resources/functionalTests/block/15for-block-inner2/target.p → resources/functionalTests/block/15for-block-inner2-disabled/target.p

@@ -1,5 +1,6 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.blockFormatting": false}*/
+/*  { "AblFormatter.bodyFormatting": false,
+"AblFormatter.forFormatting": false}*/
 
 for each Customer no-lock:
 Customer.var += 1.

resources/functionalTests/block/17for-block-inner4/input.p → resources/functionalTests/block/17for-block-inner4-disabled/input.p

@@ -1,5 +1,6 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.blockFormatting": false}*/
+/*  { "AblFormatter.bodyFormatting": false,
+"AblFormatter.forFormatting": false}*/
 
 for each Customer no-lock:
         Customer.var += 1.

resources/functionalTests/block/17for-block-inner4/target.p → resources/functionalTests/block/17for-block-inner4-disabled/target.p

@@ -1,5 +1,6 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.blockFormatting": false}*/
+/*  { "AblFormatter.bodyFormatting": false,
+"AblFormatter.forFormatting": false}*/
 
 for each Customer no-lock:
         Customer.var += 1.

resources/functionalTests/block/45repeat-block-end1/input.p

@@ -3,4 +3,4 @@
 
 repeat:
     define variable a as integer no-undo.
- end.
+   end.

resources/functionalTests/block/51do-for-block-inner1/input.p

@@ -1,5 +1,6 @@
 /* formattersettingsoverride */
-/*  { "AblFormatter.blockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true,
+"AblFormatter.forFormatting": false}*/
 
 do transaction:
     for each Customer no-lock:

resources/functionalTests/block/51do-for-block-inner1/target.p

@@ -1,5 +1,6 @@
 /* formattersettingsoverride */
-/*  { "AblFormatter.blockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true,
+"AblFormatter.forFormatting": false}*/
 
 do transaction:
     for each Customer no-lock:

resources/functionalTests/block/51for-for-block-inner1/input.p

@@ -1,5 +1,6 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.blockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true,
+"AblFormatter.forFormatting": false}*/
 
 for each A no-lock:
     for each B no-lock where A.id = B.id:

resources/functionalTests/block/51for-for-block-inner1/target.p

@@ -1,5 +1,6 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.blockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true,
+"AblFormatter.forFormatting": false}*/
 
 for each A no-lock:
     for each B no-lock where A.id = B.id:

resources/functionalTests/emptyBlock/10finally/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 finally:
  end finally.

resources/functionalTests/emptyBlock/10finally/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 finally:
 end finally.

resources/functionalTests/emptyBlock/11for/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.forFormatting": true}*/
 
 for each Customer by Customer.CreditLimit by Customer.Name:
         end.

resources/functionalTests/emptyBlock/11for/target.p

@@ -1,5 +1,7 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.forFormatting": true}*/
 
-for each Customer by Customer.CreditLimit by Customer.Name:
+for each Customer
+         by Customer.CreditLimit
+         by Customer.Name:
 end.

resources/functionalTests/emptyBlock/12function/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 function fun returns integer ():
 

resources/functionalTests/emptyBlock/12function/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 function fun returns integer ():
 

resources/functionalTests/emptyBlock/13method/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 class Class final:
     method public void mt():

resources/functionalTests/emptyBlock/13method/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 class Class final:
     method public void mt():

resources/functionalTests/emptyBlock/14on_do/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 on choose of b_next, b_prev do:
     end.

resources/functionalTests/emptyBlock/14on_do/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 on choose of b_next, b_prev do:
 end.

resources/functionalTests/emptyBlock/15on1/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 ON F1    GO.       /* F1 will now perform the GO function */
 ON F2    HELP.     /* F2 will now perform the HELP function   */

resources/functionalTests/emptyBlock/15on1/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 ON F1    GO.       /* F1 will now perform the GO function */
 ON F2    HELP.     /* F2 will now perform the HELP function   */

resources/functionalTests/emptyBlock/16procedure/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 procedure proc:
      end procedure.

resources/functionalTests/emptyBlock/16procedure/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 procedure proc:
 end procedure.

resources/functionalTests/emptyBlock/17repeat/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 repeat:
       end.

resources/functionalTests/emptyBlock/17repeat/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 repeat:
 end.

resources/functionalTests/emptyBlock/1catch/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 catch oErr as MyErrorType:
       end catch.

resources/functionalTests/emptyBlock/1catch/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 catch oErr as MyErrorType:
 end catch.

resources/functionalTests/emptyBlock/2class/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 class A inherits B:
      end class.

resources/functionalTests/emptyBlock/2class/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 class A inherits B:
 end class.

resources/functionalTests/emptyBlock/3constructor/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 class A inherits B:
     constructor private A():

resources/functionalTests/emptyBlock/3constructor/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 class A inherits B:
     constructor private A():

resources/functionalTests/emptyBlock/4destructor/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 class A inherits B:
     destructor public A():

resources/functionalTests/emptyBlock/4destructor/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 class A inherits B:
     destructor public A():

resources/functionalTests/emptyBlock/5do/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
  do:
    end.

resources/functionalTests/emptyBlock/5do/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
  do:
  end.

resources/functionalTests/emptyBlock/6do_on/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 do on error undo, throw:
 

resources/functionalTests/emptyBlock/6do_on/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 do on error undo, throw:
 

resources/functionalTests/emptyBlock/7do_to/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 do iCount = iTotal to 5:
   end.

resources/functionalTests/emptyBlock/7do_to/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 do iCount = iTotal to 5:
 end.

resources/functionalTests/emptyBlock/8do_transaction/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 do transaction:
   end.

resources/functionalTests/emptyBlock/8do_transaction/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 do transaction:
 end.

resources/functionalTests/emptyBlock/9do_while/input.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 do while i < 5:
   end.

resources/functionalTests/emptyBlock/9do_while/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
-/*  { "AblFormatter.emptyBlockFormatting": true}*/
+/*  { "AblFormatter.blockFormatting": true}*/
 
 do while i < 5:
 end.

resources/functionalTests/for/1each-false/input.p

@@ -0,0 +1,10 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.blockFormatting": false,
+"AblFormatter.forFormatting": false
+}*/
+
+for
+each 
+Customer:
+    Customer.var += 1.
+end.

resources/functionalTests/for/1each-false/target.p

@@ -0,0 +1,10 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.blockFormatting": false,
+"AblFormatter.forFormatting": false
+}*/
+
+for
+each 
+Customer:
+    Customer.var += 1.
+end.