From 8d267ee17a6acb95afbe9cf57c56e97b5e1fe4d5 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Sun, 26 Feb 2023 16:25:12 +0100 Subject: [PATCH] update abapmerge (#6086) --- package.json | 12 ++++++------ test/abap_transpile.json | 5 +---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index a50401263..d21d0e1de 100644 --- a/package.json +++ b/package.json @@ -26,12 +26,12 @@ ] }, "devDependencies": { - "@abaplint/cli": "^2.95.23", - "@abaplint/database-sqlite": "^2.5.0", - "@abaplint/runtime": "^2.5.4", - "@abaplint/transpiler-cli": "^2.5.4", - "abapmerge": "^0.14.8", + "@abaplint/cli": "^2.95.25", + "@abaplint/database-sqlite": "^2.5.4", + "@abaplint/runtime": "^2.5.5", + "@abaplint/transpiler-cli": "^2.5.5", + "abapmerge": "^0.14.9", "c8": "^7.13.0", - "eslint": "^8.34.0" + "eslint": "^8.35.0" } } diff --git a/test/abap_transpile.json b/test/abap_transpile.json index 179c23719..e4d6d5c5b 100644 --- a/test/abap_transpile.json +++ b/test/abap_transpile.json @@ -70,6 +70,7 @@ "addFilenames": true, "addCommonJS": true, "unknownTypes": "runtimeError", + "keywords": ["return", "in", "class"], "extraSetup": "../test/setup.mjs", "skip": [ {"object": "ZCX_ABAPGIT_EXCEPTION", "class": "ltcl_get_t100_longtext", "method": "test01", "note": "implement function module DOCU_GET, open-abap"}, @@ -100,11 +101,7 @@ {"object": "ZCL_ABAPGIT_PERSIST_PACKAGES", "class": "ltcl_packages", "method": "test_package", "note": "ZABAPGIT table not existing, error cx_sy_dynamic_osql_semantics"}, - {"object": "ZCL_ABAPGIT_AJSON", "class": "ltcl_serializer_test", "method": "escape_string", "note": "ASSERT failed, ??"}, {"object": "ZCL_ABAPGIT_AJSON", "class": "ltcl_json_to_abap", "method": "to_abap_array_of_arrays", "note": "Expected table to contain 2 rows, got 4"}, - {"object": "ZCL_ABAPGIT_AJSON", "class": "ltcl_writer_test", "method": "set_tab_hashed", "note": "Expected table to contain 4 rows, got 3"}, - {"object": "ZCL_ABAPGIT_AJSON", "class": "ltcl_integrated", "method": "reader", "note": "Path not found @/false, keywords?"}, - {"object": "ZCL_ABAPGIT_AJSON", "class": "ltcl_writer_test", "method": "setx_float", "note": "DecFloat34"}, {"object": "ZCL_ABAPGIT_REQUIREMENT_HELPER", "class": "ltcl_lower_release", "method": "empty_patch", "note": "Void type: CVERS_SDU"}, {"object": "ZCL_ABAPGIT_REQUIREMENT_HELPER", "class": "ltcl_lower_release", "method": "lower_patch", "note": "Void type: CVERS_SDU"},