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

Fix indent of <pre> tags in HTML

Browse Source 
`<pre>...</pre>` sections do not render correctly since the HTML is indented, which leads to extra whitespace.

abapGit is not impacted but tooling on top of abapGit is.
This commit is contained in:
Marc Bernard 2024-12-17 19:06:07 +00:00
parent e16e3d3ac6
commit 80da05fd6a
1 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ui/core/zcl_abapgit_html.clas.abap
View File

@ -48,6 +48,7 @@ CLASS zcl_abapgit_html DEFINITION
within_style TYPE abap_bool, within_style TYPE abap_bool,
within_js TYPE abap_bool, within_js TYPE abap_bool,
within_textarea TYPE abap_bool, within_textarea TYPE abap_bool,
within_pre TYPE abap_bool,
indent TYPE i, indent TYPE i,
indent_str TYPE string, indent_str TYPE string,
END OF ty_indent_context . END OF ty_indent_context .
@ -59,6 +60,8 @@ CLASS zcl_abapgit_html DEFINITION
script_close TYPE abap_bool, script_close TYPE abap_bool,
textarea_open TYPE abap_bool, textarea_open TYPE abap_bool,
textarea_close TYPE abap_bool, textarea_close TYPE abap_bool,
pre_open TYPE abap_bool,
pre_close TYPE abap_bool,
tag_close TYPE abap_bool, tag_close TYPE abap_bool,
curly_close TYPE abap_bool, curly_close TYPE abap_bool,
openings TYPE i, openings TYPE i,
@ -85,7 +88,7 @@ ENDCLASS.
CLASS ZCL_ABAPGIT_HTML IMPLEMENTATION. CLASS zcl_abapgit_html IMPLEMENTATION.
METHOD checkbox. METHOD checkbox.
@ -120,10 +123,6 @@ CLASS ZCL_ABAPGIT_HTML IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD set_debug_mode.
gv_debug_mode = iv_mode.
ENDMETHOD.
METHOD create. METHOD create.
CREATE OBJECT ri_instance TYPE zcl_abapgit_html. CREATE OBJECT ri_instance TYPE zcl_abapgit_html.
IF iv_initial_chunk IS NOT INITIAL. IF iv_initial_chunk IS NOT INITIAL.
@ -181,6 +180,17 @@ CLASS ZCL_ABAPGIT_HTML IMPLEMENTATION.
RETURN. RETURN.
ENDIF. ENDIF.
" No indent for pre tags
IF ls_study-pre_open = abap_true.
cs_context-within_pre = abap_true.
RETURN.
ELSEIF ls_study-pre_close = abap_true.
cs_context-within_pre = abap_false.
RETURN.
ELSEIF cs_context-within_pre = abap_true.
RETURN.
ENDIF.
" First closing tag - shift back exceptionally " First closing tag - shift back exceptionally
IF ( ls_study-script_close = abap_true IF ( ls_study-script_close = abap_true
OR ls_study-style_close = abap_true OR ls_study-style_close = abap_true
@ -239,6 +249,11 @@ CLASS ZCL_ABAPGIT_HTML IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD set_debug_mode.
gv_debug_mode = iv_mode.
ENDMETHOD.
METHOD study_line. METHOD study_line.
DATA: lv_line TYPE string, DATA: lv_line TYPE string,
@ -309,6 +324,16 @@ CLASS ZCL_ABAPGIT_HTML IMPLEMENTATION.
ENDIF. ENDIF.
ENDIF. ENDIF.
" Pre (same assumptions as above)
IF is_context-within_pre = abap_true AND lv_len >= 5 AND lv_line(5) = '</PRE'.
rs_result-pre_close = abap_true.
ELSEIF is_context-within_pre = abap_false AND lv_len >= 4 AND lv_line(4) = '<PRE'.
FIND FIRST OCCURRENCE OF '</PRE' IN lv_line.
IF sy-subrc > 0. " Not found
rs_result-pre_open = abap_true.
ENDIF.
ENDIF.
ENDMETHOD. ENDMETHOD.