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 highlighting in case of back quotes (#6059)

Browse Source 
Co-authored-by: Lars Hvam <larshp@hotmail.com>
This commit is contained in:
Marc Bernard 2023-02-10 09:47:57 +01:00 committed by GitHub
parent 762b0dd3bd
commit b4a2a49cb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 125 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/syntax/zcl_abapgit_syntax_css.clas.abap
View File

@ -20,47 +20,47 @@ CLASS zcl_abapgit_syntax_css DEFINITION
CONSTANTS: CONSTANTS:
BEGIN OF c_css, BEGIN OF c_css,
keyword TYPE string VALUE 'keyword', "#EC NOTEXT keyword TYPE string VALUE 'keyword',
text TYPE string VALUE 'text', "#EC NOTEXT text TYPE string VALUE 'text',
comment TYPE string VALUE 'comment', "#EC NOTEXT comment TYPE string VALUE 'comment',
selectors TYPE string VALUE 'selectors', "#EC NOTEXT selectors TYPE string VALUE 'selectors',
units TYPE string VALUE 'units', "#EC NOTEXT units TYPE string VALUE 'units',
properties TYPE string VALUE 'properties', "#EC NOTEXT properties TYPE string VALUE 'properties',
values TYPE string VALUE 'values', "#EC NOTEXT values TYPE string VALUE 'values',
functions TYPE string VALUE 'functions', "#EC NOTEXT functions TYPE string VALUE 'functions',
colors TYPE string VALUE 'colors', "#EC NOTEXT colors TYPE string VALUE 'colors',
extensions TYPE string VALUE 'extensions', "#EC NOTEXT extensions TYPE string VALUE 'extensions',
at_rules TYPE string VALUE 'at_rules', "#EC NOTEXT at_rules TYPE string VALUE 'at_rules',
html TYPE string VALUE 'html', "#EC NOTEXT html TYPE string VALUE 'html',
END OF c_css . END OF c_css .
CONSTANTS: CONSTANTS:
BEGIN OF c_token, BEGIN OF c_token,
keyword TYPE c VALUE 'K', "#EC NOTEXT keyword TYPE c VALUE 'K',
text TYPE c VALUE 'T', "#EC NOTEXT text TYPE c VALUE 'T',
comment TYPE c VALUE 'C', "#EC NOTEXT comment TYPE c VALUE 'C',
selectors TYPE c VALUE 'S', "#EC NOTEXT selectors TYPE c VALUE 'S',
units TYPE c VALUE 'U', "#EC NOTEXT units TYPE c VALUE 'U',
properties TYPE c VALUE 'P', "#EC NOTEXT properties TYPE c VALUE 'P',
values TYPE c VALUE 'V', "#EC NOTEXT values TYPE c VALUE 'V',
functions TYPE c VALUE 'F', "#EC NOTEXT functions TYPE c VALUE 'F',
colors TYPE c VALUE 'Z', "#EC NOTEXT colors TYPE c VALUE 'Z',
extensions TYPE c VALUE 'E', "#EC NOTEXT extensions TYPE c VALUE 'E',
at_rules TYPE c VALUE 'A', "#EC NOTEXT at_rules TYPE c VALUE 'A',
html TYPE c VALUE 'H', "#EC NOTEXT html TYPE c VALUE 'H',
END OF c_token . END OF c_token .
CONSTANTS: CONSTANTS:
BEGIN OF c_regex, BEGIN OF c_regex,
" comments /* ... */ " comments /* ... */
comment TYPE string VALUE '\/\*.*\*\/|\/\*|\*\/', "#EC NOTEXT comment TYPE string VALUE '\/\*.*\*\/|\/\*|\*\/',
" single or double quoted strings " single or double quoted strings
text TYPE string VALUE '("[^"]*")|(''[^'']*'')', "#EC NOTEXT text TYPE string VALUE '("[^"]*")|(''[^'']*'')|(`[^`]*`)',
" in general keywords don't contain numbers (except -ms-scrollbar-3dlight-color) " in general keywords don't contain numbers (except -ms-scrollbar-3dlight-color)
keyword TYPE string VALUE '\b[a-z3@\-]+\b', "#EC NOTEXT keyword TYPE string VALUE '\b[a-z3@\-]+\b',
" selectors begin with : " selectors begin with :
selectors TYPE string VALUE ':[:a-z]+\b', "#EC NOTEXT selectors TYPE string VALUE ':[:a-z]+\b',
" units " units
units TYPE string units TYPE string
VALUE '\b[0-9\. ]+(ch|cm|em|ex|in|mm|pc|pt|px|vh|vmax|vmin|vw)\b|\b[0-9\. ]+%', "#EC NOTEXT VALUE '\b[0-9\. ]+(ch|cm|em|ex|in|mm|pc|pt|px|vh|vmax|vmin|vw)\b|\b[0-9\. ]+%',
END OF c_regex . END OF c_regex .
CLASS-METHODS class_constructor . CLASS-METHODS class_constructor .

22
src/syntax/zcl_abapgit_syntax_js.clas.abap
View File

@ -11,26 +11,26 @@ CLASS zcl_abapgit_syntax_js DEFINITION
" 2) Variable types " 2) Variable types
" 3) HTML Tags " 3) HTML Tags
BEGIN OF c_css, BEGIN OF c_css,
keyword TYPE string VALUE 'keyword', "#EC NOTEXT keyword TYPE string VALUE 'keyword',
text TYPE string VALUE 'text', "#EC NOTEXT text TYPE string VALUE 'text',
comment TYPE string VALUE 'comment', "#EC NOTEXT comment TYPE string VALUE 'comment',
variables TYPE string VALUE 'variables', "#EC NOTEXT variables TYPE string VALUE 'variables',
END OF c_css . END OF c_css .
CONSTANTS: CONSTANTS:
BEGIN OF c_token, BEGIN OF c_token,
keyword TYPE c VALUE 'K', "#EC NOTEXT keyword TYPE c VALUE 'K',
text TYPE c VALUE 'T', "#EC NOTEXT text TYPE c VALUE 'T',
comment TYPE c VALUE 'C', "#EC NOTEXT comment TYPE c VALUE 'C',
variables TYPE c VALUE 'V', "#EC NOTEXT variables TYPE c VALUE 'V',
END OF c_token . END OF c_token .
CONSTANTS: CONSTANTS:
BEGIN OF c_regex, BEGIN OF c_regex,
" comments /* ... */ or // " comments /* ... */ or //
comment TYPE string VALUE '\/\*.*\*\/|\/\*|\*\/|\/\/', "#EC NOTEXT comment TYPE string VALUE '\/\*.*\*\/|\/\*|\*\/|\/\/',
" single or double quoted strings " single or double quoted strings
text TYPE string VALUE '"|''', "#EC NOTEXT text TYPE string VALUE '"|''|`',
" in general keywords don't contain numbers (except -ms-scrollbar-3dlight-color) " in general keywords don't contain numbers (except -ms-scrollbar-3dlight-color)
keyword TYPE string VALUE '\b[a-z-]+\b', "#EC NOTEXT keyword TYPE string VALUE '\b[a-z-]+\b',
END OF c_regex . END OF c_regex .
CLASS-METHODS class_constructor . CLASS-METHODS class_constructor .

24
src/syntax/zcl_abapgit_syntax_xml.clas.abap
View File

@ -7,27 +7,27 @@ CLASS zcl_abapgit_syntax_xml DEFINITION
CONSTANTS: CONSTANTS:
BEGIN OF c_css, BEGIN OF c_css,
xml_tag TYPE string VALUE 'xml_tag', "#EC NOTEXT xml_tag TYPE string VALUE 'xml_tag',
attr TYPE string VALUE 'attr', "#EC NOTEXT attr TYPE string VALUE 'attr',
attr_val TYPE string VALUE 'attr_val', "#EC NOTEXT attr_val TYPE string VALUE 'attr_val',
comment TYPE string VALUE 'comment', "#EC NOTEXT comment TYPE string VALUE 'comment',
END OF c_css . END OF c_css .
CONSTANTS: CONSTANTS:
BEGIN OF c_token, BEGIN OF c_token,
xml_tag TYPE c VALUE 'X', "#EC NOTEXT xml_tag TYPE c VALUE 'X',
attr TYPE c VALUE 'A', "#EC NOTEXT attr TYPE c VALUE 'A',
attr_val TYPE c VALUE 'V', "#EC NOTEXT attr_val TYPE c VALUE 'V',
comment TYPE c VALUE 'C', "#EC NOTEXT comment TYPE c VALUE 'C',
END OF c_token . END OF c_token .
CONSTANTS: CONSTANTS:
BEGIN OF c_regex, BEGIN OF c_regex,
"for XML tags, we will use a submatch "for XML tags, we will use a submatch
" main pattern includes quoted strings so we can ignore < and > in attr values " main pattern includes quoted strings so we can ignore < and > in attr values
xml_tag TYPE string VALUE '(?:"[^"]*")|(?:''[^'']*'')|([<>])', "#EC NOTEXT xml_tag TYPE string VALUE '(?:"[^"]*")|(?:''[^'']*'')|(?:`[^`]*`)|([<>])',
attr TYPE string VALUE '(?:^|\s)[-a-z:_0-9]+\s*(?==\s*["|''])', "#EC NOTEXT attr TYPE string VALUE '(?:^|\s)[-a-z:_0-9]+\s*(?==\s*["|''|`])',
attr_val TYPE string VALUE '("[^"]*")|(''[^'']*'')', "#EC NOTEXT attr_val TYPE string VALUE '("[^"]*")|(''[^'']*'')|(`[^`]*`)',
" comments <!-- ... --> " comments <!-- ... -->
comment TYPE string VALUE '[\<]!--.*--[\>]|[\<]!--|--[\>]', "#EC NOTEXT comment TYPE string VALUE '[\<]!--.*--[\>]|[\<]!--|--[\>]',
END OF c_regex . END OF c_regex .
METHODS constructor . METHODS constructor .

82
src/syntax/zcl_abapgit_syntax_xml.clas.testclasses.abap
View File

@ -160,14 +160,15 @@ CLASS ltcl_syntax_cases DEFINITION FINAL FOR TESTING RISK LEVEL HARMLESS
iv_offset TYPE i iv_offset TYPE i
iv_length TYPE i iv_length TYPE i
iv_text_tag TYPE string, iv_text_tag TYPE string,
test_xml_01 FOR TESTING, test_xml_01 FOR TESTING,
test_xml_02 FOR TESTING, test_xml_02 FOR TESTING,
test_xml_03 FOR TESTING, test_xml_03 FOR TESTING,
test_xml_04 FOR TESTING, test_xml_04 FOR TESTING,
test_xml_05 FOR TESTING, test_xml_05 FOR TESTING,
test_xml_06 FOR TESTING, test_xml_06 FOR TESTING,
test_xml_07 FOR TESTING, test_xml_07 FOR TESTING,
test_xml_08 FOR TESTING. test_xml_08 FOR TESTING,
test_xml_09 FOR TESTING.
ENDCLASS. ENDCLASS.
*----------------------------------------------------------------------* *----------------------------------------------------------------------*
@ -689,7 +690,6 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD test_xml_08. METHOD test_xml_08.
"invalid XML characters in a string "invalid XML characters in a string
DATA lv_line TYPE string. DATA lv_line TYPE string.
@ -733,4 +733,68 @@ CLASS ltcl_syntax_cases IMPLEMENTATION.
ENDMETHOD. ENDMETHOD.
METHOD test_xml_09.
"back quotes used for attribute values (HTML)
DATA lv_line TYPE string.
lv_line = '<tag attribute=`value`/>'.
" Generate table with expected values after parsing
generate_parse( iv_token = 'X'
iv_offset = 0
iv_length = 1 ).
generate_parse( iv_token = 'A'
iv_offset = 4
iv_length = 10 ).
generate_parse( iv_token = 'V'
iv_offset = 15
iv_length = 7 ).
generate_parse( iv_token = 'X'
iv_offset = 23
iv_length = 1 ).
" Generate table with expected values after ordering
generate_order( iv_token = 'X'
iv_offset = 0
iv_length = 4
iv_text_tag = '<' ).
generate_order( iv_token = 'A'
iv_offset = 4
iv_length = 10
iv_text_tag = '' ).
generate_order( iv_token = 'V'
iv_offset = 15
iv_length = 7
iv_text_tag = '' ).
generate_order( iv_token = 'X'
iv_offset = 22
iv_length = 2
iv_text_tag = '>' ).
" Generate table with expected values after extending
generate_extend( iv_token = 'X'
iv_offset = 0
iv_length = 4
iv_text_tag = '<' ).
generate_extend( iv_token = 'A'
iv_offset = 4
iv_length = 10
iv_text_tag = '' ).
generate_extend( iv_token = '.'
iv_offset = 14
iv_length = 1
iv_text_tag = '' ).
generate_extend( iv_token = 'V'
iv_offset = 15
iv_length = 7
iv_text_tag = '' ).
generate_extend( iv_token = 'X'
iv_offset = 22
iv_length = 2
iv_text_tag = '>' ).
do_test( lv_line ).
ENDMETHOD.
ENDCLASS. ENDCLASS.