diff options
author | Aliaksei Budavei <32549825+zzzyxwvut@users.noreply.github.com> | 2024-03-03 17:51:01 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-03 15:51:01 +0100 |
commit | b3030b653bbdc08c91138001d1987d804f6ebf46 (patch) | |
tree | 058821e442829afbdd71dd4f778857bfc6abcdee /runtime/syntax/testdir | |
parent | e93afc2e612647e79e1082096ffd6c61e01ac691 (diff) |
runtime(java): Recognise text blocks (#14128)
Also, accept as valid the space escape sequence `\s`.
Also, consistently use the claimed `javaDebug` prefix for
syntax group definitions kept under `g:java_highlight_debug`.
Since `javaStringError` is commented out for its generality,
let's comment out `javaDebugStringError`, its copy, as well.
References:
https://openjdk.org/jeps/378
https://docs.oracle.com/javase/specs/jls/se17/html/jls-3.html#jls-3.10.7
Closes #10910.
Signed-off-by: Aliaksei Budavei <0x000c70@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
Diffstat (limited to 'runtime/syntax/testdir')
-rw-r--r-- | runtime/syntax/testdir/dumps/java_escapes_00.dump | 2 | ||||
-rw-r--r-- | runtime/syntax/testdir/dumps/java_escapes_01.dump | 4 | ||||
-rw-r--r-- | runtime/syntax/testdir/dumps/java_string_00.dump | 20 | ||||
-rw-r--r-- | runtime/syntax/testdir/dumps/java_string_01.dump | 20 | ||||
-rw-r--r-- | runtime/syntax/testdir/dumps/java_string_02.dump | 20 | ||||
-rw-r--r-- | runtime/syntax/testdir/dumps/java_string_99.dump | 20 | ||||
-rw-r--r-- | runtime/syntax/testdir/input/java_escapes.java | 4 | ||||
-rw-r--r-- | runtime/syntax/testdir/input/java_string.java | 44 |
8 files changed, 129 insertions, 5 deletions
diff --git a/runtime/syntax/testdir/dumps/java_escapes_00.dump b/runtime/syntax/testdir/dumps/java_escapes_00.dump index 3db803d41e..d47fb4c01e 100644 --- a/runtime/syntax/testdir/dumps/java_escapes_00.dump +++ b/runtime/syntax/testdir/dumps/java_escapes_00.dump @@ -11,7 +11,7 @@ @75 @4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|{| @62 @8|c+0#00e0003&|h|a|r| +0#0000000&|e@1|[|]| |=| |{| @53 -@12|'+0#e000002&|\+0#e000e06&|b|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|t|'+0#e000002&|,+0#0000000&| @51 +@12|'+0#e000002&|\+0#e000e06&|b|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|s|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|t|'+0#e000002&|,+0#0000000&| @45 @12|'+0#e000002&|\+0#e000e06&|n|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|f|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|r|'+0#e000002&|,+0#0000000&| @45 @12|'+0#e000002&|\+0#e000e06&|"|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|'|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&@1|'+0#e000002&|,+0#0000000&| @45 @8|}|;| @64 diff --git a/runtime/syntax/testdir/dumps/java_escapes_01.dump b/runtime/syntax/testdir/dumps/java_escapes_01.dump index 8d2c395ad7..e5080e96d5 100644 --- a/runtime/syntax/testdir/dumps/java_escapes_01.dump +++ b/runtime/syntax/testdir/dumps/java_escapes_01.dump @@ -1,10 +1,10 @@ -| +0&#ffffff0@11|'+0#e000002&|\+0#e000e06&|b|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|t|'+0#e000002&|,+0#0000000&| @51 +| +0&#ffffff0@11|'+0#e000002&|\+0#e000e06&|b|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|s|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|t|'+0#e000002&|,+0#0000000&| @45 @12|'+0#e000002&|\+0#e000e06&|n|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|f|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|r|'+0#e000002&|,+0#0000000&| @45 @12|'+0#e000002&|\+0#e000e06&|"|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&|'|'+0#e000002&|,+0#0000000&| |'+0#e000002&|\+0#e000e06&@1|'+0#e000002&|,+0#0000000&| @45 @8|}|;| @64 @75 @8>S|y|s|t|e|m|.|o|u|t|.|p|r|i|n|t|l|n|(|n+0#af5f00255&|e|w| +0#0000000&|S|t|r|i|n|g|[|]| |{| @33 -@12|"+0#e000002&|\+0#e000e06&|b|"+0#e000002&|,+0#0000000&| |"+0#e000002&|\+0#e000e06&|t|"+0#e000002&|,+0#0000000&| @51 +@12|"+0#e000002&|\+0#e000e06&|b|"+0#e000002&|,+0#0000000&| |"+0#e000002&|\+0#e000e06&|s|"+0#e000002&|,+0#0000000&| |"+0#e000002&|\+0#e000e06&|t|"+0#e000002&|,+0#0000000&| @45 @12|"+0#e000002&|\+0#e000e06&|n|"+0#e000002&|,+0#0000000&| |"+0#e000002&|\+0#e000e06&|f|"+0#e000002&|,+0#0000000&| |"+0#e000002&|\+0#e000e06&|r|"+0#e000002&|,+0#0000000&| @45 @12|"+0#e000002&|\+0#e000e06&|"|"+0#e000002&|,+0#0000000&| |"+0#e000002&|\+0#e000e06&|'|"+0#e000002&|,+0#0000000&| |"+0#e000002&|\+0#e000e06&@1|"+0#e000002&|,+0#0000000&| @45 @8|}|)|;| @63 diff --git a/runtime/syntax/testdir/dumps/java_string_00.dump b/runtime/syntax/testdir/dumps/java_string_00.dump new file mode 100644 index 0000000000..b973226f13 --- /dev/null +++ b/runtime/syntax/testdir/dumps/java_string_00.dump @@ -0,0 +1,20 @@ +>c+0#00e0003#ffffff0|l|a|s@1| +0#0000000&|S|t|r|i|n|g|T|e|s|t|s| @57 +|{| @73 +@4|s+0#00e0003&|t|a|t|i|c| +0#0000000&|{| @62 +@8|S|t|r|i|n|g| |s|1| |=| |"+0#e000002&|A| |q|u|i|c|k| |b|r|o|w|n| |f|o|x| |j|u|m|p|s| |o|v|e|r| |t|h|e| |l|a|z|y| |d|o|g|"|;+0#0000000&| @10 +@8|S|t|r|i|n|g| |s|2| |=| |"+0#e000002&|\+0#e000e06&|"|W+0#e000002&|o@1|f|\+0#e000e06&|s|!+0#e000002&|\+0#e000e06&|"|"+0#e000002&|;+0#0000000&| @40 +@8|S|t|r|i|n|g| |s|3| |=| |"@2| @51 +| +0#e000002&@11|A|\+0#e000e06&|s|\+0#e000002&| +0#0000000&@58 +| +0#e000002&@11|q|u|i|c|k| |\| +0#0000000&@55 +| +0#e000002&@11|b|r|o|w|n|\+0#e000e06&|s|\+0#e000002&| +0#0000000&@54 +| +0#e000002&@11|f|o|x| |\| +0#0000000&@57 +| +0#e000002&@11|j|u|m|p|s|\+0#e000e06&|s|\+0#e000002&| +0#0000000&@54 +| +0#e000002&@11|o|v|e|r| |\| +0#0000000&@56 +| +0#e000002&@11|t|h|e|\+0#e000e06&|s|\+0#e000002&| +0#0000000&@56 +| +0#e000002&@11|l|a|z|y| |\| +0#0000000&@56 +| +0#e000002&@11|d|o|g|"+0#0000000&@2|;| @55 +@8|S|t|r|i|n|g| |s|4| |=| |"@2| @51 +| +0#e000002&@11|"|W|o@1|f|\+0#e000e06&|s|!+0#e000002&|\+0#e000e06&|"|"+0#0000000&@2|;| @48 +@8|S|t|r|i|n|g| |s|5| |=| |"@2| @51 +| +0#e000002&@7|S|t|r|i|n|g| |s|3| |=| |\+0#e000e06&|"|"+0#e000002&@1| +0#0000000&@50 +@57|1|,|1| @10|T|o|p| diff --git a/runtime/syntax/testdir/dumps/java_string_01.dump b/runtime/syntax/testdir/dumps/java_string_01.dump new file mode 100644 index 0000000000..d7035611a7 --- /dev/null +++ b/runtime/syntax/testdir/dumps/java_string_01.dump @@ -0,0 +1,20 @@ +| +0#e000002#ffffff0@11|l|a|z|y| |\| +0#0000000&@56 +| +0#e000002&@11|d|o|g|"+0#0000000&@2|;| @55 +@8|S|t|r|i|n|g| |s|4| |=| |"@2| @51 +| +0#e000002&@11|"|W|o@1|f|\+0#e000e06&|s|!+0#e000002&|\+0#e000e06&|"|"+0#0000000&@2|;| @48 +@8|S|t|r|i|n|g| |s|5| |=| |"@2| @51 +| +0#e000002&@7>S|t|r|i|n|g| |s|3| |=| |\+0#e000e06&|"|"+0#e000002&@1| +0#0000000&@50 +| +0#e000002&@11|A|\+0#e000e06&@1|s+0#e000002&|\+0#e000e06&@1| +0#0000000&@56 +| +0#e000002&@11|q|u|i|c|k| |\+0#e000e06&@1| +0#0000000&@54 +| +0#e000002&@11|b|r|o|w|n|\+0#e000e06&@1|s+0#e000002&|\+0#e000e06&@1| +0#0000000&@52 +| +0#e000002&@11|f|o|x| |\+0#e000e06&@1| +0#0000000&@56 +| +0#e000002&@11|j|u|m|p|s|\+0#e000e06&@1|s+0#e000002&|\+0#e000e06&@1| +0#0000000&@52 +| +0#e000002&@11|o|v|e|r| |\+0#e000e06&@1| +0#0000000&@55 +| +0#e000002&@11|t|h|e|\+0#e000e06&@1|s+0#e000002&|\+0#e000e06&@1| +0#0000000&@54 +| +0#e000002&@11|l|a|z|y| |\+0#e000e06&@1| +0#0000000&@55 +| +0#e000002&@11|d|o|g|\+0#e000e06&|"|"+0#e000002&@1|;|"+0#0000000&@2|;| @50 +@75 +@8|/+0#0000e05&@1| |T|h|e|r|e| |a|r|e| |S|P|A|C|E|,| |F@1|,| |H|T|,| |C|R|,| |a|n|d| |L|F| |a|f|t|e|r| |"@2|.| +0#0000000&@17 +@8|S|t|r|i|n|g| |e|m|p|t|y| |=| |"@2| |^+0#0000e05&|L| +0#0000000&@2|^+0#0000e05&|M| +0#0000000&@40 +| +0#e000002&@11|"+0#0000000&@2|;| @58 +@57|1|9|,|3|-|9| @7|5|2|%| diff --git a/runtime/syntax/testdir/dumps/java_string_02.dump b/runtime/syntax/testdir/dumps/java_string_02.dump new file mode 100644 index 0000000000..e0b0ae08e3 --- /dev/null +++ b/runtime/syntax/testdir/dumps/java_string_02.dump @@ -0,0 +1,20 @@ +| +0#e000002#ffffff0@11|"+0#0000000&@2|;| @58 +@75 +@8|S|y|s|t|e|m|.|o|u|t|.|p|r|i|n|t|l|n|(|"@2| @44 +| +0#e000002&@7|"| +0#0000000&@65 +| +0#e000002&@7|"@1| +0#0000000&@64 +| +0#e000002&@7>"@1|\+0#e000e06&|u|0@1|5|c|"+0#e000002&| +0#0000000&@57 +| +0#e000002&@7|"@1|\+0#e000e06&|u|0@1|5|c|"+0#e000002&@1| +0#0000000&@56 +| +0#e000002&@7|"@1|\+0#e000e06&|"|\|u|0@1|2@1|\|u|0@1|2@1| +0#0000000&@50 +| +0#e000002&@7|"@1|\+0#e000e06&|"|"+0#e000002&@1|\+0#e000e06&|u|0@1|5|c|\|u|0@1|2@1| +0#0000000&@48 +| +0#e000002&@7|"@1|\+0#e000e06&|"|"+0#e000002&@1|\+0#e000e06&|"|"+0#e000002&| +0#0000000&@57 +| +0#e000002&@7|"@1|\+0#e000e06&|"|"+0#e000002&@1|\+0#e000e06&|"|"+0#e000002&|\+0#e000e06&|"|"+0#0000000&@2|)|;| @50 +@4|}| @69 +|}| @73 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@56|3|7|,|3|-|9| @7|B|o|t| diff --git a/runtime/syntax/testdir/dumps/java_string_99.dump b/runtime/syntax/testdir/dumps/java_string_99.dump new file mode 100644 index 0000000000..f147db8095 --- /dev/null +++ b/runtime/syntax/testdir/dumps/java_string_99.dump @@ -0,0 +1,20 @@ +| +0#e000002#ffffff0@11|t|h|e|\+0#e000e06&@1|s+0#e000002&|\+0#e000e06&@1| +0#0000000&@54 +| +0#e000002&@11|l|a|z|y| |\+0#e000e06&@1| +0#0000000&@55 +| +0#e000002&@11|d|o|g|\+0#e000e06&|"|"+0#e000002&@1|;|"+0#0000000&@2|;| @50 +@75 +@8|/+0#0000e05&@1| |T|h|e|r|e| |a|r|e| |S|P|A|C|E|,| |F@1|,| |H|T|,| |C|R|,| |a|n|d| |L|F| |a|f|t|e|r| |"@2|.| +0#0000000&@17 +@8|S|t|r|i|n|g| |e|m|p|t|y| |=| |"@2| |^+0#0000e05&|L| +0#0000000&@2|^+0#0000e05&|M| +0#0000000&@40 +| +0#e000002&@11|"+0#0000000&@2|;| @58 +@75 +@8|S|y|s|t|e|m|.|o|u|t|.|p|r|i|n|t|l|n|(|"@2| @44 +| +0#e000002&@7|"| +0#0000000&@65 +| +0#e000002&@7|"@1| +0#0000000&@64 +| +0#e000002&@7|"@1|\+0#e000e06&|u|0@1|5|c|"+0#e000002&| +0#0000000&@57 +| +0#e000002&@7|"@1|\+0#e000e06&|u|0@1|5|c|"+0#e000002&@1| +0#0000000&@56 +| +0#e000002&@7|"@1|\+0#e000e06&|"|\|u|0@1|2@1|\|u|0@1|2@1| +0#0000000&@50 +| +0#e000002&@7|"@1|\+0#e000e06&|"|"+0#e000002&@1|\+0#e000e06&|u|0@1|5|c|\|u|0@1|2@1| +0#0000000&@48 +| +0#e000002&@7|"@1|\+0#e000e06&|"|"+0#e000002&@1|\+0#e000e06&|"|"+0#e000002&| +0#0000000&@57 +| +0#e000002&@7|"@1|\+0#e000e06&|"|"+0#e000002&@1|\+0#e000e06&|"|"+0#e000002&|\+0#e000e06&|"|"+0#0000000&@2|)|;| @50 +@4|}| @69 +>}| @73 +@57|4@1|,|1| @9|B|o|t| diff --git a/runtime/syntax/testdir/input/java_escapes.java b/runtime/syntax/testdir/input/java_escapes.java index 624d4fcd89..eadaa420b4 100644 --- a/runtime/syntax/testdir/input/java_escapes.java +++ b/runtime/syntax/testdir/input/java_escapes.java @@ -11,13 +11,13 @@ class EscapesTests static { char ee[] = { - '\b', '\t', + '\b', '\s', '\t', '\n', '\f', '\r', '\"', '\'', '\\', }; System.out.println(new String[] { - "\b", "\t", + "\b", "\s", "\t", "\n", "\f", "\r", "\"", "\'", "\\", }); diff --git a/runtime/syntax/testdir/input/java_string.java b/runtime/syntax/testdir/input/java_string.java new file mode 100644 index 0000000000..51c30b9da8 --- /dev/null +++ b/runtime/syntax/testdir/input/java_string.java @@ -0,0 +1,44 @@ +class StringTests +{ + static { + String s1 = "A quick brown fox jumps over the lazy dog"; + String s2 = "\"Woof\s!\""; + String s3 = """ + A\s\ + quick \ + brown\s\ + fox \ + jumps\s\ + over \ + the\s\ + lazy \ + dog"""; + String s4 = """ + "Woof\s!\""""; + String s5 = """ + String s3 = \""" + A\\s\\ + quick \\ + brown\\s\\ + fox \\ + jumps\\s\\ + over \\ + the\\s\\ + lazy \\ + dog\""";"""; + + // There are SPACE, FF, HT, CR, and LF after """. + String empty = """
+ """; + + System.out.println(""" + " + "" + ""\u005c" + ""\u005c"" + ""\"\u0022\u0022 + ""\"""\u005c\u0022 + ""\"""\"" + ""\"""\""\""""); + } +} |