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

305 new wasm 0046 #309

Merged
merged 22 commits into from
Feb 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: results
path: /home/runner/work/AblFormatter/AblFormatter/resources/testResults
path: /home/runner/work/OpenedgeAblFormatter/OpenedgeAblFormatter/resources/testResults
retention-days: 7
6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,12 @@
"default": "true",
"description": "Enable STATEMENT formatting"
},
"AblFormatter.variableAssignmentFormatting": {
"order": 2000,
"type": "boolean",
"default": "true",
"description": "Enable STATEMENT formatting"
},
"AblFormatter.showTreeInfoOnHover": {
"order": 10100,
"type": "boolean",
Expand Down
2 changes: 1 addition & 1 deletion resources/functionalTests/arrayAccess/3-nested/input.p
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* formatterSettingsOverride */
/* { "AblFormatter.arrayAccessFormatting": true}*/

a [ b [ myFunc ( i ) ] ] = d [ e [ f [ i ] ] - g [ j ] ]
a [ b [ myFunc ( i ) ] ] = d [ e [ f [ i ] ] - g [ j ] ].
2 changes: 1 addition & 1 deletion resources/functionalTests/arrayAccess/3-nested/target.p
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* formatterSettingsOverride */
/* { "AblFormatter.arrayAccessFormatting": true}*/

a[b[myFunc ( i )]] = d[e[f[i]] - g[j]]
a[b[myFunc ( i )]] = d[e[f[i]] - g[j]].
4 changes: 4 additions & 0 deletions resources/functionalTests/arrayAccess/6-array-literal/input.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/* formatterSettingsOverride */
/* { "AblFormatter.arrayAccessFormatting": true}*/

VAR SparkleState [ 2 ] enchantedForest = [NEW SparkleState("Candyland"), NEW SparkleState("Bubbletopia")].
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/* formatterSettingsOverride */
/* { "AblFormatter.arrayAccessFormatting": true}*/

VAR SparkleState[2] enchantedForest = [NEW SparkleState("Candyland"), NEW SparkleState("Bubbletopia")].
8 changes: 8 additions & 0 deletions resources/functionalTests/block/58-repeat-while/input.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* formatterSettingsOverride */
/* { "AblFormatter.blockFormatting": true}*/

repeat while a < abc and true:
assign
l_dbnr = l_dbnr + 1
.
end.
8 changes: 8 additions & 0 deletions resources/functionalTests/block/58-repeat-while/target.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* formatterSettingsOverride */
/* { "AblFormatter.blockFormatting": true}*/

repeat while a < abc and true:
assign
l_dbnr = l_dbnr + 1
.
end.
6 changes: 6 additions & 0 deletions resources/functionalTests/block/59-do-while/input.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/* formatterSettingsOverride */
/* { "AblFormatter.blockFormatting": true}*/

do while (iTotal < 50 and not bDone) or (iTotal > 100 and bDone):
iTotal = iTotal * 2.
END.
6 changes: 6 additions & 0 deletions resources/functionalTests/block/59-do-while/target.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/* formatterSettingsOverride */
/* { "AblFormatter.blockFormatting": true}*/

do while (iTotal < 50 and not bDone) or (iTotal > 100 and bDone):
iTotal = iTotal * 2.
END.
11 changes: 11 additions & 0 deletions resources/functionalTests/block/60-class/input.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/* formatterSettingsOverride */
/* { "AblFormatter.blockFormatting": true}*/

class WackyWorld.FunFactory.ServerCommand.SillyDanceCommand abstract inherits ProStuff: define static variable BananaFunction as char no-undo.
define protected override property GroovyCommandName as char no-undo
get():
return "jazzytool".
end.
set.

end class.
12 changes: 12 additions & 0 deletions resources/functionalTests/block/60-class/target.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/* formatterSettingsOverride */
/* { "AblFormatter.blockFormatting": true}*/

class WackyWorld.FunFactory.ServerCommand.SillyDanceCommand abstract inherits ProStuff:
define static variable BananaFunction as char no-undo.
define protected override property GroovyCommandName as char no-undo
get():
return "jazzytool".
end.
set.

end class.
4 changes: 3 additions & 1 deletion resources/functionalTests/for/8each-label/input.p
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
define variable i as integer no-undo.

Label:


for each Customer:
message Customer.Id.
end.
end.
13 changes: 13 additions & 0 deletions resources/functionalTests/for/9each-label/input.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* formatterSettingsOverride */
/* { "AblFormatter.forFormatting": true}*/


chicFiles: FOR EACH stylishFile ON ERROR UNDO, THROW:
DO ON ERROR UNDO, THROW:
NEXT chicFiles.
END.

IF fashionAnnotations:Count > 0 THEN DO:
NEXT chicFiles.
END.
END.
14 changes: 14 additions & 0 deletions resources/functionalTests/for/9each-label/target.p
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* formatterSettingsOverride */
/* { "AblFormatter.forFormatting": true}*/


chicFiles:
FOR EACH stylishFile ON ERROR UNDO, THROW:
DO ON ERROR UNDO, THROW:
NEXT chicFiles.
END.

IF fashionAnnotations:Count > 0 THEN DO:
NEXT chicFiles.
END.
END.
199 changes: 119 additions & 80 deletions resources/stabilityTests/_failures.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,103 +2,36 @@ adecomm_aud-tts.i
adecomm_dswid.i
adecomm_peditor.i
adecomm_xmlschema.p
adecomm_xmlwidg.i
adecomm__dswidfunc.p
adecomm__pweditor.i
adecomm__reg2ini.p
adedict_FLD__dfltgat.p
adedict_FLD__fldgate.p
adedict_IDX__newidx.p
adeedit__winrsz.p
aderes_aderes.p
aderes_j-table2.p
aderes_l-verify.p
aderes_s-exp.p
aderesc__read.p
adeshar__cntrapi.p
adeshar__mchgi.p
adeuib_ide_request__requestmanager.cls
adeshar__mchgi.i
adeuib_sookver.i
adeuib_ttobject.i
adeuib_vrfyimp.i
adeuib__cuelist.w
adeuib__edtmenu.p
adeuib__genmult.p
adeuib__rdproc.p
adeuib__rsz_wp.p
adeuib__seresz.p
adeuib__ttyedit.p
adeuib__ttyss.i
adeuib__tview.w
adeweb_rdproc.i
adeweb__rddefs.p
adexml__xmlview.w
adm2_support_filterd.w
adm2_support_folderd.w
adm2_widgetprto.i
auditing_include__xmlsec.i
auditing_sdo__audfieldpolicysdo.w
auditing_sdo__audfilepolicysdo.w
auditing_src_adm2_widgetprto.i
auditing_ttdefs__audeventpolicytt.i
auditing_ttdefs__audeventtt.i
auditing_ttdefs__audfieldpolicytt.i
auditing_ttdefs__audfilepolicytt.i
auditing_ttdefs__audpolicytt.i
corelib_OpenEdge_Core_Collections_AbstractTTCollection.cls
netlib_OpenEdge_Web_DataObject_Writer_FieldElementWriter.cls
OpenEdge_DataAdmin_Binding_CreateContext.cls
OpenEdge_DataAdmin_Binding_Query_AreaExtentQuery.cls
OpenEdge_DataAdmin_Binding_Query_SchemaPartitionQuery.cls
OpenEdge_DataAdmin_Binding_SequenceValueContext.cls
OpenEdge_DataAdmin_Core_JSONLoader.cls
OpenEdge_DataAdmin_DataAccess_AllFileData.cls
OpenEdge_DataAdmin_DataFileList.cls
OpenEdge_DataAdmin_DataSource_IndexDataSource.cls
OpenEdge_DataAdmin_DataSource_UserPermissionDataSource.cls
OpenEdge_DataAdmin_ExtentList.cls
OpenEdge_DataAdmin_IndexFieldList.cls
OpenEdge_DataAdmin_IPartitionCollection.cls
OpenEdge_DataAdmin_ITable.cls
OpenEdge_DataAdmin_IUserTablePermission.cls
OpenEdge_DataAdmin_Lang_QueryString.cls
OpenEdge_DataAdmin_Message_IFetchRequest.cls
OpenEdge_DataAdmin_Message_ISaveRequest.cls
OpenEdge_DataAdmin_Message_ITableRequest.cls
OpenEdge_DataAdmin_PartitionPolicyField.cls
OpenEdge_DataAdmin_Rest_RestRequest.cls
OpenEdge_DataAdmin_ServerCommand_ProstrctAddOnlineCommand.cls
OpenEdge_DataAdmin_TenantTypes.cls
OpenEdge_DataAdmin_Util_CDCTrackingHelper.cls
OpenEdge_DataAdmin_Util_dbCanMigrate.p
OpenEdge_DataAdmin_Util_ITableImportUtility.cls
prodict_dictsplt.i
prodict_dictsrch.i
prodict_dump__dmpincr.p
prodict_dump__dmpsec.p
prodict_dump__dmputil.p
prodict_dump__lodsddl.p
prodict_dump__lodsec.p
prodict_gate_gatework.i
prodict_gate__gat_cro.p
prodict_gate__gat_nam.p
prodict_mss__mss_pul.p
prodict_odb__odb_pul.p
prodict_ora__ora_typ.p
prodict_pro__pro_fld.p
prodict_sec_sec-pol.i
prodict_user__usrtget.p
prohelp_keyword.p
prores_a-fast.p
prores_a-write.p
prores_c-edit.i
prores_l-guess.p
prores_l-verify.p
prores_l-write.p
prores_q-join.p
prores_r-ft.p
prores_r-main.p
prores_r-write.i
prores_reslang_t-a-dan.p
prores_reslang_t-a-fr7.p
prores_reslang_t-a-fre.p
Expand All @@ -124,20 +57,126 @@ prores_reslang_t-r-fre.p
prores_reslang_t-s-eng.p
prores_reslang_t-s-fr7.p
prores_reslang_t-s-fre.p
prores_s-gen2.i
prores_s-info.p
prores_s-order.p
prores_t-i-eng.p
prores_t-s-eng.p
prores_u-export.p
prores_u-load.p
protools__dblist.w
protools__scrcap.w
protools__session.w
protools__v89conv.w
web_examples_w-custdir.w
webtools_util__dirlist.w
workshop_dirnode.i
workshop_rdproc.i
workshop__methlib.w
workshop__rdproc.p
adexml__xmlview.w
//0046 issues -->
ablunit_OpenEdge_ABLUnit_Runner_ABLRunner.cls
adecomm__assign-wid.w
adecomm__auddat.p
adecomm__auddfilt.p
adecomm__auddtl.p
adecomm__cust-flt.p
adecomm__dbconng.w
adecomm__disconn.p
adecomm__getfdbs.p
adecomm__getwidobjs.w
adecomm__qtbldat.p
adedesk_menus.i
adedict_DB__getdbs.p
adedict_FLD_fldvar.i
adedict_gateproc.i
adedict_SEQ_seqvar.i
adedict_TBL_tblvar.i
aderes_c-header.p
aderes_j-both.p
aderes_j-field1.p
aderes_j-field2.p
aderes_j-table1.p
aderes_j-table2.p
aderes_r-header.p
aderes_y-total.p
aderes__aicdir.p
adeshar_qurydefs.i
adeshar__qenable.p
adeuib_brwscols.i
adeuib_layout.i
adeuib_uibmdefs.i
adeuib__attr-ed.w
adeuib__chkrlnk.i
adeuib__convertadm2dynamics.w
adeuib__cr_palette.p
adeuib__seprocs.i
adeuib__tabedit.w
adeuib__tempdb.w
adeuib__ttmaint.w
adeuib__widgetidassign.w
adm_samples_b-cuslkp.w
adm_samples_b-linord.w
adm_samples_itemsel.w
adm_support_filtedit.w
adm_support_folderd.w
adm_support_sortedit.w
adm_support__so-attr.w
adm_template_browser.w
adm_template_wbrowser.w
adm2_support_brouter.w
adm2_support_folderd.w
adm2_support__so-attr.w
adm2_template_browser.w
businesscomponents_OpenEdge_BusinessLogic_Filter_AblFilterParser.cls
corelib_OpenEdge_Core_DataTypeHelper.cls
corelib_OpenEdge_Core_Json_JsonConverter.cls
corelib_OpenEdge_Core_Util_leakobject.i
corelib_OpenEdge_Logging_Format_AnonymizedTokenFormat.cls
corelib_OpenEdge_Logging_Format_LogMessageTokenResolver.cls
netlib_OpenEdge_Net_HTTP_Filter_Payload_MultipartFormBodyWriter.cls
netlib_OpenEdge_Net_URI.cls
netlib_OpenEdge_Web_DataObject_OperationHandler.cls
netlib_OpenEdge_Web_DataObject_Writer_OpenAPI30ServiceWriter.cls
netlib_OpenEdge_Web_Logging_WebRequestTokenResolver.cls
OpenEdge_DataAdmin_Binding_ExtentContext.cls
OpenEdge_DataAdmin_Binding_TableContext.cls
OpenEdge_DataAdmin_ServerCommand_TableDataCommand.cls
prodict_aud__aud-pol.p
prodict_dump__dmpdefs.p
prodict_dump__lodaudp.p
prodict_gate__gat_cmp.p
prodict_gate__gat_ini.p
prodict_gate__gat_row.p
prodict_gate__snd_sql.i
prodict_gate__snd_sql.p
prodict_gui__guiuchg.p
prodict_misc__cdc-pol.p
prodict_misc__db-id-hst.p
prodict_misc__db-id-mnt.p
prodict_mss_key_check.i
prodict_mss_key_clust.i
prodict_mss_key_default.i
prodict_mss_key_modcheck.i
prodict_mss_key_modclus.i
prodict_mss_key_moddef.i
prodict_mss_key_moduni.i
prodict_mss_key_unique.i
prodict_mss__mssschg.p
prodict_mss__mss_md2.p
prodict_odb__odb_fld.p
prodict_odb__odb_md1.p
prodict_odb__odb_md2.p
prodict_ora_key_check.i
prodict_ora_key_modcheck.i
prodict_ora_key_moduni.i
prodict_ora_key_unique.i
prodict_ora__ora_lkg.p
prodict_ora__ora_lkz.p
prodict_ora__ora_md1.p
prodict_sec__sec-gen-key.p
prodict_user_usermenu.i
prodict_user__usrichg.p
prodict_user__usrschg.p
prodict_user__usrsdel.p
prodict__dctgues.p
prodict__dctsget.p
protools_as-partn.w
protools__procfg.w
protools__v89conv.w
seclib_OpenEdge_Security_Provider_UserTableAuthProvider.cls
serveradmin_OpenEdge_ApplicationServer_Util_convert_spring_properties.p
template_tty-dial.w
web_examples_w-cstinf.w
web_examples_w-cststa.w
workshop_objects.i
//0046 issues <--
Binary file modified resources/tree-sitter-abl.wasm
Binary file not shown.
Loading
Loading