Merge pull request #295 from BalticAmadeus/287-remove-define-formatter

Remove define formatter
BalticAmadeus · Jan 29, 2025 · 478d184 · 478d184
2 parents df8db88 + 70e4325
commit 478d184
Show file tree

Hide file tree

Showing 65 changed files with 60 additions and 488 deletions.
diff --git a/package.json b/package.json
@@ -75,12 +75,6 @@
           ],
           "description": "Should end dot be located on same or new line after ASSIGN statement?"
         },
-        "AblFormatter.defineFormatting": {
-          "order": 200,
-          "type": "boolean",
-          "default": "true",
-          "description": "Enable DEFINE formatting"
-        },
         "AblFormatter.findFormatting": {
           "order": 300,
           "type": "boolean",

diff --git a/resources/functionalTests/arrayAccess/4-array-literal2/target.p b/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].
diff --git a/resources/functionalTests/block/57class-block-multiple-line/target.p b/resources/functionalTests/block/57class-block-multiple-line/target.p
@@ -7,7 +7,7 @@ CLASS Validation.Something
     {&SERIALIZABLE}:
 
     METHOD PUBLIC OVERRIDE IType GetType():
-        define VARIABLE oType AS IType NO-UNDO.
+        DEFINE VARIABLE oType AS IType NO-UNDO.
         RETURN oType .
     END METHOD.
 

diff --git a/resources/functionalTests/define/10query/input.p b/resources/functionalTests/define/10query/input.p
diff --git a/resources/functionalTests/define/10query/target.p b/resources/functionalTests/define/10query/target.p
diff --git a/resources/functionalTests/define/11returnParameter/input.p b/resources/functionalTests/define/11returnParameter/input.p
diff --git a/resources/functionalTests/define/11returnParameter/target.p b/resources/functionalTests/define/11returnParameter/target.p
diff --git a/resources/functionalTests/define/12stream/input.p b/resources/functionalTests/define/12stream/input.p
diff --git a/resources/functionalTests/define/12stream/target.p b/resources/functionalTests/define/12stream/target.p
diff --git a/resources/functionalTests/define/13tempTableAndDataset/input.p b/resources/functionalTests/define/13tempTableAndDataset/input.p
diff --git a/resources/functionalTests/define/13tempTableAndDataset/target.p b/resources/functionalTests/define/13tempTableAndDataset/target.p
diff --git a/resources/functionalTests/define/14upperCaseFormating/input.p b/resources/functionalTests/define/14upperCaseFormating/input.p
diff --git a/resources/functionalTests/define/14upperCaseFormating/target.p b/resources/functionalTests/define/14upperCaseFormating/target.p
diff --git a/resources/functionalTests/define/15workFile/input.p b/resources/functionalTests/define/15workFile/input.p
diff --git a/resources/functionalTests/define/15workFile/target.p b/resources/functionalTests/define/15workFile/target.p
diff --git a/resources/functionalTests/define/16inClass/input.p b/resources/functionalTests/define/16inClass/input.p
diff --git a/resources/functionalTests/define/16inClass/target.p b/resources/functionalTests/define/16inClass/target.p
diff --git a/resources/functionalTests/define/17inFunction/input.p b/resources/functionalTests/define/17inFunction/input.p
diff --git a/resources/functionalTests/define/17inFunction/target.p b/resources/functionalTests/define/17inFunction/target.p
diff --git a/resources/functionalTests/define/1buffer/input.p b/resources/functionalTests/define/1buffer/input.p
diff --git a/resources/functionalTests/define/1buffer/target.p b/resources/functionalTests/define/1buffer/target.p
diff --git a/resources/functionalTests/define/2button/input.p b/resources/functionalTests/define/2button/input.p
diff --git a/resources/functionalTests/define/2button/target.p b/resources/functionalTests/define/2button/target.p
diff --git a/resources/functionalTests/define/3formattingFalse/input.p b/resources/functionalTests/define/3formattingFalse/input.p
diff --git a/resources/functionalTests/define/3formattingFalse/target.p b/resources/functionalTests/define/3formattingFalse/target.p
diff --git a/resources/functionalTests/define/4inLoop/input.p b/resources/functionalTests/define/4inLoop/input.p
diff --git a/resources/functionalTests/define/4inLoop/target.p b/resources/functionalTests/define/4inLoop/target.p
diff --git a/resources/functionalTests/define/5inProcedure/input.p b/resources/functionalTests/define/5inProcedure/input.p
diff --git a/resources/functionalTests/define/5inProcedure/target.p b/resources/functionalTests/define/5inProcedure/target.p
diff --git a/resources/functionalTests/define/6inputOutputParameter/input.p b/resources/functionalTests/define/6inputOutputParameter/input.p
diff --git a/resources/functionalTests/define/6inputOutputParameter/target.p b/resources/functionalTests/define/6inputOutputParameter/target.p
diff --git a/resources/functionalTests/define/7inputParameter/input.p b/resources/functionalTests/define/7inputParameter/input.p
diff --git a/resources/functionalTests/define/7inputParameter/target.p b/resources/functionalTests/define/7inputParameter/target.p
diff --git a/resources/functionalTests/define/8mixedCaseInputs/input.p b/resources/functionalTests/define/8mixedCaseInputs/input.p
diff --git a/resources/functionalTests/define/8mixedCaseInputs/target.p b/resources/functionalTests/define/8mixedCaseInputs/target.p
diff --git a/resources/functionalTests/define/9outputParameter/input.p b/resources/functionalTests/define/9outputParameter/input.p
diff --git a/resources/functionalTests/define/9outputParameter/target.p b/resources/functionalTests/define/9outputParameter/target.p
diff --git a/resources/functionalTests/define/define-inClass/input.p b/resources/functionalTests/define/define-inClass/input.p
diff --git a/resources/functionalTests/define/define-inClass/target.p b/resources/functionalTests/define/define-inClass/target.p
diff --git a/resources/functionalTests/define/define-inFunction/input.p b/resources/functionalTests/define/define-inFunction/input.p