SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-04-30 20:03:20 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactor: replace newline/crlf with built-in (#6057)

Browse Source
This commit is contained in:
Marc Bernard 2023-02-09 20:03:07 +01:00 committed by GitHub
parent f0fa964c25
commit 1ca12015eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
17 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/background/zcl_abapgit_background_push_au.clas.abap
View File

@ -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 = <ls_remote>-path
iv_filename = <ls_remote>-filename ).
CONCATENATE ls_comment-comment zif_abapgit_definitions=>c_newline <ls_remote>-filename
CONCATENATE ls_comment-comment cl_abap_char_utilities=>newline <ls_remote>-filename
INTO ls_comment-comment.
ENDLOOP.

4
src/background/zcl_abapgit_background_push_fi.clas.abap
View File

@ -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.

6
src/objects/core/zcl_abapgit_objects_files.clas.abap
View File

@ -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.

2
src/objects/core/zcl_abapgit_objects_files.clas.testclasses.abap
View File

@ -50,7 +50,7 @@ CLASS ltcl_objects_files IMPLEMENTATION.
" filenames are lower case
APPEND INITIAL LINE TO lt_files ASSIGNING <ls_files>.
<ls_files>-filename = 'zlf.prog.abap'.
<ls_files>-data = get_program_data( zif_abapgit_definitions=>c_newline ).
<ls_files>-data = get_program_data( cl_abap_char_utilities=>newline ).
APPEND INITIAL LINE TO lt_files ASSIGNING <ls_files>.
<ls_files>-filename = 'zlf.prog.xml'.
<ls_files>-data = get_xml_data( ).

4
src/objects/zcl_abapgit_object_wapa.clas.abap
View File

@ -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.

10
src/ui/lib/zcl_abapgit_html_form_utils.clas.abap
View File

@ -133,8 +133,8 @@ CLASS zcl_abapgit_html_form_utils IMPLEMENTATION.
ENDDO.
ENDDO.
ELSEIF <ls_field>-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 = |{ <ls_field>-name }-{ zif_abapgit_html_form=>c_rows }|
iv_val = |{ lv_rows }| ).
ELSEIF <ls_field>-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.

6
src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap
View File

@ -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

3
src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.abap
View File

@ -77,8 +77,7 @@ CLASS zcl_abapgit_gui_page_db_dis IMPLEMENTATION.
METHOD render_record_banner.
rv_html = |<table class="tag"><tr><td class="label">Type:</td>|
&& | <td>{ is_key-type }</td></tr></table>|
&& zif_abapgit_definitions=>c_newline
&& | <td>{ is_key-type }</td></tr></table>\n|
&& |<table class="tag"><tr><td class="label">Key:</td>|
&& | <td>{ is_key-value }</td></tr></table>|.
ENDMETHOD.

2
src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.abap
View File

@ -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 ).

4
src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.abap
View File

@ -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(

2
src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap
View File

@ -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 ).

2
src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.abap
View File

@ -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

4
src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap
View File

@ -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.

2
src/ui/routing/zcl_abapgit_services_git.clas.abap
View File

@ -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(

8
src/utils/zcl_abapgit_diff.clas.abap
View File

@ -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.

4
src/utils/zcl_abapgit_diff.clas.testclasses.abap
View File

@ -97,8 +97,8 @@ CLASS ltcl_diff IMPLEMENTATION.
FIELD-SYMBOLS: <ls_diff> 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 ).

2
src/zif_abapgit_definitions.intf.abap
View File

@ -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.