From 1ca12015eb280087c8557f09a28199c1aa382f9d Mon Sep 17 00:00:00 2001 From: Marc Bernard <59966492+mbtools@users.noreply.github.com> Date: Thu, 9 Feb 2023 20:03:07 +0100 Subject: [PATCH] Refactor: replace newline/crlf with built-in (#6057) --- .../zcl_abapgit_background_push_au.clas.abap | 4 ++-- .../zcl_abapgit_background_push_fi.clas.abap | 4 ++-- src/objects/core/zcl_abapgit_objects_files.clas.abap | 6 +++--- .../zcl_abapgit_objects_files.clas.testclasses.abap | 2 +- src/objects/zcl_abapgit_object_wapa.clas.abap | 4 ++-- src/ui/lib/zcl_abapgit_html_form_utils.clas.abap | 10 +++++----- src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap | 6 +++--- src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.abap | 3 +-- src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.abap | 2 +- src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.abap | 4 ++-- src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap | 2 +- src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.abap | 2 +- src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap | 4 ++-- src/ui/routing/zcl_abapgit_services_git.clas.abap | 2 +- src/utils/zcl_abapgit_diff.clas.abap | 8 ++++---- src/utils/zcl_abapgit_diff.clas.testclasses.abap | 4 ++-- src/zif_abapgit_definitions.intf.abap | 2 -- 17 files changed, 33 insertions(+), 36 deletions(-) diff --git a/src/background/zcl_abapgit_background_push_au.clas.abap b/src/background/zcl_abapgit_background_push_au.clas.abap index 070f8ba2e..00caf36a8 100644 --- a/src/background/zcl_abapgit_background_push_au.clas.abap +++ b/src/background/zcl_abapgit_background_push_au.clas.abap @@ -60,7 +60,7 @@ CLASS zcl_abapgit_background_push_au IMPLEMENTATION. ELSE. rv_comment = 'BG: Multiple objects'. LOOP AT lt_objects INTO lv_str. - CONCATENATE rv_comment zif_abapgit_definitions=>c_newline lv_str INTO rv_comment. + CONCATENATE rv_comment cl_abap_char_utilities=>newline lv_str INTO rv_comment. ENDLOOP. ENDIF. @@ -202,7 +202,7 @@ CLASS zcl_abapgit_background_push_au IMPLEMENTATION. lo_stage->rm( iv_path = -path iv_filename = -filename ). - CONCATENATE ls_comment-comment zif_abapgit_definitions=>c_newline -filename + CONCATENATE ls_comment-comment cl_abap_char_utilities=>newline -filename INTO ls_comment-comment. ENDLOOP. diff --git a/src/background/zcl_abapgit_background_push_fi.clas.abap b/src/background/zcl_abapgit_background_push_fi.clas.abap index 77821d987..d1d49911e 100644 --- a/src/background/zcl_abapgit_background_push_fi.clas.abap +++ b/src/background/zcl_abapgit_background_push_fi.clas.abap @@ -32,7 +32,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_FI IMPLEMENTATION. +CLASS zcl_abapgit_background_push_fi IMPLEMENTATION. METHOD build_comment. @@ -56,7 +56,7 @@ CLASS ZCL_ABAPGIT_BACKGROUND_PUSH_FI IMPLEMENTATION. ELSE. rv_comment = 'BG: Multiple objects'. LOOP AT lt_objects INTO lv_str. - CONCATENATE rv_comment zif_abapgit_definitions=>c_newline lv_str INTO rv_comment. + CONCATENATE rv_comment cl_abap_char_utilities=>newline lv_str INTO rv_comment. ENDLOOP. ENDIF. diff --git a/src/objects/core/zcl_abapgit_objects_files.clas.abap b/src/objects/core/zcl_abapgit_objects_files.clas.abap index ad7797869..d71e892ee 100644 --- a/src/objects/core/zcl_abapgit_objects_files.clas.abap +++ b/src/objects/core/zcl_abapgit_objects_files.clas.abap @@ -123,9 +123,9 @@ CLASS zcl_abapgit_objects_files IMPLEMENTATION. ls_file TYPE zif_abapgit_git_definitions=>ty_file. - CONCATENATE LINES OF it_abap INTO lv_source SEPARATED BY zif_abapgit_definitions=>c_newline. + CONCATENATE LINES OF it_abap INTO lv_source SEPARATED BY cl_abap_char_utilities=>newline. * when editing files via eg. GitHub web interface it adds a newline at end of file - lv_source = lv_source && zif_abapgit_definitions=>c_newline. + lv_source = lv_source && cl_abap_char_utilities=>newline. ls_file-path = '/'. ls_file-filename = zcl_abapgit_filename_logic=>object_to_file( @@ -286,7 +286,7 @@ CLASS zcl_abapgit_objects_files IMPLEMENTATION. lv_abap = zcl_abapgit_convert=>xstring_to_string_utf8( lv_data ). - SPLIT lv_abap AT zif_abapgit_definitions=>c_newline INTO TABLE rt_abap. + SPLIT lv_abap AT cl_abap_char_utilities=>newline INTO TABLE rt_abap. ENDMETHOD. diff --git a/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap b/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap index 6dd8eacfe..7a7f08835 100644 --- a/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap +++ b/src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap @@ -50,7 +50,7 @@ CLASS ltcl_objects_files IMPLEMENTATION. " filenames are lower case APPEND INITIAL LINE TO lt_files ASSIGNING . -filename = 'zlf.prog.abap'. - -data = get_program_data( zif_abapgit_definitions=>c_newline ). + -data = get_program_data( cl_abap_char_utilities=>newline ). APPEND INITIAL LINE TO lt_files ASSIGNING . -filename = 'zlf.prog.xml'. -data = get_xml_data( ). diff --git a/src/objects/zcl_abapgit_object_wapa.clas.abap b/src/objects/zcl_abapgit_object_wapa.clas.abap index a2ca08f83..51eb5d877 100644 --- a/src/objects/zcl_abapgit_object_wapa.clas.abap +++ b/src/objects/zcl_abapgit_object_wapa.clas.abap @@ -171,7 +171,7 @@ CLASS zcl_abapgit_object_wapa IMPLEMENTATION. zcx_abapgit_exception=>raise( |WAPA - error from get_page_content| ). ENDIF. - CONCATENATE LINES OF lt_content INTO lv_string SEPARATED BY zif_abapgit_definitions=>c_newline RESPECTING BLANKS. + CONCATENATE LINES OF lt_content INTO lv_string SEPARATED BY cl_abap_char_utilities=>newline RESPECTING BLANKS. rv_content = zcl_abapgit_convert=>string_to_xstring_utf8( lv_string ). @@ -263,7 +263,7 @@ CLASS zcl_abapgit_object_wapa IMPLEMENTATION. lv_string = zcl_abapgit_convert=>xstring_to_string_utf8( iv_content ). - SPLIT lv_string AT zif_abapgit_definitions=>c_newline INTO TABLE rt_content. + SPLIT lv_string AT cl_abap_char_utilities=>newline INTO TABLE rt_content. ENDMETHOD. diff --git a/src/ui/lib/zcl_abapgit_html_form_utils.clas.abap b/src/ui/lib/zcl_abapgit_html_form_utils.clas.abap index 198aa6ae6..24c6ff0ad 100644 --- a/src/ui/lib/zcl_abapgit_html_form_utils.clas.abap +++ b/src/ui/lib/zcl_abapgit_html_form_utils.clas.abap @@ -133,8 +133,8 @@ CLASS zcl_abapgit_html_form_utils IMPLEMENTATION. ENDDO. ENDDO. ELSEIF -type = zif_abapgit_html_form=>c_field_type-textarea. - REPLACE ALL OCCURRENCES OF zif_abapgit_definitions=>c_crlf IN lv_value WITH ''. - REPLACE ALL OCCURRENCES OF zif_abapgit_definitions=>c_newline IN lv_value WITH ''. + REPLACE ALL OCCURRENCES OF cl_abap_char_utilities=>cr_lf IN lv_value WITH ''. + REPLACE ALL OCCURRENCES OF cl_abap_char_utilities=>newline IN lv_value WITH ''. rv_empty = boolc( lv_value IS INITIAL ). ELSE. rv_empty = boolc( lv_value IS INITIAL ). @@ -204,12 +204,12 @@ CLASS zcl_abapgit_html_form_utils IMPLEMENTATION. iv_key = |{ -name }-{ zif_abapgit_html_form=>c_rows }| iv_val = |{ lv_rows }| ). ELSEIF -type = zif_abapgit_html_form=>c_field_type-textarea. - REPLACE ALL OCCURRENCES OF zif_abapgit_definitions=>c_crlf IN lv_value - WITH zif_abapgit_definitions=>c_newline. + REPLACE ALL OCCURRENCES OF cl_abap_char_utilities=>cr_lf IN lv_value + WITH cl_abap_char_utilities=>newline. " Remove last line if empty (ie 2x newline) lv_len = strlen( lv_value ) - 2. - IF lv_len >= 0 AND lv_value+lv_len(1) = zif_abapgit_definitions=>c_newline. + IF lv_len >= 0 AND lv_value+lv_len(1) = cl_abap_char_utilities=>newline. lv_len = lv_len + 1. lv_value = lv_value(lv_len). ENDIF. diff --git a/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap index 0e41c9f5b..618c62671 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap @@ -114,7 +114,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION. +CLASS zcl_abapgit_gui_page_commit IMPLEMENTATION. METHOD branch_name_to_internal. @@ -488,9 +488,9 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_COMMIT IMPLEMENTATION. mo_form_data->to_abap( CHANGING cs_container = ms_commit ). REPLACE ALL OCCURRENCES - OF zif_abapgit_definitions=>c_crlf + OF cl_abap_char_utilities=>cr_lf IN ms_commit-body - WITH zif_abapgit_definitions=>c_newline. + WITH cl_abap_char_utilities=>newline. lv_new_branch_name = mo_form_data->get( c_id-new_branch_name ). " create new branch and commit to it if branch name is not empty diff --git a/src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.abap index 1bfb41726..8af8d2269 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.abap @@ -77,8 +77,7 @@ CLASS zcl_abapgit_gui_page_db_dis IMPLEMENTATION. METHOD render_record_banner. rv_html = || - && |
Type:{ is_key-type }
| - && zif_abapgit_definitions=>c_newline + && | { is_key-type }\n| && || && |
Key:{ is_key-value }
|. ENDMETHOD. diff --git a/src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.abap index 5791c08ce..88a34985b 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.abap @@ -122,7 +122,7 @@ CLASS zcl_abapgit_gui_page_merge_res IMPLEMENTATION. lv_merge_content = ii_event->form_data( )->get( 'MERGE_CONTENT' ). REPLACE ALL OCCURRENCES - OF zif_abapgit_definitions=>c_crlf IN lv_merge_content WITH zif_abapgit_definitions=>c_newline. + OF cl_abap_char_utilities=>cr_lf IN lv_merge_content WITH cl_abap_char_utilities=>newline. lv_new_file_content = zcl_abapgit_convert=>string_to_xstring_utf8( lv_merge_content ). diff --git a/src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.abap index 2201b7881..d7fcf73ed 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.abap @@ -77,7 +77,7 @@ ENDCLASS. -CLASS ZCL_ABAPGIT_GUI_PAGE_SETT_GLOB IMPLEMENTATION. +CLASS zcl_abapgit_gui_page_sett_glob IMPLEMENTATION. METHOD constructor. @@ -191,7 +191,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_SETT_GLOB IMPLEMENTATION. lt_proxy_bypass = mo_settings->get_proxy_bypass( ). LOOP AT lt_proxy_bypass INTO ls_proxy_bypass. - lv_val = lv_val && ls_proxy_bypass-low && zif_abapgit_definitions=>c_newline. + lv_val = lv_val && ls_proxy_bypass-low && cl_abap_char_utilities=>newline. ENDLOOP. mo_form_data->set( diff --git a/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap index 573ff0ca8..1c2a68a82 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap @@ -389,7 +389,7 @@ CLASS zcl_abapgit_gui_page_sett_info IMPLEMENTATION. CATCH zcx_abapgit_exception ##NO_HANDLER. ENDTRY. - SPLIT lv_code AT zif_abapgit_definitions=>c_newline INTO TABLE lt_code. + SPLIT lv_code AT cl_abap_char_utilities=>newline INTO TABLE lt_code. rs_info-line = lines( lt_code ). diff --git a/src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.abap index 80bbee715..960a77ab0 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.abap @@ -235,7 +235,7 @@ CLASS zcl_abapgit_gui_page_sett_repo IMPLEMENTATION. lv_ignore = concat_lines_of( table = ls_dot-ignore - sep = zif_abapgit_definitions=>c_newline ). + sep = cl_abap_char_utilities=>newline ). mo_form_data->set( iv_key = c_id-ignore diff --git a/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap index ebe75118b..83760a751 100644 --- a/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap +++ b/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap @@ -358,9 +358,9 @@ CLASS zcl_abapgit_gui_page_tags IMPLEMENTATION. mo_form_data->to_abap( CHANGING cs_container = ms_tag ). REPLACE ALL OCCURRENCES - OF zif_abapgit_definitions=>c_crlf + OF cl_abap_char_utilities=>cr_lf IN ms_tag-body - WITH zif_abapgit_definitions=>c_newline. + WITH cl_abap_char_utilities=>newline. ms_tag-name = zcl_abapgit_git_tag=>add_tag_prefix( ms_tag-name ). ASSERT ms_tag-name CP zif_abapgit_definitions=>c_git_branch-tags. diff --git a/src/ui/routing/zcl_abapgit_services_git.clas.abap b/src/ui/routing/zcl_abapgit_services_git.clas.abap index 080384a5d..2953255e7 100644 --- a/src/ui/routing/zcl_abapgit_services_git.clas.abap +++ b/src/ui/routing/zcl_abapgit_services_git.clas.abap @@ -81,7 +81,7 @@ CLASS zcl_abapgit_services_git IMPLEMENTATION. IF NOT is_commit-body IS INITIAL. CONCATENATE ls_comment-comment '' is_commit-body - INTO ls_comment-comment SEPARATED BY zif_abapgit_definitions=>c_newline. + INTO ls_comment-comment SEPARATED BY cl_abap_char_utilities=>newline. ENDIF. zcl_abapgit_exit=>get_instance( )->validate_before_push( diff --git a/src/utils/zcl_abapgit_diff.clas.abap b/src/utils/zcl_abapgit_diff.clas.abap index 63534934e..2115a8ecf 100644 --- a/src/utils/zcl_abapgit_diff.clas.abap +++ b/src/utils/zcl_abapgit_diff.clas.abap @@ -525,16 +525,16 @@ CLASS zcl_abapgit_diff IMPLEMENTATION. off = strlen( lv_old ) - 1 ). ENDIF. - IF lv_new_last = zif_abapgit_definitions=>c_newline AND lv_old_last <> zif_abapgit_definitions=>c_newline + IF lv_new_last = cl_abap_char_utilities=>newline AND lv_old_last <> cl_abap_char_utilities=>newline AND lv_old IS NOT INITIAL. lv_old = lv_old && cl_abap_char_utilities=>form_feed. - ELSEIF lv_new_last <> zif_abapgit_definitions=>c_newline AND lv_old_last = zif_abapgit_definitions=>c_newline + ELSEIF lv_new_last <> cl_abap_char_utilities=>newline AND lv_old_last = cl_abap_char_utilities=>newline AND lv_new IS NOT INITIAL. lv_new = lv_new && cl_abap_char_utilities=>form_feed. ENDIF. - SPLIT lv_new AT zif_abapgit_definitions=>c_newline INTO TABLE et_new. - SPLIT lv_old AT zif_abapgit_definitions=>c_newline INTO TABLE et_old. + SPLIT lv_new AT cl_abap_char_utilities=>newline INTO TABLE et_new. + SPLIT lv_old AT cl_abap_char_utilities=>newline INTO TABLE et_old. ENDMETHOD. ENDCLASS. diff --git a/src/utils/zcl_abapgit_diff.clas.testclasses.abap b/src/utils/zcl_abapgit_diff.clas.testclasses.abap index a08c0cefd..bbb649940 100644 --- a/src/utils/zcl_abapgit_diff.clas.testclasses.abap +++ b/src/utils/zcl_abapgit_diff.clas.testclasses.abap @@ -97,8 +97,8 @@ CLASS ltcl_diff IMPLEMENTATION. FIELD-SYMBOLS: LIKE LINE OF lt_diff. - CONCATENATE LINES OF mt_new INTO lv_new SEPARATED BY zif_abapgit_definitions=>c_newline. - CONCATENATE LINES OF mt_old INTO lv_old SEPARATED BY zif_abapgit_definitions=>c_newline. + CONCATENATE LINES OF mt_new INTO lv_new SEPARATED BY cl_abap_char_utilities=>newline. + CONCATENATE LINES OF mt_old INTO lv_old SEPARATED BY cl_abap_char_utilities=>newline. lv_xnew = zcl_abapgit_convert=>string_to_xstring_utf8( lv_new ). lv_xold = zcl_abapgit_convert=>string_to_xstring_utf8( lv_old ). diff --git a/src/zif_abapgit_definitions.intf.abap b/src/zif_abapgit_definitions.intf.abap index 617ad4a8a..56dde2f43 100644 --- a/src/zif_abapgit_definitions.intf.abap +++ b/src/zif_abapgit_definitions.intf.abap @@ -345,8 +345,6 @@ INTERFACE zif_abapgit_definitions dir TYPE ty_chmod VALUE '40000 ', submodule TYPE ty_chmod VALUE '160000', END OF c_chmod . - CONSTANTS c_crlf TYPE c LENGTH 2 VALUE cl_abap_char_utilities=>cr_lf ##NO_TEXT. - CONSTANTS c_newline TYPE c LENGTH 1 VALUE cl_abap_char_utilities=>newline ##NO_TEXT. CONSTANTS c_english TYPE spras VALUE 'E' ##NO_TEXT. CONSTANTS c_root_dir TYPE string VALUE '/' ##NO_TEXT. CONSTANTS c_dot_abapgit TYPE string VALUE '.abapgit.xml' ##NO_TEXT.