From 03724484f1bbc3428f02f13338b6a73e509d2833 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Wed, 23 Sep 2020 12:28:13 +0200 Subject: [PATCH] use boolc (#3920) --- abaplint.json | 2 ++ src/apack/zcl_abapgit_apack_migration.clas.abap | 7 ++----- src/objects/zcl_abapgit_object_ddls.clas.abap | 6 +----- src/objects/zcl_abapgit_object_oa2p.clas.abap | 6 +----- src/objects/zcl_abapgit_object_sprx.clas.abap | 6 +----- src/objects/zcl_abapgit_object_vcls.clas.abap | 6 +----- src/objects/zcl_abapgit_object_wdcc.clas.abap | 6 +----- src/objects/zcl_abapgit_object_xslt.clas.abap | 6 +----- src/objects/zcl_abapgit_objects_program.clas.abap | 6 +----- src/syntax/zcl_abapgit_syntax_highlighter.clas.abap | 6 +----- src/ui/zcl_abapgit_popups.clas.abap | 6 +----- src/utils/zcl_abapgit_adt_link.clas.abap | 6 +----- src/zcl_abapgit_merge.clas.abap | 6 +----- 13 files changed, 15 insertions(+), 60 deletions(-) diff --git a/abaplint.json b/abaplint.json index 527085962..deca4558b 100644 --- a/abaplint.json +++ b/abaplint.json @@ -72,6 +72,8 @@ "globalMacros": [] }, "rules": { + "prefer_is_not": false, + "use_bool_expression": true, "check_subrc": false, "cyclomatic_complexity": { "max": 25 diff --git a/src/apack/zcl_abapgit_apack_migration.clas.abap b/src/apack/zcl_abapgit_apack_migration.clas.abap index 5a11bc226..835958e4f 100644 --- a/src/apack/zcl_abapgit_apack_migration.clas.abap +++ b/src/apack/zcl_abapgit_apack_migration.clas.abap @@ -206,11 +206,8 @@ CLASS zcl_abapgit_apack_migration IMPLEMENTATION. FIELD-SYMBOLS: TYPE i. ASSIGN ('ZIF_APACK_MANIFEST')=>('CO_INTERFACE_VERSION') TO . - IF IS ASSIGNED AND >= c_apack_interface_version. - rv_interface_valid = abap_true. - ELSE. - rv_interface_valid = abap_false. - ENDIF. + rv_interface_valid = boolc( IS ASSIGNED + AND >= c_apack_interface_version ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_ddls.clas.abap b/src/objects/zcl_abapgit_object_ddls.clas.abap index 10d81c2bd..da3bdaf9d 100644 --- a/src/objects/zcl_abapgit_object_ddls.clas.abap +++ b/src/objects/zcl_abapgit_object_ddls.clas.abap @@ -260,11 +260,7 @@ CLASS ZCL_ABAPGIT_OBJECT_DDLS IMPLEMENTATION. get_state = 'A' IMPORTING got_state = lv_state. - IF lv_state IS INITIAL. - rv_bool = abap_false. - ELSE. - rv_bool = abap_true. - ENDIF. + rv_bool = boolc( NOT ( lv_state IS INITIAL ) ). CATCH cx_root. rv_bool = abap_false. ENDTRY. diff --git a/src/objects/zcl_abapgit_object_oa2p.clas.abap b/src/objects/zcl_abapgit_object_oa2p.clas.abap index a95058df3..52ab460ac 100644 --- a/src/objects/zcl_abapgit_object_oa2p.clas.abap +++ b/src/objects/zcl_abapgit_object_oa2p.clas.abap @@ -236,11 +236,7 @@ CLASS zcl_abapgit_object_oa2p IMPLEMENTATION. enq = lt_locks. " Number of chosen lock entries - IF lv_lock_number > 0. - rv_is_locked = abap_true. - ELSE. - rv_is_locked = abap_false. - ENDIF. + rv_is_locked = boolc( lv_lock_number > 0 ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_sprx.clas.abap b/src/objects/zcl_abapgit_object_sprx.clas.abap index 1e7a0b66e..3bd4b960a 100644 --- a/src/objects/zcl_abapgit_object_sprx.clas.abap +++ b/src/objects/zcl_abapgit_object_sprx.clas.abap @@ -296,11 +296,7 @@ CLASS ZCL_ABAPGIT_OBJECT_SPRX IMPLEMENTATION. status = lv_status status_text = lv_status_text ). - IF lv_status = if_proxy=>c_state_active. - rv_bool = abap_true. - ELSE. - rv_bool = abap_false. - ENDIF. + rv_bool = boolc( lv_status = if_proxy=>c_state_active ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_vcls.clas.abap b/src/objects/zcl_abapgit_object_vcls.clas.abap index ba98aa79d..bb6c25e08 100644 --- a/src/objects/zcl_abapgit_object_vcls.clas.abap +++ b/src/objects/zcl_abapgit_object_vcls.clas.abap @@ -172,12 +172,8 @@ CLASS ZCL_ABAPGIT_OBJECT_VCLS IMPLEMENTATION. SELECT SINGLE changedate INTO lv_changedate FROM vcldir WHERE vclname = ms_item-obj_name. - IF lv_changedate IS NOT INITIAL. * see logic in function module VIEWCLUSTER_GET_DEFINITION - rv_active = abap_true. - ELSE. - rv_active = abap_false. - ENDIF. + rv_active = boolc( lv_changedate IS NOT INITIAL ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_wdcc.clas.abap b/src/objects/zcl_abapgit_object_wdcc.clas.abap index fb2868f0a..b7141c26c 100644 --- a/src/objects/zcl_abapgit_object_wdcc.clas.abap +++ b/src/objects/zcl_abapgit_object_wdcc.clas.abap @@ -301,11 +301,7 @@ CLASS ZCL_ABAPGIT_OBJECT_WDCC IMPLEMENTATION. ENDIF. DESCRIBE TABLE lt_enq LINES lv_lines. - IF lv_lines > 0. - rv_is_locked = abap_true. - ELSE. - rv_is_locked = abap_false. - ENDIF. + rv_is_locked = boolc( lv_lines > 0 ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_xslt.clas.abap b/src/objects/zcl_abapgit_object_xslt.clas.abap index 31324be57..2fa20eca3 100644 --- a/src/objects/zcl_abapgit_object_xslt.clas.abap +++ b/src/objects/zcl_abapgit_object_xslt.clas.abap @@ -155,11 +155,7 @@ CLASS ZCL_ABAPGIT_OBJECT_XSLT IMPLEMENTATION. lv_name = ms_item-obj_name. rv_bool = cl_o2_api_xsltdesc=>exists( lv_name ). - IF rv_bool = '1'. - rv_bool = abap_true. - ELSE. - rv_bool = abap_false. - ENDIF. + rv_bool = boolc( rv_bool = '1' ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_objects_program.clas.abap b/src/objects/zcl_abapgit_objects_program.clas.abap index d1ea380d6..2b0d69d8b 100644 --- a/src/objects/zcl_abapgit_objects_program.clas.abap +++ b/src/objects/zcl_abapgit_objects_program.clas.abap @@ -430,11 +430,7 @@ CLASS zcl_abapgit_objects_program IMPLEMENTATION. SELECT SINGLE progname FROM reposrc INTO lv_progname WHERE progname = is_progdir-name AND r3state = 'A'. - IF sy-subrc = 0. - lv_exists = abap_true. - ELSE. - lv_exists = abap_false. - ENDIF. + lv_exists = boolc( sy-subrc = 0 ). IF lv_exists = abap_true. zcl_abapgit_language=>set_current_language( mv_language ). diff --git a/src/syntax/zcl_abapgit_syntax_highlighter.clas.abap b/src/syntax/zcl_abapgit_syntax_highlighter.clas.abap index 62735dbe2..a47c6cc9b 100644 --- a/src/syntax/zcl_abapgit_syntax_highlighter.clas.abap +++ b/src/syntax/zcl_abapgit_syntax_highlighter.clas.abap @@ -208,11 +208,7 @@ CLASS ZCL_ABAPGIT_SYNTAX_HIGHLIGHTER IMPLEMENTATION. "/^\s+$/ lv_whitespace = ` ` && cl_abap_char_utilities=>horizontal_tab && cl_abap_char_utilities=>cr_lf. - IF iv_string CO lv_whitespace. - rv_result = abap_true. - ELSE. - rv_result = abap_false. - ENDIF. + rv_result = boolc( iv_string CO lv_whitespace ). ENDMETHOD. diff --git a/src/ui/zcl_abapgit_popups.clas.abap b/src/ui/zcl_abapgit_popups.clas.abap index fba076c7f..66e63361d 100644 --- a/src/ui/zcl_abapgit_popups.clas.abap +++ b/src/ui/zcl_abapgit_popups.clas.abap @@ -1018,11 +1018,7 @@ CLASS ZCL_ABAPGIT_POPUPS IMPLEMENTATION. p_object_data = es_package_data EXCEPTIONS action_cancelled = 1. - IF sy-subrc = 0. - ev_create = abap_true. - ELSE. - ev_create = abap_false. - ENDIF. + ev_create = boolc( sy-subrc = 0 ). ENDMETHOD. diff --git a/src/utils/zcl_abapgit_adt_link.clas.abap b/src/utils/zcl_abapgit_adt_link.clas.abap index 2c798dbf4..932821675 100644 --- a/src/utils/zcl_abapgit_adt_link.clas.abap +++ b/src/utils/zcl_abapgit_adt_link.clas.abap @@ -190,11 +190,7 @@ CLASS ZCL_ABAPGIT_ADT_LINK IMPLEMENTATION. RECEIVING result = lv_vit_wb_request. - IF lv_vit_wb_request = abap_true. - rv_is_adt_jump_possible = abap_false. - ELSE. - rv_is_adt_jump_possible = abap_true. - ENDIF. + rv_is_adt_jump_possible = boolc( NOT ( lv_vit_wb_request = abap_true ) ). CATCH cx_root. zcx_abapgit_exception=>raise( 'ADT Jump Error' ). diff --git a/src/zcl_abapgit_merge.clas.abap b/src/zcl_abapgit_merge.clas.abap index 06b43341d..10700f1af 100644 --- a/src/zcl_abapgit_merge.clas.abap +++ b/src/zcl_abapgit_merge.clas.abap @@ -375,11 +375,7 @@ CLASS ZCL_ABAPGIT_MERGE IMPLEMENTATION. METHOD has_conflicts. - IF lines( mt_conflicts ) > 0. - rv_conflicts_exists = abap_true. - ELSE. - rv_conflicts_exists = abap_false. - ENDIF. + rv_conflicts_exists = boolc( lines( mt_conflicts ) > 0 ). ENDMETHOD.