Merge branch 'main' into mbtools/view_tddat

This commit is contained in:
Marc Bernard 2024-10-21 16:56:54 -04:00 committed by GitHub
commit 9598098bae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 10 deletions

View File

@ -23,14 +23,14 @@
]
},
"devDependencies": {
"@abaplint/cli": "^2.113.6",
"@abaplint/database-sqlite": "^2.8.25",
"@abaplint/runtime": "^2.10.11",
"express": "^4.19.2",
"@abaplint/transpiler-cli": "^2.10.11",
"globals": "^15.9.0",
"abapmerge": "^0.16.0",
"@abaplint/cli": "^2.113.21",
"@abaplint/database-sqlite": "^2.10.20",
"@abaplint/runtime": "^2.10.20",
"express": "^4.21.1",
"@abaplint/transpiler-cli": "^2.10.20",
"globals": "^15.11.0",
"abapmerge": "^0.16.6",
"c8": "^10.1.2",
"eslint": "^9.9.1"
"eslint": "^9.12.0"
}
}

View File

@ -772,6 +772,7 @@ CLASS zcl_abapgit_object_fugr IMPLEMENTATION.
DATA lv_namespace TYPE rs38l-namespace.
DATA lv_function_group TYPE rs38l-area.
DATA lv_include TYPE rs38l-include.
DATA ls_item_key TYPE zif_abapgit_definitions=>ty_item.
rv_belongs_to_other_fugr = abap_false.
IF iv_include(1) = 'L' OR iv_include+1 CS '/L'.
@ -789,14 +790,22 @@ CLASS zcl_abapgit_object_fugr IMPLEMENTATION.
IF lv_function_group(1) = 'X'. " "EXIT"-function-module
ls_tadir-object = 'FUGS'.
ENDIF.
IF sy-subrc = 0.
CONCATENATE lv_namespace lv_function_group INTO ls_tadir-obj_name.
ls_item_key-obj_type = ls_tadir-object.
ls_item_key-obj_name = ls_tadir-obj_name.
" compare complete tadir key to distinguish between regular and exit function groups
IF ls_tadir-obj_name <> ms_item-obj_name OR ls_tadir-object <> ms_item-obj_type.
IF ( ls_tadir-obj_name <> ms_item-obj_name OR ls_tadir-object <> ms_item-obj_type ) AND
zcl_abapgit_objects=>exists( ls_item_key ) = abap_true.
rv_belongs_to_other_fugr = abap_true.
ENDIF.
ENDIF.
ENDIF.
ENDMETHOD.

View File

@ -90,7 +90,6 @@
"addFilenames": true,
"addCommonJS": true,
"unknownTypes": "runtimeError",
"keywords": ["return", "in", "class", "arguments"],
"extraSetup": "../test/setup.mjs",
"skip": [
{"object": "ZCX_ABAPGIT_EXCEPTION", "class": "ltcl_get_t100_longtext", "method": "test01", "note": "uses MSAG from database"},