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

Fix syntax highlighter (#4238)

Browse Source 
- Fix regression XML highlighter
- Adjust UTs for syntax highlighter due to added keywords


Closes #4232

Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
Marc Bernard 2020-11-25 03:39:17 -05:00 committed by GitHub
parent 9d7212e820
commit 4a2752d467
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/syntax/zcl_abapgit_syntax_highlighter.clas.abap
View File

@ -118,7 +118,7 @@ CLASS zcl_abapgit_syntax_highlighter IMPLEMENTATION.
DATA lv_escaped TYPE string. DATA lv_escaped TYPE string.
lv_escaped = escape( val = iv_line lv_escaped = escape( val = iv_line
format = cl_abap_format=>e_html_text ). format = cl_abap_format=>e_html_attr ).
lv_escaped = show_hidden_chars( lv_escaped ). lv_escaped = show_hidden_chars( lv_escaped ).

64
src/syntax/zcl_abapgit_syntax_highlighter.clas.testclasses.abap
View File

@ -54,6 +54,8 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
METHOD do_test. METHOD do_test.
DATA: lt_matches_act TYPE zcl_abapgit_syntax_highlighter=>ty_match_tt, DATA: lt_matches_act TYPE zcl_abapgit_syntax_highlighter=>ty_match_tt,
ls_match LIKE LINE OF lt_matches_act,
lv_offs TYPE i,
lo_syntax TYPE REF TO zcl_abapgit_syntax_highlighter. lo_syntax TYPE REF TO zcl_abapgit_syntax_highlighter.
@ -83,6 +85,17 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
act = lt_matches_act act = lt_matches_act
msg = | Error during extending: { iv_line }| ). msg = | Error during extending: { iv_line }| ).
" Check consistency
lv_offs = 0.
LOOP AT lt_matches_act INTO ls_match.
IF ls_match-offset <> lv_offs.
cl_abap_unit_assert=>assert_equals( exp = lv_offs
act = ls_match-offset
msg = | Error during consistency check: { sy-tabix }| ).
ENDIF.
lv_offs = lv_offs + ls_match-length.
ENDLOOP.
ENDMETHOD. ENDMETHOD.
METHOD generate_parse. METHOD generate_parse.
@ -180,6 +193,9 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
generate_parse( iv_token = 'K' generate_parse( iv_token = 'K'
iv_offset = 18 iv_offset = 18
iv_length = 4 ). iv_length = 4 ).
generate_parse( iv_token = 'K'
iv_offset = 23
iv_length = 6 ).
" Generate table with expected values after ordering " Generate table with expected values after ordering
generate_order( iv_token = 'K' generate_order( iv_token = 'K'
@ -190,6 +206,10 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
iv_offset = 18 iv_offset = 18
iv_length = 4 iv_length = 4
iv_text_tag = '' ). iv_text_tag = '' ).
generate_order( iv_token = 'K'
iv_offset = 23
iv_length = 6
iv_text_tag = '' ).
" Generate table with expected values after extending " Generate table with expected values after extending
generate_extend( iv_token = 'K' generate_extend( iv_token = 'K'
@ -206,7 +226,15 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
iv_text_tag = '' ). iv_text_tag = '' ).
generate_extend( iv_token = '.' generate_extend( iv_token = '.'
iv_offset = 22 iv_offset = 22
iv_length = 8 iv_length = 1
iv_text_tag = '' ).
generate_extend( iv_token = 'K'
iv_offset = 23
iv_length = 6
iv_text_tag = '' ).
generate_extend( iv_token = '.'
iv_offset = 29
iv_length = 1
iv_text_tag = '' ). iv_text_tag = '' ).
do_test( iv_line = lv_line do_test( iv_line = lv_line
@ -310,6 +338,9 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
generate_parse( iv_token = 'K' generate_parse( iv_token = 'K'
iv_offset = 18 iv_offset = 18
iv_length = 4 ). iv_length = 4 ).
generate_parse( iv_token = 'K'
iv_offset = 23
iv_length = 6 ).
generate_parse( iv_token = 'K' generate_parse( iv_token = 'K'
iv_offset = 30 iv_offset = 30
iv_length = 5 ). iv_length = 5 ).
@ -332,6 +363,10 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
iv_offset = 18 iv_offset = 18
iv_length = 4 iv_length = 4
iv_text_tag = '' ). iv_text_tag = '' ).
generate_order( iv_token = 'K'
iv_offset = 23
iv_length = 6
iv_text_tag = '' ).
generate_order( iv_token = 'K' generate_order( iv_token = 'K'
iv_offset = 30 iv_offset = 30
iv_length = 5 iv_length = 5
@ -356,7 +391,15 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
iv_text_tag = '' ). iv_text_tag = '' ).
generate_extend( iv_token = '.' generate_extend( iv_token = '.'
iv_offset = 22 iv_offset = 22
iv_length = 8 iv_length = 1
iv_text_tag = '' ).
generate_extend( iv_token = 'K'
iv_offset = 23
iv_length = 6
iv_text_tag = '' ).
generate_extend( iv_token = '.'
iv_offset = 29
iv_length = 1
iv_text_tag = '' ). iv_text_tag = '' ).
generate_extend( iv_token = 'K' generate_extend( iv_token = 'K'
iv_offset = 30 iv_offset = 30
@ -396,6 +439,9 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
generate_parse( iv_token = 'T' generate_parse( iv_token = 'T'
iv_offset = 5 iv_offset = 5
iv_length = 1 ). iv_length = 1 ).
generate_parse( iv_token = 'K'
iv_offset = 7
iv_length = 1 ).
generate_parse( iv_token = 'T' generate_parse( iv_token = 'T'
iv_offset = 9 iv_offset = 9
iv_length = 1 ). iv_length = 1 ).
@ -417,6 +463,10 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
iv_offset = 4 iv_offset = 4
iv_length = 1 iv_length = 1
iv_text_tag = '|' ). iv_text_tag = '|' ).
generate_order( iv_token = 'K'
iv_offset = 7
iv_length = 1
iv_text_tag = '' ).
generate_order( iv_token = 'T' generate_order( iv_token = 'T'
iv_offset = 10 iv_offset = 10
iv_length = 1 iv_length = 1
@ -441,7 +491,15 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
iv_text_tag = '|' ). iv_text_tag = '|' ).
generate_extend( iv_token = '.' generate_extend( iv_token = '.'
iv_offset = 5 iv_offset = 5
iv_length = 5 iv_length = 2
iv_text_tag = '' ).
generate_extend( iv_token = 'K'
iv_offset = 7
iv_length = 1
iv_text_tag = '' ).
generate_extend( iv_token = '.'
iv_offset = 8
iv_length = 2
iv_text_tag = '' ). iv_text_tag = '' ).
generate_extend( iv_token = 'T' generate_extend( iv_token = 'T'
iv_offset = 10 iv_offset = 10