diff --git a/components/prism-avro-idl.js b/components/prism-avro-idl.js index ec5be7a137..35386ffe2d 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 cf54dc546b..34238fc651 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 1811a33dd5..d93a89eabe 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\""] ]