Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

242 Improve temp-table field formatting #248

Merged
merged 39 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ff49f55
Updated findFormattter added tests
SSaulenas Aug 21, 2024
441f8ef
Merge commit '78179a19053355ff37eff148f9613e5bf72712c1' into 40-find-…
SSaulenas Aug 26, 2024
cc4e797
Updated test structure
SSaulenas Aug 26, 2024
329e1c5
Update AssignFormatter
SSaulenas Aug 26, 2024
d7cb4bc
Merge commit '06bc7a8a54ae5940cbc2d703b8f71dbeff6ac3c6' into 40-find-…
SSaulenas Aug 27, 2024
47380ad
Merge remote-tracking branch 'origin' into 40-find-formatting
Sep 13, 2024
57d4153
Add test
Sep 13, 2024
8912b7c
Add test
Sep 13, 2024
874db03
Merge remote-tracking branch 'origin' into 40-find-formatting
Sep 13, 2024
fb430cc
Update test
Sep 13, 2024
075b842
Implement formatter
Sep 30, 2024
95194a0
Update package.json
Sep 30, 2024
76b69b6
testing
Oct 2, 2024
a22ff44
Remove comments
Oct 2, 2024
3e51091
Update tests
Oct 2, 2024
1206b31
Update tests
Oct 2, 2024
825b926
Merge remote-tracking branch 'origin' into 236-variable-definition-fo…
Oct 2, 2024
2d96cae
Implement formatter for procedure parameters
Oct 2, 2024
6c035cd
Fix import
Oct 2, 2024
533262d
Update formatter ; add tests
Oct 2, 2024
058c49a
Add type tuning formatting
Oct 4, 2024
123eecf
Merge remote-tracking branch 'origin' into 236-variable-definition-fo…
Oct 4, 2024
2a0feae
Fix bug with define trim
Oct 4, 2024
61fa321
Merge remote-tracking branch 'origin' into 242-improve-temp-table-fie…
Oct 4, 2024
07432cf
Merge branch '236-variable-definition-formatter' into 242-improve-tem…
Oct 4, 2024
74612f5
Change settings update message
Oct 7, 2024
32a6271
Add type tuning format
Oct 7, 2024
a030839
Change test
Oct 7, 2024
2d86228
Align variable based on access tuning
Oct 9, 2024
6dea9fb
Add test
Oct 9, 2024
5e9e83d
changed version
Oct 14, 2024
d1a7ebf
Merge pull request #254 from BalticAmadeus/253-version-0043-of-tree-s…
PauliusKu Oct 14, 2024
f688439
Merge pull request #99 from BalticAmadeus/40-find-formatting
PauliusKu Oct 14, 2024
b2dc45f
Merge branch '236-variable-definition-formatter' into develop
Oct 16, 2024
07bda0f
Merge branch '242-improve-temp-table-field-formatting' into develop
Oct 16, 2024
632b196
Merge branch '210-improve-settings-change-success-message' into develop
Oct 16, 2024
fc67ab1
Merge branch '240-add-formatting-for-defines-with-access-tunings' int…
Oct 16, 2024
0fb6210
Add error handling in switch
Oct 18, 2024
81d3a05
Add error handling in switch
Oct 18, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
.
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Original file line number Diff line number Diff line change
Expand Up @@ -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
.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
4 changes: 0 additions & 4 deletions resources/functionalTests/assign/15assign-noError/input.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions resources/functionalTests/assign/15assign-noError/target.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions resources/functionalTests/assign/16assign-When/input.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions resources/functionalTests/assign/16assign-When/target.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions resources/functionalTests/assign/1formattingFalse/input.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions resources/functionalTests/assign/1formattingFalse/target.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions resources/functionalTests/assign/2inFunction/input.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions resources/functionalTests/assign/2inFunction/target.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions resources/functionalTests/assign/3inProcedure/input.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions resources/functionalTests/assign/3inProcedure/target.p
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Loading