From 46d0d597ca9ae5f57c268ea12f02bac00990e65c Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 26 Oct 2023 10:29:10 -0400 Subject: [PATCH] Clean-up `double_spaces` (3) (#6576) --- abaplint.json | 2 +- src/objects/zcl_abapgit_object_aifc.clas.abap | 14 +++++----- src/objects/zcl_abapgit_object_area.clas.abap | 4 +-- src/objects/zcl_abapgit_object_bdef.clas.abap | 2 +- src/objects/zcl_abapgit_object_iasp.clas.abap | 4 +-- src/objects/zcl_abapgit_object_iobj.clas.abap | 4 +-- src/objects/zcl_abapgit_object_odso.clas.abap | 28 +++++++++---------- src/objects/zcl_abapgit_object_otgr.clas.abap | 2 +- src/objects/zcl_abapgit_object_smtg.clas.abap | 2 +- src/objects/zcl_abapgit_object_sobj.clas.abap | 6 ++-- src/objects/zcl_abapgit_object_tran.clas.abap | 2 +- src/objects/zcl_abapgit_object_udmo.clas.abap | 23 ++++++++------- src/objects/zcl_abapgit_object_ueno.clas.abap | 2 +- src/objects/zcl_abapgit_object_wdcc.clas.abap | 22 +++++++-------- 14 files changed, 58 insertions(+), 59 deletions(-) diff --git a/abaplint.json b/abaplint.json index 5640b048d..6771f66fe 100644 --- a/abaplint.json +++ b/abaplint.json @@ -446,10 +446,10 @@ "unnecessary_pragma": { "allowNoTextGlobal": true }, + "double_space": true, "whitespace_end": true }, "targetRules": { - "double_space": true, "select_add_order_by": { "skipForAllEntries": true }, diff --git a/src/objects/zcl_abapgit_object_aifc.clas.abap b/src/objects/zcl_abapgit_object_aifc.clas.abap index d54e2940a..4a558ec62 100644 --- a/src/objects/zcl_abapgit_object_aifc.clas.abap +++ b/src/objects/zcl_abapgit_object_aifc.clas.abap @@ -233,7 +233,7 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. METHOD zif_abapgit_object~changed_by. - DATA lx_dyn_call_error TYPE REF TO cx_sy_dyn_call_error. + DATA lx_dyn_call_error TYPE REF TO cx_sy_dyn_call_error. DATA ls_icd_data_key TYPE ty_icd_data_key. ls_icd_data_key-depl_scenario = ms_icd_data_key-depl_scenario. @@ -305,7 +305,7 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. CLEAR lr_tabledescr. lr_structdescr ?= cl_abap_typedescr=>describe_by_name( p_name = lr_content->tabname ). - lr_tabledescr = cl_abap_tabledescr=>create( p_line_type = lr_structdescr ). + lr_tabledescr = cl_abap_tabledescr=>create( p_line_type = lr_structdescr ). CREATE DATA lr_table TYPE HANDLE lr_tabledescr. ASSIGN lr_table->* TO . @@ -327,19 +327,19 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. ASSIGN COMPONENT 'NS' OF STRUCTURE TO . IF IS ASSIGNED. ls_ifkey-ns = . - UNASSIGN . + UNASSIGN . ENDIF. ASSIGN COMPONENT 'IFNAME' OF STRUCTURE TO . IF IS ASSIGNED. ls_ifkey-ifname = . - UNASSIGN . + UNASSIGN . ENDIF. ASSIGN COMPONENT 'IFVERSION' OF STRUCTURE TO . IF IS ASSIGNED. ls_ifkey-ifver = . - UNASSIGN . + UNASSIGN . ENDIF. ENDIF. @@ -481,7 +481,7 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. TRY. - ASSIGN lr_data TO . + ASSIGN lr_data TO . IF NOT IS ASSIGNED. RETURN. ENDIF. @@ -561,7 +561,7 @@ CLASS zcl_abapgit_object_aifc IMPLEMENTATION. DATA: lx_root TYPE REF TO cx_root. lr_structdescr ?= cl_abap_typedescr=>describe_by_name( p_name = '/AIF/T_FINF' ). - lr_tabledescr = cl_abap_tabledescr=>create( p_line_type = lr_structdescr ). + lr_tabledescr = cl_abap_tabledescr=>create( p_line_type = lr_structdescr ). CREATE DATA lr_table TYPE HANDLE lr_tabledescr. ASSIGN lr_table->* TO . diff --git a/src/objects/zcl_abapgit_object_area.clas.abap b/src/objects/zcl_abapgit_object_area.clas.abap index 0a3f69b21..af7efe0de 100644 --- a/src/objects/zcl_abapgit_object_area.clas.abap +++ b/src/objects/zcl_abapgit_object_area.clas.abap @@ -59,7 +59,7 @@ CLASS zcl_abapgit_object_area IMPLEMENTATION. lr_area TYPE REF TO object. io_xml->read( EXPORTING iv_name = 'NODENAME' - CHANGING cg_data = lv_nodename ). + CHANGING cg_data = lv_nodename ). io_xml->read( EXPORTING iv_name = 'PARENTNAME' CHANGING cg_data = lv_parentname ). @@ -261,7 +261,7 @@ CLASS zcl_abapgit_object_area IMPLEMENTATION. ASSIGN COMPONENT 'PARENTNAME' OF STRUCTURE TO . io_xml->add( iv_name = 'NODENAME' - ig_data = ms_item-obj_name ). + ig_data = ms_item-obj_name ). io_xml->add( iv_name = 'PARENTNAME' ig_data = ). diff --git a/src/objects/zcl_abapgit_object_bdef.clas.abap b/src/objects/zcl_abapgit_object_bdef.clas.abap index 302263647..75ce4373a 100644 --- a/src/objects/zcl_abapgit_object_bdef.clas.abap +++ b/src/objects/zcl_abapgit_object_bdef.clas.abap @@ -248,7 +248,7 @@ CLASS zcl_abapgit_object_bdef IMPLEMENTATION. CREATE OBJECT ro_object_data TYPE ('CL_BLUE_SOURCE_OBJECT_DATA'). - ro_object_data->set_data( p_data = ). + ro_object_data->set_data( p_data = ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_iasp.clas.abap b/src/objects/zcl_abapgit_object_iasp.clas.abap index 5f3d4cbaa..964455bdd 100644 --- a/src/objects/zcl_abapgit_object_iasp.clas.abap +++ b/src/objects/zcl_abapgit_object_iasp.clas.abap @@ -107,11 +107,11 @@ CLASS zcl_abapgit_object_iasp IMPLEMENTATION. w3_api_set_attributes( ii_service = li_service - is_attributes = is_attr ). + is_attributes = is_attr ). w3_api_set_parameters( ii_service = li_service - it_parameters = it_parameters ). + it_parameters = it_parameters ). w3_api_save( li_service ). diff --git a/src/objects/zcl_abapgit_object_iobj.clas.abap b/src/objects/zcl_abapgit_object_iobj.clas.abap index ea8a82797..5238f2523 100644 --- a/src/objects/zcl_abapgit_object_iobj.clas.abap +++ b/src/objects/zcl_abapgit_object_iobj.clas.abap @@ -240,7 +240,7 @@ CLASS zcl_abapgit_object_iobj IMPLEMENTATION. zcx_abapgit_exception=>raise( |Error when activating iobj: { ls_return-message }| ). ENDIF. - CATCH cx_sy_dyn_call_illegal_func. + CATCH cx_sy_dyn_call_illegal_func. zcx_abapgit_exception=>raise( |Necessary BW function modules not found| ). ENDTRY. @@ -324,7 +324,7 @@ CLASS zcl_abapgit_object_iobj IMPLEMENTATION. DATA: lv_object TYPE eqegraarg. - lv_object = ms_item-obj_name. + lv_object = ms_item-obj_name. OVERLAY lv_object WITH ' '. lv_object = lv_object && '*'. diff --git a/src/objects/zcl_abapgit_object_odso.clas.abap b/src/objects/zcl_abapgit_object_odso.clas.abap index 177fd1261..75727088d 100644 --- a/src/objects/zcl_abapgit_object_odso.clas.abap +++ b/src/objects/zcl_abapgit_object_odso.clas.abap @@ -146,26 +146,26 @@ CLASS zcl_abapgit_object_odso IMPLEMENTATION. zcx_abapgit_exception=>raise( |ODSO is not supported on this system| ). ENDTRY. - ASSIGN lr_details->* TO . + ASSIGN lr_details->* TO . ASSIGN lr_infoobjects->* TO . - ASSIGN lr_navigation->* TO . - ASSIGN lr_indexes->* TO . - ASSIGN lr_index_iobj->* TO . + ASSIGN lr_navigation->* TO . + ASSIGN lr_indexes->* TO . + ASSIGN lr_index_iobj->* TO . io_xml->read( EXPORTING iv_name = 'ODSO' CHANGING cg_data = ). io_xml->read( EXPORTING iv_name = 'INFOOBJECTS' - CHANGING cg_data = ). + CHANGING cg_data = ). io_xml->read( EXPORTING iv_name = 'NAVIGATION' - CHANGING cg_data = ). + CHANGING cg_data = ). io_xml->read( EXPORTING iv_name = 'INDEXES' - CHANGING cg_data = ). + CHANGING cg_data = ). io_xml->read( EXPORTING iv_name = 'INDEX_IOBJ' - CHANGING cg_data = ). + CHANGING cg_data = ). TRY. ASSIGN COMPONENT 'ODSOBJECT' OF STRUCTURE TO . @@ -196,7 +196,7 @@ CLASS zcl_abapgit_object_odso IMPLEMENTATION. return = lt_return. ENDIF. - CATCH cx_sy_dyn_call_illegal_func. + CATCH cx_sy_dyn_call_illegal_func. zcx_abapgit_exception=>raise( |Necessary BW function modules not found or object not supported| ). ENDTRY. @@ -284,7 +284,7 @@ CLASS zcl_abapgit_object_odso IMPLEMENTATION. DATA: lv_object TYPE eqegraarg. - lv_object = ms_item-obj_name. + lv_object = ms_item-obj_name. OVERLAY lv_object WITH ' '. lv_object = lv_object && '*'. @@ -336,11 +336,11 @@ CLASS zcl_abapgit_object_odso IMPLEMENTATION. zcx_abapgit_exception=>raise( |ODSO is not supported on this system| ). ENDTRY. - ASSIGN lr_details->* TO . + ASSIGN lr_details->* TO . ASSIGN lr_infoobjects->* TO . - ASSIGN lr_navigation->* TO . - ASSIGN lr_indexes->* TO . - ASSIGN lr_index_iobj->* TO . + ASSIGN lr_navigation->* TO . + ASSIGN lr_indexes->* TO . + ASSIGN lr_index_iobj->* TO . lv_dsonam = ms_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_otgr.clas.abap b/src/objects/zcl_abapgit_object_otgr.clas.abap index 03b011aa5..32e505362 100644 --- a/src/objects/zcl_abapgit_object_otgr.clas.abap +++ b/src/objects/zcl_abapgit_object_otgr.clas.abap @@ -142,7 +142,7 @@ CLASS zcl_abapgit_object_otgr IMPLEMENTATION. IF IS ASSIGNED. io_xml->read( EXPORTING iv_name = 'PARENTS' - CHANGING cg_data = ). + CHANGING cg_data = ). LOOP AT ASSIGNING . ASSIGN COMPONENT 'ACTIVATION_STATE' OF STRUCTURE TO . diff --git a/src/objects/zcl_abapgit_object_smtg.clas.abap b/src/objects/zcl_abapgit_object_smtg.clas.abap index 255f4b300..6b1098c52 100644 --- a/src/objects/zcl_abapgit_object_smtg.clas.abap +++ b/src/objects/zcl_abapgit_object_smtg.clas.abap @@ -70,7 +70,7 @@ CLASS zcl_abapgit_object_smtg IMPLEMENTATION. zcx_abapgit_exception=>raise( |SMTG not supported| ). ENDIF. - ls_component-name = iv_fielname. + ls_component-name = iv_fielname. ls_component-type ?= lo_typedescr. INSERT ls_component INTO TABLE ct_components. diff --git a/src/objects/zcl_abapgit_object_sobj.clas.abap b/src/objects/zcl_abapgit_object_sobj.clas.abap index 56974169d..9d662f581 100644 --- a/src/objects/zcl_abapgit_object_sobj.clas.abap +++ b/src/objects/zcl_abapgit_object_sobj.clas.abap @@ -100,7 +100,7 @@ CLASS zcl_abapgit_object_sobj IMPLEMENTATION. METHOD is_locked. - rv_is_locked = boolc( is_objtype_locked( ) = abap_true OR is_program_locked( ) = abap_true ). + rv_is_locked = boolc( is_objtype_locked( ) = abap_true OR is_program_locked( ) = abap_true ). ENDMETHOD. @@ -134,7 +134,7 @@ CLASS zcl_abapgit_object_sobj IMPLEMENTATION. DATA lv_progname TYPE progname. rv_is_locked = abap_false. - lv_progname = get_program( ). + lv_progname = get_program( ). IF lv_progname IS NOT INITIAL. CALL FUNCTION 'ENQUEUE_ESRDIRE' @@ -226,7 +226,7 @@ CLASS zcl_abapgit_object_sobj IMPLEMENTATION. METHOD zif_abapgit_object~is_locked. - rv_is_locked = is_locked( ). + rv_is_locked = is_locked( ). ENDMETHOD. diff --git a/src/objects/zcl_abapgit_object_tran.clas.abap b/src/objects/zcl_abapgit_object_tran.clas.abap index 73f774b91..10fca1b9d 100644 --- a/src/objects/zcl_abapgit_object_tran.clas.abap +++ b/src/objects/zcl_abapgit_object_tran.clas.abap @@ -710,7 +710,7 @@ CLASS zcl_abapgit_object_tran IMPLEMENTATION. lv_dynpro = ls_tstc-dypno. - IF ls_tstc-cinfo O lc_hex_rep. + IF ls_tstc-cinfo O lc_hex_rep. lv_type = c_variant_type-report. ELSEIF ls_tstc-cinfo O lc_hex_obj. lv_type = c_variant_type-object. diff --git a/src/objects/zcl_abapgit_object_udmo.clas.abap b/src/objects/zcl_abapgit_object_udmo.clas.abap index 1e00da501..c230b3217 100644 --- a/src/objects/zcl_abapgit_object_udmo.clas.abap +++ b/src/objects/zcl_abapgit_object_udmo.clas.abap @@ -169,7 +169,7 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item + super->constructor( is_item = is_item iv_language = iv_language ). @@ -261,8 +261,8 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. INTO ls_header-tdversion FROM dokhl WHERE id = c_lxe_text_type - AND object = mv_text_object - AND langu = ls_udmo_long_text-language. + AND object = mv_text_object + AND langu = ls_udmo_long_text-language. " Increment the version ls_header-tdversion = ls_header-tdversion + 1. @@ -335,9 +335,9 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. SELECT SINGLE * FROM dm40t INTO ls_dm40t - WHERE sprache = ls_udmo_text-sprache - AND dmoid = ls_udmo_text-dmoid - AND as4local = mv_activation_state. + WHERE sprache = ls_udmo_text-sprache + AND dmoid = ls_udmo_text-dmoid + AND as4local = mv_activation_state. IF sy-subrc = 0. " There is already an active description for this language @@ -454,7 +454,7 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. FROM dm40t INTO TABLE lt_udmo_languages WHERE dmoid = mv_data_model - AND as4local = mv_activation_state + AND as4local = mv_activation_state ORDER BY sprache ASCENDING. "#EC CI_NOFIRST " For every language for which a short text is maintained, @@ -510,7 +510,7 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. FROM dm40l INTO ls_dm40l WHERE dmoid = mv_data_model - AND as4local = mv_activation_state. + AND as4local = mv_activation_state. IF sy-subrc <> 0. @@ -542,7 +542,7 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. FROM dm40t INTO CORRESPONDING FIELDS OF TABLE lt_udmo_texts WHERE dmoid = mv_data_model - AND as4local = mv_activation_state + AND as4local = mv_activation_state ORDER BY sprache ASCENDING. "#EC CI_NOFIRST " You are reminded that descriptions in other languages do not have to be in existence. @@ -656,9 +656,8 @@ CLASS zcl_abapgit_object_udmo IMPLEMENTATION. " See Function Module SDU_MODEL_EXISTS - SELECT COUNT( * ) FROM dm40l - WHERE dmoid = mv_data_model - AND as4local = mv_activation_state. + SELECT COUNT( * ) FROM dm40l + WHERE dmoid = mv_data_model AND as4local = mv_activation_state. rv_bool = boolc( sy-subrc = 0 ). diff --git a/src/objects/zcl_abapgit_object_ueno.clas.abap b/src/objects/zcl_abapgit_object_ueno.clas.abap index 12a568365..b9fd202ff 100644 --- a/src/objects/zcl_abapgit_object_ueno.clas.abap +++ b/src/objects/zcl_abapgit_object_ueno.clas.abap @@ -137,7 +137,7 @@ CLASS zcl_abapgit_object_ueno IMPLEMENTATION. METHOD constructor. - super->constructor( is_item = is_item + super->constructor( is_item = is_item iv_language = iv_language ). mv_entity_id = is_item-obj_name. diff --git a/src/objects/zcl_abapgit_object_wdcc.clas.abap b/src/objects/zcl_abapgit_object_wdcc.clas.abap index 6d46e1a70..92b44f2c3 100644 --- a/src/objects/zcl_abapgit_object_wdcc.clas.abap +++ b/src/objects/zcl_abapgit_object_wdcc.clas.abap @@ -81,7 +81,7 @@ CLASS zcl_abapgit_object_wdcc IMPLEMENTATION. FIELD-SYMBOLS: TYPE any. io_xml->read( EXPORTING iv_name = 'CONFIG_ID' - CHANGING cg_data = ls_orig_config-config_id ). + CHANGING cg_data = ls_orig_config-config_id ). io_xml->read( EXPORTING iv_name = 'CONFIG_TYPE' CHANGING cg_data = ls_orig_config-config_type ). @@ -342,7 +342,7 @@ CLASS zcl_abapgit_object_wdcc IMPLEMENTATION. FIELD-SYMBOLS: TYPE any. io_xml->add( iv_name = 'OBJECT_NAME' - ig_data = ms_item-obj_name ). + ig_data = ms_item-obj_name ). ls_config_key-config_id = ms_item-obj_name+0(32). ls_config_key-config_type = ms_item-obj_name+32(2). @@ -365,43 +365,43 @@ CLASS zcl_abapgit_object_wdcc IMPLEMENTATION. ENDTRY. io_xml->add( iv_name = 'CONFIG_ID' - ig_data = ls_orig_config-config_id ). + ig_data = ls_orig_config-config_id ). io_xml->add( iv_name = 'CONFIG_TYPE' - ig_data = ls_orig_config-config_type ). + ig_data = ls_orig_config-config_type ). io_xml->add( iv_name = 'CONFIG_VAR' - ig_data = ls_orig_config-config_var ). + ig_data = ls_orig_config-config_var ). io_xml->add( iv_name = 'WDA_COMPONENT' - ig_data = ls_orig_config-component ). + ig_data = ls_orig_config-component ). ASSIGN COMPONENT 'CONFIG_IDPAR' OF STRUCTURE ls_orig_config TO . IF sy-subrc = 0. io_xml->add( iv_name = 'CONFIG_IDPAR' - ig_data = ). + ig_data = ). ENDIF. ASSIGN COMPONENT 'CONFIG_TYPEPAR' OF STRUCTURE ls_orig_config TO . IF sy-subrc = 0. io_xml->add( iv_name = 'CONFIG_TYPEPAR' - ig_data = ). + ig_data = ). ENDIF. ASSIGN COMPONENT 'CONFIG_VARPAR' OF STRUCTURE ls_orig_config TO . IF sy-subrc = 0. io_xml->add( iv_name = 'CONFIG_VARPAR' - ig_data = ). + ig_data = ). ENDIF. ASSIGN COMPONENT 'PARENT' OF STRUCTURE ls_orig_config TO . IF sy-subrc = 0. io_xml->add( iv_name = 'PARENT' - ig_data = ). + ig_data = ). ENDIF. io_xml->add( iv_name = 'RELID' - ig_data = ls_orig_config-relid ). + ig_data = ls_orig_config-relid ). lv_xml_string = zcl_abapgit_convert=>xstring_to_string_utf8( lv_xml_xstring ). IF lv_xml_string IS NOT INITIAL.