From dcc655eccf6138820596741ce1aec2fca7e65239 Mon Sep 17 00:00:00 2001 From: Lars Hvam Date: Tue, 25 Aug 2020 07:05:32 +0200 Subject: [PATCH] syntax check page, show variant used (#3790) * syntax check page, show variant used closes #3660 * unify variant rendering --- .../zcl_abapgit_gui_page_code_insp.clas.abap | 3 +-- .../zcl_abapgit_gui_page_codi_base.clas.abap | 19 +++++++++++++++++-- src/ui/zcl_abapgit_gui_page_syntax.clas.abap | 8 +++++--- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap b/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap index 2b7aff967..a03c91844 100644 --- a/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap @@ -186,8 +186,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_CODE_INSP IMPLEMENTATION. gui_services( )->get_hotkeys_ctl( )->register_hotkeys( me ). - ri_html->add( '
' ). - ri_html->add( |Code inspector check variant: { mv_check_variant }| ). + ri_html->add( render_variant( mv_check_variant ) ). IF lines( mt_result ) = 0. ri_html->add( '
' ). diff --git a/src/ui/zcl_abapgit_gui_page_codi_base.clas.abap b/src/ui/zcl_abapgit_gui_page_codi_base.clas.abap index efb9122b6..33efe71c0 100644 --- a/src/ui/zcl_abapgit_gui_page_codi_base.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_codi_base.clas.abap @@ -14,11 +14,15 @@ CLASS zcl_abapgit_gui_page_codi_base DEFINITION PUBLIC ABSTRACT INHERITING FROM sort_3 TYPE string VALUE 'sort_3' ##NO_TEXT, stage TYPE string VALUE 'stage' ##NO_TEXT, commit TYPE string VALUE 'commit' ##NO_TEXT, - END OF c_actions. - + END OF c_actions . DATA mo_repo TYPE REF TO zcl_abapgit_repo . DATA mt_result TYPE scit_alvlist . + METHODS render_variant + IMPORTING + !iv_variant TYPE sci_chkv + RETURNING + VALUE(ri_html) TYPE REF TO zif_abapgit_html . METHODS render_result IMPORTING !ii_html TYPE REF TO zif_abapgit_html @@ -260,6 +264,17 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_CODI_BASE IMPLEMENTATION. ENDMETHOD. + METHOD render_variant. + + CREATE OBJECT ri_html TYPE zcl_abapgit_html. + + ri_html->add( '
' ). + ri_html->add( |Code inspector check variant: { iv_variant }| ). + ri_html->add( `
` ). + + ENDMETHOD. + + METHOD zif_abapgit_gui_event_handler~on_event. DATA: ls_item TYPE zif_abapgit_definitions=>ty_item, ls_sub_item TYPE zif_abapgit_definitions=>ty_item, diff --git a/src/ui/zcl_abapgit_gui_page_syntax.clas.abap b/src/ui/zcl_abapgit_gui_page_syntax.clas.abap index b81da3721..633fcd668 100644 --- a/src/ui/zcl_abapgit_gui_page_syntax.clas.abap +++ b/src/ui/zcl_abapgit_gui_page_syntax.clas.abap @@ -17,6 +17,7 @@ CLASS zcl_abapgit_gui_page_syntax DEFINITION PUBLIC FINAL CREATE PUBLIC REDEFINITION. PROTECTED SECTION. + CONSTANTS: c_variant TYPE sci_chkv VALUE 'SYNTAX_CHECK'. METHODS: render_content REDEFINITION. @@ -64,17 +65,18 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_SYNTAX IMPLEMENTATION. ri_html->add( '
' ). + ri_html->add( render_variant( c_variant ) ). + IF lines( mt_result ) = 0. ri_html->add( '
' ). ri_html->add( zcl_abapgit_html=>icon( 'check' ) ). ri_html->add( 'No syntax errors' ). + ri_html->add( '
' ). ELSE. render_result( ii_html = ri_html it_result = mt_result ). ENDIF. - ri_html->add( '
' ). - ENDMETHOD. @@ -83,7 +85,7 @@ CLASS ZCL_ABAPGIT_GUI_PAGE_SYNTAX IMPLEMENTATION. DATA: li_syntax_check TYPE REF TO zif_abapgit_code_inspector. li_syntax_check = zcl_abapgit_factory=>get_code_inspector( mo_repo->get_package( ) ). - mt_result = li_syntax_check->run( 'SYNTAX_CHECK' ). + mt_result = li_syntax_check->run( c_variant ). ENDMETHOD.