Merge pull request #243 from BalticAmadeus/236-variable-definition-fo…

…rmatter 236 variable definition formatter
BalticAmadeus · Oct 18, 2024 · 10cc25b · 10cc25b
2 parents f688439 + 0fb6210
commit 10cc25b
Show file tree

Hide file tree

Showing 100 changed files with 1,199 additions and 142 deletions.
diff --git a/package.json b/package.json
@@ -236,6 +236,18 @@
             "Same"
           ]
         },
+        "AblFormatter.variableDefinitionFormatting": {
+          "order": 1400,
+          "type": "boolean",
+          "default": "true",
+          "description": "Enable DEFINE VARIABLE formatting"
+        },
+        "AblFormatter.procedureParameterFormatting": {
+          "order": 1500,
+          "type": "boolean",
+          "default": "true",
+          "description": "Enable PROCEDURE PARAMETER formatting"
+        },
         "AblFormatter.showTreeInfoOnHover": {
           "order": 10100,
           "type": "boolean",

diff --git a/resources/functionalTests/assign/10sameLine-noRightAlign-newAlignedEndDot/input.p b/resources/functionalTests/assign/10sameLine-noRightAlign-newAlignedEndDot/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN 
 
 

diff --git a/resources/functionalTests/assign/10sameLine-noRightAlign-newAlignedEndDot/target.p b/resources/functionalTests/assign/10sameLine-noRightAlign-newAlignedEndDot/target.p
@@ -5,8 +5,5 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN number11 = 2 number2 = 3333
     .
diff --git a/resources/functionalTests/assign/11sameLine-noRightAlign-newEndDot/input.p b/resources/functionalTests/assign/11sameLine-noRightAlign-newEndDot/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "New"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN 
 
 number11 = 2

diff --git a/resources/functionalTests/assign/11sameLine-noRightAlign-newEndDot/target.p b/resources/functionalTests/assign/11sameLine-noRightAlign-newEndDot/target.p
@@ -5,8 +5,5 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "New"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN number11 = 2 number2 = 3333
 .
diff --git a/resources/functionalTests/assign/12sameLine-noRightAlign-sameEndDot/input.p b/resources/functionalTests/assign/12sameLine-noRightAlign-sameEndDot/input.p
@@ -5,8 +5,5 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "Same"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN   number11 = 2
        number2 =   3333    .
diff --git a/resources/functionalTests/assign/12sameLine-noRightAlign-sameEndDot/target.p b/resources/functionalTests/assign/12sameLine-noRightAlign-sameEndDot/target.p
@@ -5,7 +5,4 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "Same"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN number11 = 2 number2 = 3333.
diff --git a/resources/functionalTests/assign/13sameLine-RightAlign-newAlignedEndDot/input.p b/resources/functionalTests/assign/13sameLine-RightAlign-newAlignedEndDot/input.p
@@ -5,7 +5,4 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN number11 =     2                            number2 =   33333        .
diff --git a/resources/functionalTests/assign/13sameLine-RightAlign-newAlignedEndDot/target.p b/resources/functionalTests/assign/13sameLine-RightAlign-newAlignedEndDot/target.p
@@ -5,8 +5,5 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN number11 = 2 number2  = 33333
     .
diff --git a/resources/functionalTests/assign/14sameLine-RightAlign-sameEndDot/input.p b/resources/functionalTests/assign/14sameLine-RightAlign-sameEndDot/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "Same"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN 
 
 number11 =     2

diff --git a/resources/functionalTests/assign/14sameLine-RightAlign-sameEndDot/target.p b/resources/functionalTests/assign/14sameLine-RightAlign-sameEndDot/target.p
@@ -5,7 +5,4 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "Same"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN number11 = 2 number2  = 33333.
diff --git a/resources/functionalTests/assign/15assign-noError/input.p b/resources/functionalTests/assign/15assign-noError/input.p
@@ -5,10 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
-
 ASSIGN
       number2 = 2
             number3 = 2

diff --git a/resources/functionalTests/assign/15assign-noError/target.p b/resources/functionalTests/assign/15assign-noError/target.p
@@ -5,10 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
-
 ASSIGN
     number2  = 2
     number3  = 2

diff --git a/resources/functionalTests/assign/16assign-When/input.p b/resources/functionalTests/assign/16assign-When/input.p
@@ -5,10 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
-
 ASSIGN
                   number2  = 2
 when number3 = 2

diff --git a/resources/functionalTests/assign/16assign-When/target.p b/resources/functionalTests/assign/16assign-When/target.p
@@ -5,10 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
-
 ASSIGN
     number2  = 2
     when number3 = 2

diff --git a/resources/functionalTests/assign/17assign-When-noError/input.p b/resources/functionalTests/assign/17assign-When-noError/input.p
@@ -5,10 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
-
 ASSIGN
                   number2  = 2
 when 

diff --git a/resources/functionalTests/assign/17assign-When-noError/target.p b/resources/functionalTests/assign/17assign-When-noError/target.p
@@ -5,10 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
-
 ASSIGN
     number2  = 2
     when number3 = 2

diff --git a/resources/functionalTests/assign/17assign-When-noError2 copy/input.p b/resources/functionalTests/assign/17assign-When-noError2 copy/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
 
 ASSIGN
                   number2 = 2

diff --git a/resources/functionalTests/assign/17assign-When-noError2 copy/target.p b/resources/functionalTests/assign/17assign-When-noError2 copy/target.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
 
 ASSIGN number2  = 2 number11 = 2 when number3 = 2 NO-ERROR
     .
diff --git a/resources/functionalTests/assign/17assign-When-noError2/input.p b/resources/functionalTests/assign/17assign-When-noError2/input.p
@@ -5,10 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
-
 ASSIGN
                   number2 = 2
       number11 = 2  when 

diff --git a/resources/functionalTests/assign/17assign-When-noError2/target.p b/resources/functionalTests/assign/17assign-When-noError2/target.p
@@ -5,10 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2  AS INTEGER NO-UNDO INITIAL 3.
-DEFINE VARIABLE number3  AS INTEGER NO-UNDO INITIAL 3.
-
 ASSIGN
     number2  = 2
     number11 = 2

diff --git a/resources/functionalTests/assign/1formattingFalse/input.p b/resources/functionalTests/assign/1formattingFalse/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number11 = 2
        number2 = 3

diff --git a/resources/functionalTests/assign/1formattingFalse/target.p b/resources/functionalTests/assign/1formattingFalse/target.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number11 = 2
        number2 = 3

diff --git a/resources/functionalTests/assign/2inFunction/input.p b/resources/functionalTests/assign/2inFunction/input.p
@@ -6,9 +6,6 @@
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
 FUNCTION sumNumbers RETURNS INTEGER (number3 AS INTEGER, number4 AS INTEGER):
-    DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-    DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number11 = number3
        number2 = number4

diff --git a/resources/functionalTests/assign/2inFunction/target.p b/resources/functionalTests/assign/2inFunction/target.p
@@ -6,9 +6,6 @@
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
 FUNCTION sumNumbers RETURNS INTEGER (number3 AS INTEGER, number4 AS INTEGER):
-    DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-    DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
     ASSIGN
         number11 = number3
         number2  = number4

diff --git a/resources/functionalTests/assign/3inProcedure/input.p b/resources/functionalTests/assign/3inProcedure/input.p
@@ -6,9 +6,6 @@
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
 PROCEDURE sumNumbers:
-    DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-    DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
                     number11 = number3
         number2  = number4

diff --git a/resources/functionalTests/assign/3inProcedure/target.p b/resources/functionalTests/assign/3inProcedure/target.p
@@ -6,9 +6,6 @@
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
 PROCEDURE sumNumbers:
-    DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-    DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
     ASSIGN
         number11 = number3
         number2  = number4

diff --git a/resources/functionalTests/assign/4newLine-noRightAlign-newAlignedEndDot/input.p b/resources/functionalTests/assign/4newLine-noRightAlign-newAlignedEndDot/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN    number11 =   2
     number2   = 33333
            .
diff --git a/resources/functionalTests/assign/4newLine-noRightAlign-newAlignedEndDot/target.p b/resources/functionalTests/assign/4newLine-noRightAlign-newAlignedEndDot/target.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number11 = 2
     number2 = 33333

diff --git a/resources/functionalTests/assign/5newLine-noRightAlign-newEndDot/input.p b/resources/functionalTests/assign/5newLine-noRightAlign-newEndDot/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "New"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
                number11 = 2
     number2   = 33333

diff --git a/resources/functionalTests/assign/5newLine-noRightAlign-newEndDot/target.p b/resources/functionalTests/assign/5newLine-noRightAlign-newEndDot/target.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "New"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number11 = 2
     number2 = 33333

diff --git a/resources/functionalTests/assign/6newLine-noRightAlign-sameEndDot/input.p b/resources/functionalTests/assign/6newLine-noRightAlign-sameEndDot/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "Same"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
                                      number11 = 2
     number2 =        3333

diff --git a/resources/functionalTests/assign/6newLine-noRightAlign-sameEndDot/target.p b/resources/functionalTests/assign/6newLine-noRightAlign-sameEndDot/target.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "No",
 "AblFormatter.assignFormattingEndDotLocation": "Same"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number11 = 2
     number2 = 3333.
diff --git a/resources/functionalTests/assign/7newLine-RightAlign-newAlignedEndDot/input.p b/resources/functionalTests/assign/7newLine-RightAlign-newAlignedEndDot/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
 number11  =    2
       number2 = 3333 .
diff --git a/resources/functionalTests/assign/7newLine-RightAlign-newAlignedEndDot/target.p b/resources/functionalTests/assign/7newLine-RightAlign-newAlignedEndDot/target.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New aligned"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number11 = 2
     number2  = 3333

diff --git a/resources/functionalTests/assign/8newLine-RightAlign-newEndDot/input.p b/resources/functionalTests/assign/8newLine-RightAlign-newEndDot/input.p
@@ -5,8 +5,5 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN      number11 =    2
     number2         = 3333    .
diff --git a/resources/functionalTests/assign/8newLine-RightAlign-newEndDot/target.p b/resources/functionalTests/assign/8newLine-RightAlign-newEndDot/target.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "New"}*/
 
-DEFINE VARIABLE number11 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number11 = 2
     number2  = 3333

diff --git a/resources/functionalTests/assign/9newLine-RightAlign-sameEndDot/input.p b/resources/functionalTests/assign/9newLine-RightAlign-sameEndDot/input.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "Same"}*/
 
-DEFINE VARIABLE number1 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number1 =           2
       number2 =    3333    .
diff --git a/resources/functionalTests/assign/9newLine-RightAlign-sameEndDot/target.p b/resources/functionalTests/assign/9newLine-RightAlign-sameEndDot/target.p
@@ -5,9 +5,6 @@
 "AblFormatter.assignFormattingAlignRightExpression": "Yes",
 "AblFormatter.assignFormattingEndDotLocation": "Same"}*/
 
-DEFINE VARIABLE number1 AS INTEGER NO-UNDO.
-DEFINE VARIABLE number2 AS INTEGER NO-UNDO.
-
 ASSIGN
     number1 = 2
     number2 = 3333.