diff options
| author | Jean Abou-Samra <jean@abou-samra.fr> | 2023-04-17 20:14:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-17 20:14:42 +0200 |
| commit | fdf182a7af85b1deeeb637ca970d31935e7c9d52 (patch) | |
| tree | 1319d3dfc5591185a4e13e0d593b3b8fcfe41173 /tests | |
| parent | c5a2b23adaaadc08a7586a5eda72e9f7d6171012 (diff) | |
| download | pygments-git-fdf182a7af85b1deeeb637ca970d31935e7c9d52.tar.gz | |
Improve Java properties lexer (#2404)
Use special lexer rules for escapes; fixes catastrophic backtracking,
and highlights them too.
Fixes #2356
Diffstat (limited to 'tests')
4 files changed, 111 insertions, 20 deletions
diff --git a/tests/examplefiles/properties/java.properties b/tests/examplefiles/properties/java.properties index d5b594e3..bdd6b76a 100644 --- a/tests/examplefiles/properties/java.properties +++ b/tests/examplefiles/properties/java.properties @@ -4,7 +4,7 @@ Truth:Beauty Truth Beauty Truth :Beauty - + ! line continuations and escapes fruits apple, banana, pear, \ cantaloupe, watermelon, \ @@ -14,6 +14,8 @@ key = \ and value2\\ key\ 2 = value key\\ 3 = value3 +key \ + = value ! empty keys and edge cases key1 = @@ -22,3 +24,12 @@ key3 the value3 key4 the:value4 key5 the=value5 key6=the value6 + +! escapes in keys +key\ with\ spaces = value +key\nwith\nnewlines = value\nwith\nnewlines + + ! indented comment + +! line continuations do \ +not = work for comments diff --git a/tests/examplefiles/properties/java.properties.output b/tests/examplefiles/properties/java.properties.output index 0c1fdeeb..48225756 100644 --- a/tests/examplefiles/properties/java.properties.output +++ b/tests/examplefiles/properties/java.properties.output @@ -2,13 +2,17 @@ '\n' Text.Whitespace '# mixing spaces' Comment.Single -'\n\t' Text.Whitespace +'\n' Text.Whitespace + +'\t' Text.Whitespace 'Truth' Name.Attribute ' ' Text.Whitespace '=' Operator ' ' Text.Whitespace 'Beauty' Literal.String -'\n ' Text.Whitespace +'\n' Text.Whitespace + +' ' Text.Whitespace 'Truth' Name.Attribute ':' Operator 'Beauty' Literal.String @@ -23,18 +27,24 @@ ' ' Text.Whitespace ':' Operator 'Beauty' Literal.String -'\n \n' Text.Whitespace +'\n' Text.Whitespace + +'\n' Text.Whitespace '! line continuations and escapes' Comment.Single -'\n ' Text.Whitespace +'\n' Text.Whitespace + +' ' Text.Whitespace 'fruits' Name.Attribute ' ' Text.Whitespace 'apple, banana, pear, ' Literal.String -'\\' Text -'\n ' Text.Whitespace +'\\\n' Literal.String.Escape + +' ' Text.Whitespace 'cantaloupe, watermelon, ' Literal.String -'\\' Text -'\n ' Text.Whitespace +'\\\n' Literal.String.Escape + +' ' Text.Whitespace 'kiwi, mango' Literal.String '\n' Text.Whitespace @@ -42,25 +52,42 @@ ' ' Text.Whitespace '=' Operator ' ' Text.Whitespace -'\\' Text -'\n ' Text.Whitespace -'value1 \\\\' Literal.String -'\\' Text -'\n ' Text.Whitespace -'and value2\\\\' Literal.String +'\\\n' Literal.String.Escape + +' ' Text.Whitespace +'value1 ' Literal.String +'\\\\' Literal.String.Escape +'\\\n' Literal.String.Escape + +' ' Text.Whitespace +'and value2' Literal.String +'\\\\' Literal.String.Escape '\n' Text.Whitespace -'key\\ 2' Name.Attribute +'key' Name.Attribute +'\\ ' Literal.String.Escape +'2' Name.Attribute ' ' Text.Whitespace '=' Operator ' ' Text.Whitespace 'value' Literal.String '\n' Text.Whitespace -'key\\\\' Name.Attribute +'key' Name.Attribute +'\\\\' Literal.String.Escape ' ' Text.Whitespace '3 = value3' Literal.String -'\n\n' Text.Whitespace +'\n' Text.Whitespace + +'key' Name.Attribute +' ' Text.Whitespace +'\\\n' Literal.String.Escape + +' ' Text.Whitespace +'= value' Literal.String +'\n' Text.Whitespace + +'\n' Text.Whitespace '! empty keys and edge cases' Comment.Single '\n' Text.Whitespace @@ -92,3 +119,52 @@ '=' Operator 'the value6' Literal.String '\n' Text.Whitespace + +'\n' Text.Whitespace + +'! escapes in keys' Comment.Single +'\n' Text.Whitespace + +'key' Name.Attribute +'\\ ' Literal.String.Escape +'with' Name.Attribute +'\\ ' Literal.String.Escape +'spaces' Name.Attribute +' ' Text.Whitespace +'=' Operator +' ' Text.Whitespace +'value' Literal.String +'\n' Text.Whitespace + +'key' Name.Attribute +'\\n' Literal.String.Escape +'with' Name.Attribute +'\\n' Literal.String.Escape +'newlines' Name.Attribute +' ' Text.Whitespace +'=' Operator +' ' Text.Whitespace +'value' Literal.String +'\\n' Literal.String.Escape +'with' Literal.String +'\\n' Literal.String.Escape +'newlines' Literal.String +'\n' Text.Whitespace + +'\n' Text.Whitespace + +' ' Text.Whitespace +'! indented comment' Comment.Single +'\n' Text.Whitespace + +'\n' Text.Whitespace + +'! line continuations do \\' Comment.Single +'\n' Text.Whitespace + +'not' Name.Attribute +' ' Text.Whitespace +'=' Operator +' ' Text.Whitespace +'work for comments' Literal.String +'\n' Text.Whitespace diff --git a/tests/snippets/properties/test_escaped_space_in_value.txt b/tests/snippets/properties/test_escaped_space_in_value.txt index f76507f4..44772d8c 100644 --- a/tests/snippets/properties/test_escaped_space_in_value.txt +++ b/tests/snippets/properties/test_escaped_space_in_value.txt @@ -6,5 +6,7 @@ key = doubleword\ value ' ' Text.Whitespace '=' Operator ' ' Text.Whitespace -'doubleword\\ value' Literal.String +'doubleword' Literal.String +'\\ ' Literal.String.Escape +'value' Literal.String '\n' Text.Whitespace diff --git a/tests/snippets/properties/test_just_key_with_space.txt b/tests/snippets/properties/test_just_key_with_space.txt index 660c37ca..833fe405 100644 --- a/tests/snippets/properties/test_just_key_with_space.txt +++ b/tests/snippets/properties/test_just_key_with_space.txt @@ -2,5 +2,7 @@ just\ key ---tokens--- -'just\\ key' Name.Attribute +'just' Name.Attribute +'\\ ' Literal.String.Escape +'key' Name.Attribute '\n' Text.Whitespace |