Commit c7809285aba339510184548fcf345a0eb650e3ea
2021-11-22T13:01:42
Avro IDL: Removed char syntax (#3185)
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62
diff --git a/components/prism-avro-idl.js b/components/prism-avro-idl.js
index ec5be7a..35386ff 100644
--- a/components/prism-avro-idl.js
+++ b/components/prism-avro-idl.js
@@ -6,18 +6,11 @@ Prism.languages['avro-idl'] = {
pattern: /\/\/.*|\/\*[\s\S]*?\*\//,
greedy: true
},
- 'string': [
- {
- pattern: /(^|[^\\])"(?:[^\r\n"\\]|\\.)*"/,
- lookbehind: true,
- greedy: true
- },
- {
- pattern: /(^|[^\\])'(?:[^\r\n'\\]|\\(?:[\s\S]|\d{1,3}))'/,
- lookbehind: true,
- greedy: true
- }
- ],
+ 'string': {
+ pattern: /(^|[^\\])"(?:[^\r\n"\\]|\\.)*"/,
+ lookbehind: true,
+ greedy: true
+ },
'annotation': {
pattern: /@(?:[$\w.-]|`[^\r\n`]+`)+/,
diff --git a/components/prism-avro-idl.min.js b/components/prism-avro-idl.min.js
index cf54dc5..34238fc 100644
--- a/components/prism-avro-idl.min.js
+++ b/components/prism-avro-idl.min.js
@@ -1 +1 @@
-Prism.languages["avro-idl"]={comment:{pattern:/\/\/.*|\/\*[\s\S]*?\*\//,greedy:!0},string:[{pattern:/(^|[^\\])"(?:[^\r\n"\\]|\\.)*"/,lookbehind:!0,greedy:!0},{pattern:/(^|[^\\])'(?:[^\r\n'\\]|\\(?:[\s\S]|\d{1,3}))'/,lookbehind:!0,greedy:!0}],annotation:{pattern:/@(?:[$\w.-]|`[^\r\n`]+`)+/,greedy:!0,alias:"function"},"function-identifier":{pattern:/`[^\r\n`]+`(?=\s*\()/,greedy:!0,alias:"function"},identifier:{pattern:/`[^\r\n`]+`/,greedy:!0},"class-name":{pattern:/(\b(?:enum|error|protocol|record|throws)\b\s+)[$\w]+/,lookbehind:!0,greedy:!0},keyword:/\b(?:array|boolean|bytes|date|decimal|double|enum|error|false|fixed|float|idl|import|int|local_timestamp_ms|long|map|null|oneway|protocol|record|schema|string|throws|time_ms|timestamp_ms|true|union|uuid|void)\b/,function:/\b[a-z_]\w*(?=\s*\()/i,number:[{pattern:/(^|[^\w.])-?(?:(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?|0x(?:[a-f0-9]+(?:\.[a-f0-9]*)?|\.[a-f0-9]+)(?:p[+-]?\d+)?)[dfl]?(?![\w.])/i,lookbehind:!0},/-?\b(?:Infinity|NaN)\b/],operator:/=/,punctuation:/[()\[\]{}<>.:,;-]/},Prism.languages.avdl=Prism.languages["avro-idl"];
\ No newline at end of file
+Prism.languages["avro-idl"]={comment:{pattern:/\/\/.*|\/\*[\s\S]*?\*\//,greedy:!0},string:{pattern:/(^|[^\\])"(?:[^\r\n"\\]|\\.)*"/,lookbehind:!0,greedy:!0},annotation:{pattern:/@(?:[$\w.-]|`[^\r\n`]+`)+/,greedy:!0,alias:"function"},"function-identifier":{pattern:/`[^\r\n`]+`(?=\s*\()/,greedy:!0,alias:"function"},identifier:{pattern:/`[^\r\n`]+`/,greedy:!0},"class-name":{pattern:/(\b(?:enum|error|protocol|record|throws)\b\s+)[$\w]+/,lookbehind:!0,greedy:!0},keyword:/\b(?:array|boolean|bytes|date|decimal|double|enum|error|false|fixed|float|idl|import|int|local_timestamp_ms|long|map|null|oneway|protocol|record|schema|string|throws|time_ms|timestamp_ms|true|union|uuid|void)\b/,function:/\b[a-z_]\w*(?=\s*\()/i,number:[{pattern:/(^|[^\w.])-?(?:(?:\d+(?:\.\d*)?|\.\d+)(?:e[+-]?\d+)?|0x(?:[a-f0-9]+(?:\.[a-f0-9]*)?|\.[a-f0-9]+)(?:p[+-]?\d+)?)[dfl]?(?![\w.])/i,lookbehind:!0},/-?\b(?:Infinity|NaN)\b/],operator:/=/,punctuation:/[()\[\]{}<>.:,;-]/},Prism.languages.avdl=Prism.languages["avro-idl"];
\ No newline at end of file
diff --git a/tests/languages/avro-idl/string_feature.test b/tests/languages/avro-idl/string_feature.test
index 1811a33..d93a89e 100644
--- a/tests/languages/avro-idl/string_feature.test
+++ b/tests/languages/avro-idl/string_feature.test
@@ -3,19 +3,11 @@
"\""
"\n\n"
-'f'
-'\n'
-'\34'
-
----------------------------------------------------
[
["string", "\"\""],
["string", "\"foo\""],
["string", "\"\\\"\""],
- ["string", "\"\\n\\n\""],
-
- ["string", "'f'"],
- ["string", "'\\n'"],
- ["string", "'\\34'"]
+ ["string", "\"\\n\\n\""]
]