From 554dcc6c483541719181d1dbeb2153fc68bd7ce7 Mon Sep 17 00:00:00 2001 From: darkeris345 Date: Fri, 17 Jan 2025 17:17:20 +0200 Subject: [PATCH 1/4] Remove define formatter --- package.json | 6 -- .../functionalTests/define/10query/input.p | 8 --- .../functionalTests/define/10query/target.p | 8 --- .../define/11returnParameter/input.p | 9 --- .../define/11returnParameter/target.p | 9 --- .../functionalTests/define/12stream/input.p | 6 -- .../functionalTests/define/12stream/target.p | 6 -- .../define/13tempTableAndDataset/input.p | 11 ---- .../define/13tempTableAndDataset/target.p | 11 ---- .../define/14upperCaseFormating/input.p | 6 -- .../define/14upperCaseFormating/target.p | 6 -- .../functionalTests/define/15workFile/input.p | 6 -- .../define/15workFile/target.p | 6 -- .../functionalTests/define/16inClass/input.p | 13 ---- .../functionalTests/define/16inClass/target.p | 13 ---- .../define/17inFunction/input.p | 9 --- .../define/17inFunction/target.p | 9 --- .../functionalTests/define/1buffer/input.p | 8 --- .../functionalTests/define/1buffer/target.p | 8 --- .../functionalTests/define/2button/input.p | 8 --- .../functionalTests/define/2button/target.p | 8 --- .../define/3formattingFalse/input.p | 6 -- .../define/3formattingFalse/target.p | 6 -- .../functionalTests/define/4inLoop/input.p | 13 ---- .../functionalTests/define/4inLoop/target.p | 13 ---- .../define/5inProcedure/input.p | 8 --- .../define/5inProcedure/target.p | 8 --- .../define/6inputOutputParameter/input.p | 9 --- .../define/6inputOutputParameter/target.p | 9 --- .../define/7inputParameter/input.p | 9 --- .../define/7inputParameter/target.p | 9 --- .../define/8mixedCaseInputs/input.p | 6 -- .../define/8mixedCaseInputs/target.p | 6 -- .../define/9outputParameter/input.p | 9 --- .../define/9outputParameter/target.p | 9 --- resources/samples/.vscode/settings.json | 1 - .../stabilityTests/.vscode/settings.json | 1 - .../enableFormatterDecorators.ts | 2 - src/v2/formatters/define/DefineFormatter.ts | 66 ------------------- src/v2/formatters/define/DefineSettings.ts | 8 --- 40 files changed, 372 deletions(-) delete mode 100644 resources/functionalTests/define/10query/input.p delete mode 100644 resources/functionalTests/define/10query/target.p delete mode 100644 resources/functionalTests/define/11returnParameter/input.p delete mode 100644 resources/functionalTests/define/11returnParameter/target.p delete mode 100644 resources/functionalTests/define/12stream/input.p delete mode 100644 resources/functionalTests/define/12stream/target.p delete mode 100644 resources/functionalTests/define/13tempTableAndDataset/input.p delete mode 100644 resources/functionalTests/define/13tempTableAndDataset/target.p delete mode 100644 resources/functionalTests/define/14upperCaseFormating/input.p delete mode 100644 resources/functionalTests/define/14upperCaseFormating/target.p delete mode 100644 resources/functionalTests/define/15workFile/input.p delete mode 100644 resources/functionalTests/define/15workFile/target.p delete mode 100644 resources/functionalTests/define/16inClass/input.p delete mode 100644 resources/functionalTests/define/16inClass/target.p delete mode 100644 resources/functionalTests/define/17inFunction/input.p delete mode 100644 resources/functionalTests/define/17inFunction/target.p delete mode 100644 resources/functionalTests/define/1buffer/input.p delete mode 100644 resources/functionalTests/define/1buffer/target.p delete mode 100644 resources/functionalTests/define/2button/input.p delete mode 100644 resources/functionalTests/define/2button/target.p delete mode 100644 resources/functionalTests/define/3formattingFalse/input.p delete mode 100644 resources/functionalTests/define/3formattingFalse/target.p delete mode 100644 resources/functionalTests/define/4inLoop/input.p delete mode 100644 resources/functionalTests/define/4inLoop/target.p delete mode 100644 resources/functionalTests/define/5inProcedure/input.p delete mode 100644 resources/functionalTests/define/5inProcedure/target.p delete mode 100644 resources/functionalTests/define/6inputOutputParameter/input.p delete mode 100644 resources/functionalTests/define/6inputOutputParameter/target.p delete mode 100644 resources/functionalTests/define/7inputParameter/input.p delete mode 100644 resources/functionalTests/define/7inputParameter/target.p delete mode 100644 resources/functionalTests/define/8mixedCaseInputs/input.p delete mode 100644 resources/functionalTests/define/8mixedCaseInputs/target.p delete mode 100644 resources/functionalTests/define/9outputParameter/input.p delete mode 100644 resources/functionalTests/define/9outputParameter/target.p delete mode 100644 src/v2/formatters/define/DefineFormatter.ts delete mode 100644 src/v2/formatters/define/DefineSettings.ts diff --git a/package.json b/package.json index dfb17cfa..8e1a4372 100644 --- 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/define/10query/input.p b/resources/functionalTests/define/10query/input.p deleted file mode 100644 index b9b99a43..00000000 --- a/resources/functionalTests/define/10query/input.p +++ /dev/null @@ -1,8 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - def QUERY qTestQuery FOR Customer. -END PROCEDURE. diff --git a/resources/functionalTests/define/10query/target.p b/resources/functionalTests/define/10query/target.p deleted file mode 100644 index 5ed0958c..00000000 --- a/resources/functionalTests/define/10query/target.p +++ /dev/null @@ -1,8 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE QUERY qTestQuery FOR Customer. -END PROCEDURE. diff --git a/resources/functionalTests/define/11returnParameter/input.p b/resources/functionalTests/define/11returnParameter/input.p deleted file mode 100644 index bc81e6be..00000000 --- a/resources/functionalTests/define/11returnParameter/input.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - def RETURN PARAMETER x AS INTEGER NO-UNDO. - def RETURN PARAMETER y AS INTEGER NO-UNDO. -END PROCEDURE. diff --git a/resources/functionalTests/define/11returnParameter/target.p b/resources/functionalTests/define/11returnParameter/target.p deleted file mode 100644 index 82c05eb0..00000000 --- a/resources/functionalTests/define/11returnParameter/target.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE RETURN PARAMETER x AS INTEGER NO-UNDO. - DEFINE RETURN PARAMETER y AS INTEGER NO-UNDO. -END PROCEDURE. diff --git a/resources/functionalTests/define/12stream/input.p b/resources/functionalTests/define/12stream/input.p deleted file mode 100644 index 1288488f..00000000 --- a/resources/functionalTests/define/12stream/input.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -def STREAM sStream. diff --git a/resources/functionalTests/define/12stream/target.p b/resources/functionalTests/define/12stream/target.p deleted file mode 100644 index 1fc2e936..00000000 --- a/resources/functionalTests/define/12stream/target.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -DEFINE STREAM sStream. diff --git a/resources/functionalTests/define/13tempTableAndDataset/input.p b/resources/functionalTests/define/13tempTableAndDataset/input.p deleted file mode 100644 index bdea4367..00000000 --- a/resources/functionalTests/define/13tempTableAndDataset/input.p +++ /dev/null @@ -1,11 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true, -"AblFormatter.temptableFormatting": true}*/ - -DEF TEMP-TABLE ttCustomer NO-UNDO - FIELD CustNum AS INTEGER - FIELD Name AS CHARACTER. - -DEF DATASET dsCustomer FOR ttCustomer. diff --git a/resources/functionalTests/define/13tempTableAndDataset/target.p b/resources/functionalTests/define/13tempTableAndDataset/target.p deleted file mode 100644 index 5fb3e1a4..00000000 --- a/resources/functionalTests/define/13tempTableAndDataset/target.p +++ /dev/null @@ -1,11 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true, -"AblFormatter.temptableFormatting": true}*/ - -DEFINE TEMP-TABLE ttCustomer NO-UNDO - FIELD CustNum AS INTEGER - FIELD Name AS CHARACTER. - -DEFINE DATASET dsCustomer FOR ttCustomer. diff --git a/resources/functionalTests/define/14upperCaseFormating/input.p b/resources/functionalTests/define/14upperCaseFormating/input.p deleted file mode 100644 index 063b434b..00000000 --- a/resources/functionalTests/define/14upperCaseFormating/input.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": true, - "abl.completion.upperCase": true}*/ - -define VARIABLE x AS INTEGER NO-UNDO. -def VARIABLE x AS INTEGER NO-UNDO. \ No newline at end of file diff --git a/resources/functionalTests/define/14upperCaseFormating/target.p b/resources/functionalTests/define/14upperCaseFormating/target.p deleted file mode 100644 index 6a5de072..00000000 --- a/resources/functionalTests/define/14upperCaseFormating/target.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": true, - "abl.completion.upperCase": true}*/ - -DEFINE VARIABLE x AS INTEGER NO-UNDO. -DEFINE VARIABLE x AS INTEGER NO-UNDO. \ No newline at end of file diff --git a/resources/functionalTests/define/15workFile/input.p b/resources/functionalTests/define/15workFile/input.p deleted file mode 100644 index f126a6f8..00000000 --- a/resources/functionalTests/define/15workFile/input.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -def WORKFILE wfTest. diff --git a/resources/functionalTests/define/15workFile/target.p b/resources/functionalTests/define/15workFile/target.p deleted file mode 100644 index 6b1cc51e..00000000 --- a/resources/functionalTests/define/15workFile/target.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -DEFINE WORKFILE wfTest. diff --git a/resources/functionalTests/define/16inClass/input.p b/resources/functionalTests/define/16inClass/input.p deleted file mode 100644 index bf8b33a2..00000000 --- a/resources/functionalTests/define/16inClass/input.p +++ /dev/null @@ -1,13 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -CLASS TestClass: - METHOD PUBLIC VOID testMethod(): - DEFINE VARIABLE x AS INTEGER NO-UNDO. - END METHOD. - METHOD PUBLIC VOID testMethod2(): - def VARIABLE y AS INTEGER NO-UNDO. - END METHOD. -END CLASS. diff --git a/resources/functionalTests/define/16inClass/target.p b/resources/functionalTests/define/16inClass/target.p deleted file mode 100644 index 40dbbcac..00000000 --- a/resources/functionalTests/define/16inClass/target.p +++ /dev/null @@ -1,13 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -CLASS TestClass: - METHOD PUBLIC VOID testMethod(): - DEFINE VARIABLE x AS INTEGER NO-UNDO. - END METHOD. - METHOD PUBLIC VOID testMethod2(): - DEFINE VARIABLE y AS INTEGER NO-UNDO. - END METHOD. -END CLASS. diff --git a/resources/functionalTests/define/17inFunction/input.p b/resources/functionalTests/define/17inFunction/input.p deleted file mode 100644 index 58e1d33d..00000000 --- a/resources/functionalTests/define/17inFunction/input.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -function fun returns integer (input pInt as integer): - def VARIABLE x AS INTEGER NO-UNDO. - return 2 * pInt. - end function. diff --git a/resources/functionalTests/define/17inFunction/target.p b/resources/functionalTests/define/17inFunction/target.p deleted file mode 100644 index db8a284a..00000000 --- a/resources/functionalTests/define/17inFunction/target.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -function fun returns integer (input pInt as integer): - DEFINE VARIABLE x AS INTEGER NO-UNDO. - return 2 * pInt. -end function. diff --git a/resources/functionalTests/define/1buffer/input.p b/resources/functionalTests/define/1buffer/input.p deleted file mode 100644 index d4e4a648..00000000 --- a/resources/functionalTests/define/1buffer/input.p +++ /dev/null @@ -1,8 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - def BUFFER bufCustomer FOR Customer. -END PROCEDURE. diff --git a/resources/functionalTests/define/1buffer/target.p b/resources/functionalTests/define/1buffer/target.p deleted file mode 100644 index 80fa7398..00000000 --- a/resources/functionalTests/define/1buffer/target.p +++ /dev/null @@ -1,8 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE BUFFER bufCustomer FOR Customer. -END PROCEDURE. diff --git a/resources/functionalTests/define/2button/input.p b/resources/functionalTests/define/2button/input.p deleted file mode 100644 index 51d3133f..00000000 --- a/resources/functionalTests/define/2button/input.p +++ /dev/null @@ -1,8 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - def BUTTON btnTestButton LABEL "Click Me". -END PROCEDURE. diff --git a/resources/functionalTests/define/2button/target.p b/resources/functionalTests/define/2button/target.p deleted file mode 100644 index f75435b6..00000000 --- a/resources/functionalTests/define/2button/target.p +++ /dev/null @@ -1,8 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE BUTTON btnTestButton LABEL "Click Me". -END PROCEDURE. diff --git a/resources/functionalTests/define/3formattingFalse/input.p b/resources/functionalTests/define/3formattingFalse/input.p deleted file mode 100644 index 6f5b3545..00000000 --- a/resources/functionalTests/define/3formattingFalse/input.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": false, - "abl.completion.upperCase": true, - "AblFormatter.variableDefinitionFormatting": false}*/ - - DEFINE VARIABLE x AS INTEGER NO-UNDO. diff --git a/resources/functionalTests/define/3formattingFalse/target.p b/resources/functionalTests/define/3formattingFalse/target.p deleted file mode 100644 index 6f5b3545..00000000 --- a/resources/functionalTests/define/3formattingFalse/target.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": false, - "abl.completion.upperCase": true, - "AblFormatter.variableDefinitionFormatting": false}*/ - - DEFINE VARIABLE x AS INTEGER NO-UNDO. diff --git a/resources/functionalTests/define/4inLoop/input.p b/resources/functionalTests/define/4inLoop/input.p deleted file mode 100644 index 0162d4bc..00000000 --- a/resources/functionalTests/define/4inLoop/input.p +++ /dev/null @@ -1,13 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -DEFINE VARIABLE i AS INTEGER NO-UNDO. - -DO i = 1 TO 5: - DEFINE VARIABLE x AS INTEGER NO-UNDO. - DO i = 1 TO 5: - DEFINE VARIABLE y AS INTEGER NO-UNDO. - END. -END. \ No newline at end of file diff --git a/resources/functionalTests/define/4inLoop/target.p b/resources/functionalTests/define/4inLoop/target.p deleted file mode 100644 index f8820980..00000000 --- a/resources/functionalTests/define/4inLoop/target.p +++ /dev/null @@ -1,13 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -DEFINE VARIABLE i AS INTEGER NO-UNDO. - -DO i = 1 TO 5: - DEFINE VARIABLE x AS INTEGER NO-UNDO. - DO i = 1 TO 5: - DEFINE VARIABLE y AS INTEGER NO-UNDO. - END. -END. \ No newline at end of file diff --git a/resources/functionalTests/define/5inProcedure/input.p b/resources/functionalTests/define/5inProcedure/input.p deleted file mode 100644 index 2782b44f..00000000 --- a/resources/functionalTests/define/5inProcedure/input.p +++ /dev/null @@ -1,8 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE VARIABLE x AS INTEGER NO-UNDO. -END PROCEDURE. \ No newline at end of file diff --git a/resources/functionalTests/define/5inProcedure/target.p b/resources/functionalTests/define/5inProcedure/target.p deleted file mode 100644 index 4b2d218b..00000000 --- a/resources/functionalTests/define/5inProcedure/target.p +++ /dev/null @@ -1,8 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE VARIABLE x AS INTEGER NO-UNDO. -END PROCEDURE. \ No newline at end of file diff --git a/resources/functionalTests/define/6inputOutputParameter/input.p b/resources/functionalTests/define/6inputOutputParameter/input.p deleted file mode 100644 index 5197f47d..00000000 --- a/resources/functionalTests/define/6inputOutputParameter/input.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - def INPUT-OUTPUT PARAMETER x AS INTEGER NO-UNDO. - def INPUT-OUTPUT PARAMETER y AS INTEGER NO-UNDO. -END PROCEDURE. diff --git a/resources/functionalTests/define/6inputOutputParameter/target.p b/resources/functionalTests/define/6inputOutputParameter/target.p deleted file mode 100644 index 00200b36..00000000 --- a/resources/functionalTests/define/6inputOutputParameter/target.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE INPUT-OUTPUT PARAMETER x AS INTEGER NO-UNDO. - DEFINE INPUT-OUTPUT PARAMETER y AS INTEGER NO-UNDO. -END PROCEDURE. diff --git a/resources/functionalTests/define/7inputParameter/input.p b/resources/functionalTests/define/7inputParameter/input.p deleted file mode 100644 index 6f46877c..00000000 --- a/resources/functionalTests/define/7inputParameter/input.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - def INPUT PARAMETER x AS INTEGER NO-UNDO. - def INPUT PARAMETER y AS INTEGER NO-UNDO. -END PROCEDURE. diff --git a/resources/functionalTests/define/7inputParameter/target.p b/resources/functionalTests/define/7inputParameter/target.p deleted file mode 100644 index 4fbcb5b0..00000000 --- a/resources/functionalTests/define/7inputParameter/target.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE INPUT PARAMETER x AS INTEGER NO-UNDO. - DEFINE INPUT PARAMETER y AS INTEGER NO-UNDO. -END PROCEDURE. diff --git a/resources/functionalTests/define/8mixedCaseInputs/input.p b/resources/functionalTests/define/8mixedCaseInputs/input.p deleted file mode 100644 index d8a3d752..00000000 --- a/resources/functionalTests/define/8mixedCaseInputs/input.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": true, - "abl.completion.upperCase": true}*/ - -DeFiNe VARIABLE x AS INTEGER NO-UNDO. -dEf VARIABLE x AS INTEGER NO-UNDO. diff --git a/resources/functionalTests/define/8mixedCaseInputs/target.p b/resources/functionalTests/define/8mixedCaseInputs/target.p deleted file mode 100644 index 64032bb7..00000000 --- a/resources/functionalTests/define/8mixedCaseInputs/target.p +++ /dev/null @@ -1,6 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": true, - "abl.completion.upperCase": true}*/ - -DEFINE VARIABLE x AS INTEGER NO-UNDO. -DEFINE VARIABLE x AS INTEGER NO-UNDO. diff --git a/resources/functionalTests/define/9outputParameter/input.p b/resources/functionalTests/define/9outputParameter/input.p deleted file mode 100644 index 9e95cd6d..00000000 --- a/resources/functionalTests/define/9outputParameter/input.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - def OUTPUT PARAMETER x AS INTEGER NO-UNDO. - def OUTPUT PARAMETER y AS INTEGER NO-UNDO. -END PROCEDURE. diff --git a/resources/functionalTests/define/9outputParameter/target.p b/resources/functionalTests/define/9outputParameter/target.p deleted file mode 100644 index 215fb34c..00000000 --- a/resources/functionalTests/define/9outputParameter/target.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -PROCEDURE testProcedure: - DEFINE OUTPUT PARAMETER x AS INTEGER NO-UNDO. - DEFINE OUTPUT PARAMETER y AS INTEGER NO-UNDO. -END PROCEDURE. diff --git a/resources/samples/.vscode/settings.json b/resources/samples/.vscode/settings.json index 955a8fed..e049e5b1 100644 --- a/resources/samples/.vscode/settings.json +++ b/resources/samples/.vscode/settings.json @@ -2,7 +2,6 @@ { "abl.completion.upperCase": false, "AblFormatter.assignFormatting": true, - "AblFormatter.defineFormatting": false, "AblFormatter.findFormatting": false, "AblFormatter.forFormatting": false, "AblFormatter.caseFormatting": false, diff --git a/resources/stabilityTests/.vscode/settings.json b/resources/stabilityTests/.vscode/settings.json index 6f07ed90..36ad647b 100644 --- a/resources/stabilityTests/.vscode/settings.json +++ b/resources/stabilityTests/.vscode/settings.json @@ -1,5 +1,4 @@ { - "AblFormatter.defineFormatting": false, "AblFormatter.temptableFormatting": true, "AblFormatter.usingFormatting": true, "AblFormatter.bodyFormatting": true, diff --git a/src/v2/formatterFramework/enableFormatterDecorators.ts b/src/v2/formatterFramework/enableFormatterDecorators.ts index 3660bcae..1b9027cd 100644 --- a/src/v2/formatterFramework/enableFormatterDecorators.ts +++ b/src/v2/formatterFramework/enableFormatterDecorators.ts @@ -1,7 +1,6 @@ import { AssignFormatter } from "../formatters/assign/AssignFormatter"; import { BlockFormater } from "../formatters/block/BlockFormatter"; import { IfFormatter } from "../formatters/if/IfFormatter"; -import { DefineFormatter } from "../formatters/define/DefineFormatter"; import { UsingFormatter } from "../formatters/using/UsingFormatter"; import { CaseFormatter } from "../formatters/case/CaseFormatter"; import { FindFormatter } from "../formatters/find/FindFormatter"; @@ -21,7 +20,6 @@ export function enableFormatterDecorators(): void { BlockFormater; BodyFormatter; IfFormatter; - DefineFormatter; UsingFormatter; CaseFormatter; FindFormatter; diff --git a/src/v2/formatters/define/DefineFormatter.ts b/src/v2/formatters/define/DefineFormatter.ts deleted file mode 100644 index f64ebc77..00000000 --- a/src/v2/formatters/define/DefineFormatter.ts +++ /dev/null @@ -1,66 +0,0 @@ -import { SyntaxNode } from "web-tree-sitter"; -import { IFormatter } from "../../formatterFramework/IFormatter"; -import { CodeEdit } from "../../model/CodeEdit"; -import { FullText } from "../../model/FullText"; -import { FormatterHelper } from "../../formatterFramework/FormatterHelper"; -import { AFormatter } from "../AFormatter"; -import { RegisterFormatter } from "../../formatterFramework/formatterDecorator"; -import { DefineSettings } from "./DefineSettings"; -import { IConfigurationManager } from "../../../utils/IConfigurationManager"; - -@RegisterFormatter -export class DefineFormatter extends AFormatter implements IFormatter { - public static readonly formatterLabel = "defineFormatting"; - private readonly settings: DefineSettings; - - private targetIsLong = true; - private readonly longDefine = "DEFINE"; - private readonly shortDefine = "DEF"; - - public constructor(configurationManager: IConfigurationManager) { - super(configurationManager); - this.settings = new DefineSettings(configurationManager); - } - - match(node: Readonly): boolean { - if ( - node.type === "DEFINE" || - node.type === "define" || - node.type === "DEFI" || - node.type === "defi" || - node.type === "DEF" || - node.type === "def" - ) { - return true; - } - return false; - } - parse( - node: Readonly, - fullText: Readonly - ): CodeEdit | CodeEdit[] | undefined { - const text = FormatterHelper.getCurrentText(node, fullText); - const newText = this.getPrettyToken(text, fullText); - return this.getCodeEdit(node, text, newText, fullText); - } - - private getPrettyToken(text: string, fullText: Readonly): string { - const actualRow = FormatterHelper.getActualTextRow(text, fullText); - - const token = fullText.eolDelimiter - .repeat(actualRow) - .concat( - this.settings.casing() - ? (this.targetIsLong - ? this.longDefine - : this.shortDefine - ).toUpperCase() - : (this.targetIsLong - ? this.longDefine - : this.shortDefine - ).toLowerCase() - ); - - return token; - } -} diff --git a/src/v2/formatters/define/DefineSettings.ts b/src/v2/formatters/define/DefineSettings.ts deleted file mode 100644 index 81184ef2..00000000 --- a/src/v2/formatters/define/DefineSettings.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { ASettings } from "../ASettings"; - -export class DefineSettings extends ASettings { - // token settings - public defineFormatting() { - return this.configurationManager.get("defineFormatting") ? true : false; - } -} From b3a7e767ee27ea50edb531212807d5d5c5a9dcf7 Mon Sep 17 00:00:00 2001 From: darkeris345 Date: Wed, 22 Jan 2025 15:16:57 +0200 Subject: [PATCH 2/4] Updating tests --- .../57class-block-multiple-line/target.p | 2 +- .../defineVariable/2no-undo/target.p | 56 +++++++++---------- .../defineVariable/2no-undo4/target.p | 18 +++--- .../defineVariable/6-procedure/target.p | 10 ++-- .../defineVariable/6-type-tuning/target.p | 12 ++-- .../enum/1-enum-with-values/target.p | 2 +- .../property/1emptyGetSet/input.p | 1 - .../property/1emptyGetSet/target.p | 1 - .../functionalTests/property/2private/input.p | 1 - .../property/2private/target.p | 1 - .../property/3multiple/input.p | 1 - .../property/3multiple/target.p | 1 - .../property/4BlockFormatterFalse/input.p | 1 - .../property/4BlockFormatterFalse/target.p | 1 - resources/samples/oo1.cls | 3 +- resources/samples/oo2.cls | 3 +- resources/samples/target-define1.p | 3 +- resources/samples/target-define2.i | 3 +- 18 files changed, 54 insertions(+), 66 deletions(-) diff --git a/resources/functionalTests/block/57class-block-multiple-line/target.p b/resources/functionalTests/block/57class-block-multiple-line/target.p index 614aedf9..c95285ad 100644 --- 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/defineVariable/2no-undo/target.p b/resources/functionalTests/defineVariable/2no-undo/target.p index 26743a21..bc445300 100644 --- a/resources/functionalTests/defineVariable/2no-undo/target.p +++ b/resources/functionalTests/defineVariable/2no-undo/target.p @@ -1,31 +1,31 @@ /* formatterSettingsOverride */ /* { "AblFormatter.variableDefinitionFormatting": true} */ -define VARIABLE hRowBefore AS HANDLE NO-UNDO. -define VARIABLE cUpdColumnsByTable AS CHARACTER NO-UNDO. -define VARIABLE hRowUpdFld AS HANDLE NO-UNDO. -define VARIABLE hRowOldFld AS HANDLE NO-UNDO. -define VARIABLE hDBField AS HANDLE NO-UNDO. -define VARIABLE iField AS INTEGER NO-UNDO. -define VARIABLE iTable AS INTEGER NO-UNDO. -define VARIABLE cFromField AS CHARACTER NO-UNDO. -define VARIABLE cToField AS CHARACTER NO-UNDO. -define VARIABLE lColumnChanged AS LOGICAL NO-UNDO. -define VARIABLE iBracket AS INTEGER NO-UNDO. -define VARIABLE iExtent AS INTEGER NO-UNDO. -define VARIABLE cRowIdent AS CHARACTER NO-UNDO. -define VARIABLE cRowid AS CHARACTER NO-UNDO. -define VARIABLE cExclude AS CHARACTER NO-UNDO. -define VARIABLE cUpdColumns AS CHARACTER NO-UNDO. -define VARIABLE cColumnsByTable AS CHARACTER NO-UNDO. -define VARIABLE cColumns AS CHARACTER NO-UNDO. -define VARIABLE lChanged AS LOGICAL NO-UNDO. -define VARIABLE cNotChanged AS CHARACTER NO-UNDO. -define VARIABLE cAssignFields AS CHARACTER NO-UNDO. -define VARIABLE cUseAssignFields AS CHARACTER NO-UNDO. -define VARIABLE cDataColumns AS CHARACTER NO-UNDO. -define VARIABLE lAmbiguous AS LOGICAL NO-UNDO. -define VARIABLE lCreate AS LOGICAL NO-UNDO. -define VARIABLE lLarge AS LOGICAL NO-UNDO. -define VARIABLE cLargeList AS CHARACTER NO-UNDO. -define VARIABLE iLarge AS INTEGER NO-UNDO. \ No newline at end of file +DEFINE VARIABLE hRowBefore AS HANDLE NO-UNDO. +DEFINE VARIABLE cUpdColumnsByTable AS CHARACTER NO-UNDO. +DEFINE VARIABLE hRowUpdFld AS HANDLE NO-UNDO. +DEFINE VARIABLE hRowOldFld AS HANDLE NO-UNDO. +DEFINE VARIABLE hDBField AS HANDLE NO-UNDO. +DEFINE VARIABLE iField AS INTEGER NO-UNDO. +DEFINE VARIABLE iTable AS INTEGER NO-UNDO. +DEFINE VARIABLE cFromField AS CHARACTER NO-UNDO. +DEFINE VARIABLE cToField AS CHARACTER NO-UNDO. +DEFINE VARIABLE lColumnChanged AS LOGICAL NO-UNDO. +DEFINE VARIABLE iBracket AS INTEGER NO-UNDO. +DEFINE VARIABLE iExtent AS INTEGER NO-UNDO. +DEFINE VARIABLE cRowIdent AS CHARACTER NO-UNDO. +DEFINE VARIABLE cRowid AS CHARACTER NO-UNDO. +DEFINE VARIABLE cExclude AS CHARACTER NO-UNDO. +DEFINE VARIABLE cUpdColumns AS CHARACTER NO-UNDO. +DEFINE VARIABLE cColumnsByTable AS CHARACTER NO-UNDO. +DEFINE VARIABLE cColumns AS CHARACTER NO-UNDO. +DEFINE VARIABLE lChanged AS LOGICAL NO-UNDO. +DEFINE VARIABLE cNotChanged AS CHARACTER NO-UNDO. +DEFINE VARIABLE cAssignFields AS CHARACTER NO-UNDO. +DEFINE VARIABLE cUseAssignFields AS CHARACTER NO-UNDO. +DEFINE VARIABLE cDataColumns AS CHARACTER NO-UNDO. +DEFINE VARIABLE lAmbiguous AS LOGICAL NO-UNDO. +DEFINE VARIABLE lCreate AS LOGICAL NO-UNDO. +DEFINE VARIABLE lLarge AS LOGICAL NO-UNDO. +DEFINE VARIABLE cLargeList AS CHARACTER NO-UNDO. +DEFINE VARIABLE iLarge AS INTEGER NO-UNDO. \ No newline at end of file diff --git a/resources/functionalTests/defineVariable/2no-undo4/target.p b/resources/functionalTests/defineVariable/2no-undo4/target.p index 00508040..b64eb544 100644 --- a/resources/functionalTests/defineVariable/2no-undo4/target.p +++ b/resources/functionalTests/defineVariable/2no-undo4/target.p @@ -1,12 +1,12 @@ /* formatterSettingsOverride */ /* { "AblFormatter.variableDefinitionFormatting": true} */ -define VARIABLE cName AS CHARACTER NO-UNDO FORMAT "x(30)" INITIAL "Unknown". -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 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 "". \ No newline at end of file +DEFINE VARIABLE cName AS CHARACTER NO-UNDO FORMAT "x(30)" INITIAL "Unknown". +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 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 "". \ No newline at end of file diff --git a/resources/functionalTests/defineVariable/6-procedure/target.p b/resources/functionalTests/defineVariable/6-procedure/target.p index c5770d3e..071c3678 100644 --- a/resources/functionalTests/defineVariable/6-procedure/target.p +++ b/resources/functionalTests/defineVariable/6-procedure/target.p @@ -2,11 +2,11 @@ /* { "AblFormatter.variableDefinitionFormatting": true} */ PROCEDURE addEntry: - define VARIABLE new_lang AS CHARACTER NO-UNDO EXTENT 1 INITIAL ["Reading Schema..."]. - define VARIABLE c AS CHARACTER NO-UNDO. - define VARIABLE useVar AS LOGICAL NO-UNDO INIT YES. - define VARIABLE totLen AS INT NO-UNDO. - define VARIABLE iNum AS INTEGER NO-UNDO INIT 0. + DEFINE VARIABLE new_lang AS CHARACTER NO-UNDO EXTENT 1 INITIAL ["Reading Schema..."]. + DEFINE VARIABLE c AS CHARACTER NO-UNDO. + DEFINE VARIABLE useVar AS LOGICAL NO-UNDO INIT YES. + DEFINE VARIABLE totLen AS INT NO-UNDO. + DEFINE VARIABLE iNum AS INTEGER NO-UNDO INIT 0. diff --git a/resources/functionalTests/defineVariable/6-type-tuning/target.p b/resources/functionalTests/defineVariable/6-type-tuning/target.p index 9ccaa446..7f2e5bd1 100644 --- a/resources/functionalTests/defineVariable/6-type-tuning/target.p +++ b/resources/functionalTests/defineVariable/6-type-tuning/target.p @@ -1,10 +1,10 @@ /* formatterSettingsOverride */ /* { "AblFormatter.variableDefinitionFormatting": true} */ -define VARIABLE hColumn AS HANDLE NO-UNDO EXTENT 2. +DEFINE VARIABLE hColumn AS HANDLE NO-UNDO EXTENT 2. -define VARIABLE gcSort AS CHARACTER NO-UNDO INITIAL "dType". -define VARIABLE gcMods AS CHARACTER NO-UNDO. -define VARIABLE DigestChecksum AS CHARACTER NO-UNDO. -define VARIABLE inbuild AS LOGICAL NO-UNDO. -define VARIABLE derr AS LOGICAL NO-UNDO. +DEFINE VARIABLE gcSort AS CHARACTER NO-UNDO INITIAL "dType". +DEFINE VARIABLE gcMods AS CHARACTER NO-UNDO. +DEFINE VARIABLE DigestChecksum AS CHARACTER NO-UNDO. +DEFINE VARIABLE inbuild AS LOGICAL NO-UNDO. +DEFINE VARIABLE derr AS LOGICAL NO-UNDO. diff --git a/resources/functionalTests/enum/1-enum-with-values/target.p b/resources/functionalTests/enum/1-enum-with-values/target.p index a461bfc4..4573042f 100644 --- a/resources/functionalTests/enum/1-enum-with-values/target.p +++ b/resources/functionalTests/enum/1-enum-with-values/target.p @@ -3,7 +3,7 @@ "AblFormatter.enumFormatting": true}*/ ENUM Oper: - define ENUM Invalid = 0 + DEFINE ENUM Invalid = 0 Create = 1 Delete = 2 BeforeUpdate = 3 diff --git a/resources/functionalTests/property/1emptyGetSet/input.p b/resources/functionalTests/property/1emptyGetSet/input.p index 3e01b12d..c43d3346 100644 --- a/resources/functionalTests/property/1emptyGetSet/input.p +++ b/resources/functionalTests/property/1emptyGetSet/input.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ /* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, "AblFormatter.propertyFormatting": true}*/ class Class final: diff --git a/resources/functionalTests/property/1emptyGetSet/target.p b/resources/functionalTests/property/1emptyGetSet/target.p index b00f77c7..fc42fd1b 100644 --- a/resources/functionalTests/property/1emptyGetSet/target.p +++ b/resources/functionalTests/property/1emptyGetSet/target.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ /* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, "AblFormatter.propertyFormatting": true}*/ class Class final: diff --git a/resources/functionalTests/property/2private/input.p b/resources/functionalTests/property/2private/input.p index 05003725..67b2b549 100644 --- a/resources/functionalTests/property/2private/input.p +++ b/resources/functionalTests/property/2private/input.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ /* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, "AblFormatter.propertyFormatting": true}*/ class Class final: diff --git a/resources/functionalTests/property/2private/target.p b/resources/functionalTests/property/2private/target.p index c761ebae..79510ea3 100644 --- a/resources/functionalTests/property/2private/target.p +++ b/resources/functionalTests/property/2private/target.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ /* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, "AblFormatter.propertyFormatting": true}*/ class Class final: diff --git a/resources/functionalTests/property/3multiple/input.p b/resources/functionalTests/property/3multiple/input.p index 22192667..a4678c73 100644 --- a/resources/functionalTests/property/3multiple/input.p +++ b/resources/functionalTests/property/3multiple/input.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ /* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, "AblFormatter.propertyFormatting": true}*/ class Class final: diff --git a/resources/functionalTests/property/3multiple/target.p b/resources/functionalTests/property/3multiple/target.p index 70802909..98adaea4 100644 --- a/resources/functionalTests/property/3multiple/target.p +++ b/resources/functionalTests/property/3multiple/target.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ /* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, "AblFormatter.propertyFormatting": true}*/ class Class final: diff --git a/resources/functionalTests/property/4BlockFormatterFalse/input.p b/resources/functionalTests/property/4BlockFormatterFalse/input.p index f66a13bc..de162fcc 100644 --- a/resources/functionalTests/property/4BlockFormatterFalse/input.p +++ b/resources/functionalTests/property/4BlockFormatterFalse/input.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ /* { "AblFormatter.blockFormatting": false, -"AblFormatter.defineFormatting": true, "AblFormatter.propertyFormatting": true}*/ class Class final: diff --git a/resources/functionalTests/property/4BlockFormatterFalse/target.p b/resources/functionalTests/property/4BlockFormatterFalse/target.p index b55196f8..efffb246 100644 --- a/resources/functionalTests/property/4BlockFormatterFalse/target.p +++ b/resources/functionalTests/property/4BlockFormatterFalse/target.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ /* { "AblFormatter.blockFormatting": false, -"AblFormatter.defineFormatting": true, "AblFormatter.propertyFormatting": true}*/ class Class final: diff --git a/resources/samples/oo1.cls b/resources/samples/oo1.cls index ca26f4be..b5340f45 100644 --- a/resources/samples/oo1.cls +++ b/resources/samples/oo1.cls @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": true, - "abl.completion.upperCase": true}*/ +/* { "abl.completion.upperCase": true}*/ CLASS A: DEFINE PROTECTED VARIABLE oRepo AS ILanguageRepository NO-UNDO. diff --git a/resources/samples/oo2.cls b/resources/samples/oo2.cls index 1b80b3f9..dc310ef9 100644 --- a/resources/samples/oo2.cls +++ b/resources/samples/oo2.cls @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": false, - "AblFormatter.assignFormatting": true, +/* {"AblFormatter.assignFormatting": true, "AblFormatter.blockFormatting": true, "AblFormatter.ifFormatting": true, "abl.completion.upperCase": true}*/ diff --git a/resources/samples/target-define1.p b/resources/samples/target-define1.p index 36406d10..9d5736e2 100644 --- a/resources/samples/target-define1.p +++ b/resources/samples/target-define1.p @@ -1,6 +1,5 @@ /* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": true, - "abl.completion.upperCase": true}*/ +/* { "abl.completion.upperCase": true}*/ FUNCTION GET_STUFF RETURNS Progress.Json.ObjectModel.JsonObject (cParam1 AS CHARACTER): DEFINE VARIABLE jsonTableRow AS Progress.Json.ObjectModel.JsonObject NO-UNDO. RETURN jsonTableRow. diff --git a/resources/samples/target-define2.i b/resources/samples/target-define2.i index 81b8843e..d614fba9 100644 --- a/resources/samples/target-define2.i +++ b/resources/samples/target-define2.i @@ -1,4 +1,3 @@ /* formatterSettingsOverride */ -/* { "AblFormatter.defineFormatting": true, - "abl.completion.upperCase": true}*/ +/* { "abl.completion.upperCase": true}*/ DEFINE VARIABLE array AS CHARACTER EXTENT 10 NO-UNDO. \ No newline at end of file From 5b9ec45c98ab432524a9647b890180da95084e3f Mon Sep 17 00:00:00 2001 From: darkeris345 Date: Wed, 22 Jan 2025 15:35:49 +0200 Subject: [PATCH 3/4] Update tests 2 --- .../arrayAccess/4-array-literal2/target.p | 2 +- .../functionalTests/define/define-inClass/input.p | 13 ------------- .../functionalTests/define/define-inClass/target.p | 13 ------------- .../define/define-inFunction/input.p | 9 --------- .../define/define-inFunction/target.p | 9 --------- .../defineVariable/2no-undo4/target.p | 4 ++-- 6 files changed, 3 insertions(+), 47 deletions(-) delete mode 100644 resources/functionalTests/define/define-inClass/input.p delete mode 100644 resources/functionalTests/define/define-inClass/target.p delete mode 100644 resources/functionalTests/define/define-inFunction/input.p delete mode 100644 resources/functionalTests/define/define-inFunction/target.p diff --git a/resources/functionalTests/arrayAccess/4-array-literal2/target.p b/resources/functionalTests/arrayAccess/4-array-literal2/target.p index cc49aa4e..35a7fb8b 100644 --- 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]. \ No newline at end of file diff --git a/resources/functionalTests/define/define-inClass/input.p b/resources/functionalTests/define/define-inClass/input.p deleted file mode 100644 index bf8b33a2..00000000 --- a/resources/functionalTests/define/define-inClass/input.p +++ /dev/null @@ -1,13 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -CLASS TestClass: - METHOD PUBLIC VOID testMethod(): - DEFINE VARIABLE x AS INTEGER NO-UNDO. - END METHOD. - METHOD PUBLIC VOID testMethod2(): - def VARIABLE y AS INTEGER NO-UNDO. - END METHOD. -END CLASS. diff --git a/resources/functionalTests/define/define-inClass/target.p b/resources/functionalTests/define/define-inClass/target.p deleted file mode 100644 index 40dbbcac..00000000 --- a/resources/functionalTests/define/define-inClass/target.p +++ /dev/null @@ -1,13 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -CLASS TestClass: - METHOD PUBLIC VOID testMethod(): - DEFINE VARIABLE x AS INTEGER NO-UNDO. - END METHOD. - METHOD PUBLIC VOID testMethod2(): - DEFINE VARIABLE y AS INTEGER NO-UNDO. - END METHOD. -END CLASS. diff --git a/resources/functionalTests/define/define-inFunction/input.p b/resources/functionalTests/define/define-inFunction/input.p deleted file mode 100644 index 58e1d33d..00000000 --- a/resources/functionalTests/define/define-inFunction/input.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -function fun returns integer (input pInt as integer): - def VARIABLE x AS INTEGER NO-UNDO. - return 2 * pInt. - end function. diff --git a/resources/functionalTests/define/define-inFunction/target.p b/resources/functionalTests/define/define-inFunction/target.p deleted file mode 100644 index db8a284a..00000000 --- a/resources/functionalTests/define/define-inFunction/target.p +++ /dev/null @@ -1,9 +0,0 @@ -/* formatterSettingsOverride */ -/* { "AblFormatter.blockFormatting": true, -"AblFormatter.defineFormatting": true, -"abl.completion.upperCase": true}*/ - -function fun returns integer (input pInt as integer): - DEFINE VARIABLE x AS INTEGER NO-UNDO. - return 2 * pInt. -end function. diff --git a/resources/functionalTests/defineVariable/2no-undo4/target.p b/resources/functionalTests/defineVariable/2no-undo4/target.p index 0b9cb89c..8ce16abd 100644 --- a/resources/functionalTests/defineVariable/2no-undo4/target.p +++ b/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 "". +DEFINE VARIABLE cXml AS LONGCHAR NO-UNDO INITIAL "". \ No newline at end of file From 280d3d8e0e19ee0276b53932c2f5fd6ea90cd76b Mon Sep 17 00:00:00 2001 From: gmickus Date: Thu, 23 Jan 2025 13:23:18 +0200 Subject: [PATCH 4/4] Update test --- .../functionalTests/property/4BlockFormatterFalse/target.p | 6 +++--- resources/functionalTests/property/5blocks2/target.p | 2 +- resources/functionalTests/property/5blocks3/target.p | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/functionalTests/property/4BlockFormatterFalse/target.p b/resources/functionalTests/property/4BlockFormatterFalse/target.p index efffb246..709b60ca 100644 --- a/resources/functionalTests/property/4BlockFormatterFalse/target.p +++ b/resources/functionalTests/property/4BlockFormatterFalse/target.p @@ -4,8 +4,8 @@ class Class final: -define private static property m_Total as integer no-undo - private get. - private set. + define private static property m_Total as integer no-undo + private get. + private set. end class. \ No newline at end of file diff --git a/resources/functionalTests/property/5blocks2/target.p b/resources/functionalTests/property/5blocks2/target.p index f164c369..c8a02661 100644 --- a/resources/functionalTests/property/5blocks2/target.p +++ b/resources/functionalTests/property/5blocks2/target.p @@ -18,5 +18,5 @@ class myRequest implements IWebRequest: set(cProp as char): undo, throw new AppError(GetReadOnlyMessage(),?). end set. - + end class. \ No newline at end of file diff --git a/resources/functionalTests/property/5blocks3/target.p b/resources/functionalTests/property/5blocks3/target.p index eeaf3881..44a6356a 100644 --- a/resources/functionalTests/property/5blocks3/target.p +++ b/resources/functionalTests/property/5blocks3/target.p @@ -15,5 +15,5 @@ class Writer implements IWebRequest: return AuthenticationRequestWriterBuilder:Registry. end get. private set. - + end class. \ No newline at end of file