306 Default values

package.json

@@ -52,7 +52,7 @@
             "New",
             "Same"
           ],
-          "description": "Should assigns be located on same or new line after ASSIGN keyword?"
+          "description": "Should assigns be located on a new line or the same line as the ASSIGN keyword?"
         },
         "AblFormatter.assignFormattingAlignRightExpression": {
           "order": 102,
@@ -73,7 +73,7 @@
             "New aligned",
             "Same"
           ],
-          "description": "Should end dot be located on same or new line after ASSIGN statement?"
+          "description": "Should end dot be located on a new line or the same line as the ASSIGN keyword?"
         },
         "AblFormatter.findFormatting": {
           "order": 300,
@@ -101,12 +101,12 @@
             "New",
             "Same"
           ],
-          "description": "Should THEN clause be on a new line or the same line as the WHEN keyword?"
+          "description": "Should THEN clause be on a new line or the same line as the CASE keyword?"
         },
         "AblFormatter.caseFormattingDoLocation": {
           "order": 502,
           "type": "string",
-          "default": "New",
+          "default": "Same",
           "enum": [
             "New",
             "Same"
@@ -213,7 +213,7 @@
             "New",
             "Same"
           ],
-          "description": "Add a new line before the ELSE?"
+          "description": "Should ELSE clause be on a new line or the same line as the IF FUNCTION keyword?"
         },
         "AblFormatter.enumFormatting": {
           "order": 1300,
@@ -267,7 +267,7 @@
         "AblFormatter.arrayAccessFormattingAddSpaceAfterComma": {
           "order": 1701,
           "type": "string",
-          "default": "No",
+          "default": "Yes",
           "enum": [
             "Yes",
             "No"
@@ -283,7 +283,7 @@
         "AblFormatter.expressionFormattingLogicalLocation": {
           "order": 1801,
           "type": "string",
-          "default": "Same",
+          "default": "New",
           "enum": [
             "New",
             "Same"

resources/functionalTests/arrayAccess/4-array-literal/target.p

@@ -1,4 +1,4 @@
 /* formatterSettingsOverride */
 /*  { "AblFormatter.arrayAccessFormatting": true}*/
 
-VAR INT[4] myArray = [10,11,12,13].
+VAR INT[4] myArray = [10, 11, 12, 13].

resources/functionalTests/arrayAccess/4-array-literal2/target.p

@@ -1,6 +1,6 @@
 /* formatterSettingsOverride */
 /*  { "AblFormatter.arrayAccessFormatting": true}*/
 
-DEFINE VARIABLE myArray AS INTEGER EXTENT 5 NO-UNDO INITIAL [10,11,12,13,14].
+DEFINE VARIABLE myArray AS INTEGER EXTENT 5 NO-UNDO INITIAL [10, 11, 12, 13, 14].
 
 DISPLAY myArray[1 FOR 5].

resources/functionalTests/arrayAccess/4-array-literal3-no-space/input.p

@@ -0,0 +1,5 @@
+/* formatterSettingsOverride */
+/*  { "AblFormatter.arrayAccessFormatting": true,
+      "AblFormatter.arrayAccessFormattingAddSpaceAfterComma": "No"}*/
+
+VAR INT[] monthlySalesQuotas = [ 100500,  125000,  125000, 175000,  150000,    155000, 145000].

resources/functionalTests/arrayAccess/4-array-literal3-add-space/input.p → resources/functionalTests/arrayAccess/4-array-literal3-no-space/target.p

@@ -1,5 +1,5 @@
 /* formatterSettingsOverride */
 /*  { "AblFormatter.arrayAccessFormatting": true,
-      "AblFormatter.arrayAccessFormattingAddSpaceAfterComma": "Yes"}*/
+      "AblFormatter.arrayAccessFormattingAddSpaceAfterComma": "No"}*/
 
 VAR INT[] monthlySalesQuotas = [100500,125000,125000,175000,150000,155000,145000].

resources/functionalTests/case/12nested-blockFormattingFalse/input.p → resources/functionalTests/case/12nested/input.p

@@ -1,29 +1,29 @@
-/* formatterSettingsOverride */
-/*  { "abl.completion.upperCase": true, 
-"AblFormatter.caseFormatting": true,
-"AblFormatter.blockFormatting": false}*/
-
-PROCEDURE testCase:
-    DEFINE VARIABLE i AS INTEGER NO-UNDO.
-    DEFINE VARIABLE j AS INTEGER NO-UNDO.
-    
-    i = 1.
-    j = 2.
-
-    CASE i:
-                WHEN 1 THEN DO:
-                    CASE j:
-            WHEN 1 THEN
-                MESSAGE "i=1, j=1".
-                        WHEN 2 THEN
-                    MESSAGE "i=1, j=2".
-                OTHERWISE
-                    MESSAGE "i=1, j=Other".
-            END CASE.
-            END.
-        WHEN 2 THEN
-                    MESSAGE "i=2".
-                OTHERWISE
-            MESSAGE "i=Other".
-    END CASE.
+/* formatterSettingsOverride */
+/*  { "abl.completion.upperCase": true, 
+"AblFormatter.caseFormatting": true,
+"AblFormatter.blockFormatting": true}*/
+
+PROCEDURE testCase:
+    DEFINE VARIABLE i AS INTEGER NO-UNDO.
+    DEFINE VARIABLE j AS INTEGER NO-UNDO.
+
+    i = 1.
+    j = 2.
+
+    CASE i:
+                WHEN 1 THEN DO:
+                    CASE j:
+            WHEN 1 THEN
+                MESSAGE "i=1, j=1".
+                        WHEN 2 THEN
+                    MESSAGE "i=1, j=2".
+                OTHERWISE
+                    MESSAGE "i=1, j=Other".
+            END CASE.
+            END.
+        WHEN 2 THEN
+                    MESSAGE "i=2".
+                OTHERWISE
+            MESSAGE "i=Other".
+    END CASE.
 END PROCEDURE.

resources/functionalTests/case/12nested-blockFormattingFalse/target.p → resources/functionalTests/case/12nested/target.p

@@ -1,30 +1,29 @@
-/* formatterSettingsOverride */
-/*  { "abl.completion.upperCase": true, 
-"AblFormatter.caseFormatting": true,
-"AblFormatter.blockFormatting": false}*/
-
-PROCEDURE testCase:
-    DEFINE VARIABLE i AS INTEGER NO-UNDO.
-    DEFINE VARIABLE j AS INTEGER NO-UNDO.
-
-    i = 1.
-    j = 2.
-
-    CASE i:
-                WHEN 1 THEN
-                DO:
-                    CASE j:
-            WHEN 1 THEN
-                MESSAGE "i=1, j=1".
-                        WHEN 2 THEN
-                            MESSAGE "i=1, j=2".
-                OTHERWISE
-                    MESSAGE "i=1, j=Other".
-            END CASE.
-            END.
-        WHEN 2 THEN
-            MESSAGE "i=2".
-                OTHERWISE
-                    MESSAGE "i=Other".
-    END CASE.
+/* formatterSettingsOverride */
+/*  { "abl.completion.upperCase": true, 
+"AblFormatter.caseFormatting": true,
+"AblFormatter.blockFormatting": true}*/
+
+PROCEDURE testCase:
+    DEFINE VARIABLE i AS INTEGER NO-UNDO.
+    DEFINE VARIABLE j AS INTEGER NO-UNDO.
+
+    i = 1.
+    j = 2.
+
+    CASE i:
+        WHEN 1 THEN DO:
+            CASE j:
+                WHEN 1 THEN
+                    MESSAGE "i=1, j=1".
+                WHEN 2 THEN
+                    MESSAGE "i=1, j=2".
+                OTHERWISE
+                    MESSAGE "i=1, j=Other".
+            END CASE.
+        END.
+        WHEN 2 THEN
+            MESSAGE "i=2".
+        OTHERWISE
+            MESSAGE "i=Other".
+    END CASE.
 END PROCEDURE.

resources/functionalTests/case/4nested-blockFormattingTrue/target.p

@@ -11,8 +11,7 @@ PROCEDURE testCase:
     j = 2.
 
     CASE i:
-        WHEN 1 THEN
-        DO:
+        WHEN 1 THEN DO:
             CASE j:
                 WHEN 1 THEN
                     MESSAGE "i=1, j=1".

resources/functionalTests/defineVariable/2no-undo4/target.p

@@ -6,7 +6,7 @@ DEFINE VARIABLE iAge       AS INTEGER   NO-UNDO LABEL "Age of Person" INITIAL 0.
 DEFINE VARIABLE dBirthDate AS DATE      NO-UNDO FORMAT "99/99/9999" INITIAL TODAY.
 DEFINE VARIABLE hBuffer    AS HANDLE    NO-UNDO INITIAL BUFFER Customer:HANDLE.
 DEFINE VARIABLE mData      AS MEMPTR    NO-UNDO INITIAL ?.
-DEFINE VARIABLE cJson      AS CHARACTER NO-UNDO EXTENT 5 INITIAL ["","","","",""].
+DEFINE VARIABLE cJson      AS CHARACTER NO-UNDO EXTENT 5 INITIAL ["", "", "", "", ""].
 DEFINE VARIABLE rAmount    AS DECIMAL   NO-UNDO FORMAT "->,>>>,>>9.99" INITIAL 0.
 DEFINE VARIABLE lFlag      AS LOGICAL   NO-UNDO INITIAL FALSE.
 DEFINE VARIABLE cXml       AS LONGCHAR  NO-UNDO INITIAL "".

resources/functionalTests/defineVariable/4define-protected/target.p

@@ -6,5 +6,5 @@ define protected variable mBuffer                     as handle no-undo.
 define protected variable ValidRecordsPerBlockNumbers as char   no-undo init "1,2,4,8,16,32,64,128,256".
 define protected variable ValidRecordsPerBlockString  as char   no-undo init "1, 2, 4, 8, 16, 32, 64, 128 and 256".
 /* area type names */
-define protected variable AreaTypeNames               as char   no-undo extent 7 init ["Undefined","Undefined","Recovery","Transaction log","Event log","Data","Rollforward recovery"].
+define protected variable AreaTypeNames               as char   no-undo extent 7 init ["Undefined", "Undefined", "Recovery", "Transaction log", "Event log", "Data", "Rollforward recovery"].
 

resources/functionalTests/find/2multipleConditions/target.p

@@ -2,4 +2,6 @@
 /*  { "AblFormatter.findFormatting": true}*/
 
 FIND Customer WHERE
-     Customer.CustNum = 5 AND Customer.CustNum = 6 OR Customer.CustNum = 8 no-lock no-error.
+     Customer.CustNum = 5 AND
+     Customer.CustNum = 6 OR
+     Customer.CustNum = 8 no-lock no-error.

resources/functionalTests/find/3multipleConditions-()/target.p

@@ -2,4 +2,6 @@
 /*  { "AblFormatter.findFormatting": true}*/
 
 FIND Customer WHERE
-     (Customer.CustNum > 50 AND Customer.CustNum < 100) OR Customer.CustNum > 200 NO-ERROR.
+     (Customer.CustNum > 50 AND
+     Customer.CustNum < 100) OR
+     Customer.CustNum > 200 NO-ERROR.

resources/functionalTests/find/4multipleConditions-()2/target.p

@@ -2,4 +2,7 @@
 /*  { "AblFormatter.findFormatting": true}*/
 
 FIND Order WHERE
-     (Order.OrderStatus = "Shipped" AND (Order.ShipDate > TODAY - 7)) OR (Order.OrderStatus = "Pending" AND (Order.OrderDate = TODAY)) no-lock.
+     (Order.OrderStatus = "Shipped" AND
+     (Order.ShipDate > TODAY - 7)) OR
+     (Order.OrderStatus = "Pending" AND
+     (Order.OrderDate = TODAY)) no-lock.

resources/functionalTests/find/6useIndex/target.p

@@ -2,4 +2,5 @@
 /*  { "AblFormatter.findFormatting": true}*/
 
 find Order where
-     Order.OrderStatus = "Shipped" and Order.ShipDate = today use-index OrderNum.
+     Order.OrderStatus = "Shipped" and
+     Order.ShipDate = today use-index OrderNum.

resources/functionalTests/find/7of-table/target.p

@@ -2,4 +2,5 @@
 /*  { "AblFormatter.findFormatting": true}*/
 
 FIND FIRST Order OF Customer WHERE
-           Customer.Country = "USA" AND Customer.Balance > 1000.
+           Customer.Country = "USA" AND
+           Customer.Balance > 1000.

resources/functionalTests/for/4each-where3/target.p

@@ -4,6 +4,8 @@
 }*/
 
 for each Customer where
-         Customer.var = 1 or Customer.var = 2 or Customer.var = 3:
+         Customer.var = 1 or
+         Customer.var = 2 or
+         Customer.var = 3:
     Customer.var += 1.
 end.

resources/functionalTests/for/7each-complex/target.p

@@ -2,7 +2,10 @@
 /*  { "AblFormatter.forFormatting": true}*/
 
 FOR EACH Customer NO-LOCK WHERE
-         (Customer.Balance > 10000 AND Customer.Region = "North") OR (Customer.Region = "South" AND Customer.Status = "Active")
+         (Customer.Balance > 10000 AND
+         Customer.Region = "North") OR
+         (Customer.Region = "South" AND
+         Customer.Status = "Active")
          BY Customer.LastName
          BY Customer.FirstName
          BREAK BY Customer.City

resources/functionalTests/if/18-then-same-do-new/target.p

@@ -5,7 +5,8 @@
 "AblFormatter.ifFormattingStatementLocation": "New",
 "AblFormatter.ifFormattingDoLocation": "New"}*/
 
-if something <> ? and something <> 0 then
+if something <> ? and
+   something <> 0 then
     oObject:method(something).
 else if a = 3 then
 do:    

resources/functionalTests/if/19-then-same-do-new/target.p

@@ -5,9 +5,11 @@
 "AblFormatter.ifFormattingStatementLocation": "New",
 "AblFormatter.ifFormattingDoLocation": "New"}*/
 
-if something <> ? and something <> 0 then
+if something <> ? and
+   something <> 0 then
     oObject:method(something).
-else if something <> ? or something <> ? then
+else if something <> ? or
+        something <> ? then
 do:    
     oObject:method(something).      
 end.

resources/functionalTests/if/20-then-same-statement-new-do-new/target.p

@@ -5,7 +5,8 @@
 "AblFormatter.ifFormattingStatementLocation": "New",
 "AblFormatter.ifFormattingDoLocation": "New"}*/
 
-if something <> ? and something <> 0 then
+if something <> ? and
+   something <> 0 then
     oObject:method(something).
 else if a = 3 then
 do:       

resources/functionalTests/ifFunction/11else-new-line-in-for/target.p

@@ -5,14 +5,14 @@
 
 FOR EACH Customer NO-LOCK
          BY (IF Customer.Balance > 10000 THEN 1 
-            ELSE (IF Customer.Balance > 5000 THEN 1.5
-            ELSE (IF Customer.Balance > 1000 THEN 2
-            ELSE (IF Customer.Balance > 500 THEN 2.5
-            ELSE 3))))
+             ELSE (IF Customer.Balance > 5000 THEN 1.5
+             ELSE (IF Customer.Balance > 1000 THEN 2
+             ELSE (IF Customer.Balance > 500 THEN 2.5
+             ELSE 3))))
          BY (IF Customer.SalesRep = "John" THEN 1 
-            ELSE (IF Customer.SalesRep = "Jane" THEN 2
-            ELSE (IF Customer.SalesRep = "Doe" THEN 3
-            ELSE 4))):
+             ELSE (IF Customer.SalesRep = "Jane" THEN 2
+             ELSE (IF Customer.SalesRep = "Doe" THEN 3
+             ELSE 4))):
     DISPLAY Customer.SalesRep Customer.Balance Customer.Name.
 END.
 

resources/functionalTests/ifFunction/3parentheses-expression-with-and/target.p

@@ -2,4 +2,5 @@
 /*  { "AblFormatter.ifFunctionFormatting": true,
       "AblFormatter.ifFunctionFormattingAddParentheses": "Yes"}*/
 
-a = (if Customer.Balance > 10000 and Customer.Country = "USA" then 1 else 2).
+a = (if Customer.Balance > 10000 and
+        Customer.Country = "USA" then 1 else 2).

resources/functionalTests/ifFunction/5parentheses-else-new-line/target.p

@@ -4,4 +4,4 @@
       "AblFormatter.ifFunctionFormattingElseLocation": "New"}*/
 
 a = (if Customer.Balance > 10000 then 1 
-    else 2).
+     else 2).