From c3f9fb70a320db5a0f006e9cb20777fd0e7e435a Mon Sep 17 00:00:00 2001 From: Michael Schmidt Date: Thu, 9 Dec 2021 21:41:41 +0100 Subject: [PATCH] Zig: Use standard `char` token (#3264) --- components/prism-zig.js | 14 +- components/prism-zig.min.js | 2 +- tests/languages/zig/builtin-type_feature.test | 75 +++++++++++ .../languages/zig/builtin-types_feature.test | 75 ----------- tests/languages/zig/class-name_feature.test | 120 ++++++++++++------ tests/languages/zig/label_feature.test | 14 +- ..._feature.test => string_char_feature.test} | 14 +- 7 files changed, 182 insertions(+), 132 deletions(-) create mode 100644 tests/languages/zig/builtin-type_feature.test delete mode 100644 tests/languages/zig/builtin-types_feature.test rename tests/languages/zig/{string_feature.test => string_char_feature.test} (95%) diff --git a/components/prism-zig.js b/components/prism-zig.js index e7bf61be88..99d4845bec 100644 --- a/components/prism-zig.js +++ b/components/prism-zig.js @@ -49,14 +49,14 @@ pattern: /([\r\n])([ \t]+c?\\{2}).*(?:(?:\r\n?|\n)\2.*)*/, lookbehind: true, greedy: true - }, - { - // characters 'a', '\n', '\xFF', '\u{10FFFF}' - pattern: /(^|[^\\])'(?:[^'\\\r\n]|[\uD800-\uDFFF]{2}|\\(?:.|x[a-fA-F\d]{2}|u\{[a-fA-F\d]{1,6}\}))'/, - lookbehind: true, - greedy: true } ], + 'char': { + // characters 'a', '\n', '\xFF', '\u{10FFFF}' + pattern: /(^|[^\\])'(?:[^'\\\r\n]|[\uD800-\uDFFF]{2}|\\(?:.|x[a-fA-F\d]{2}|u\{[a-fA-F\d]{1,6}\}))'/, + lookbehind: true, + greedy: true + }, 'builtin': /\B@(?!\d)\w+(?=\s*\()/, 'label': { pattern: /(\b(?:break|continue)\s*:\s*)\w+\b|\b(?!\d)\w+\b(?=\s*:\s*(?:\{|while\b))/, @@ -80,7 +80,7 @@ inside: null // see below } ], - 'builtin-types': { + 'builtin-type': { pattern: /\b(?:anyerror|bool|c_u?(?:int|long|longlong|short)|c_longdouble|c_void|comptime_(?:float|int)|f(?:16|32|64|128)|[iu](?:8|16|32|64|128|size)|noreturn|type|void)\b/, alias: 'keyword' }, diff --git a/components/prism-zig.min.js b/components/prism-zig.min.js index 98cb6fea37..4b2e1015dd 100644 --- a/components/prism-zig.min.js +++ b/components/prism-zig.min.js @@ -1 +1 @@ -!function(n){function e(e){return function(){return e}}var r=/\b(?:align|allowzero|and|asm|async|await|break|cancel|catch|comptime|const|continue|defer|else|enum|errdefer|error|export|extern|fn|for|if|inline|linksection|nakedcc|noalias|null|or|orelse|packed|promise|pub|resume|return|stdcallcc|struct|suspend|switch|test|threadlocal|try|undefined|union|unreachable|usingnamespace|var|volatile|while)\b/,a="\\b(?!"+r.source+")(?!\\d)\\w+\\b",o="align\\s*\\((?:[^()]|\\([^()]*\\))*\\)",s="(?!\\s)(?:!?\\s*(?:"+"(?:\\?|\\bpromise->|(?:\\[[^[\\]]*\\]|\\*(?!\\*)|\\*\\*)(?:\\s*|\\s*const\\b|\\s*volatile\\b|\\s*allowzero\\b)*)".replace(//g,e(o))+"\\s*)*"+"(?:\\bpromise\\b|(?:\\berror\\.)?(?:\\.)*(?!\\s+))".replace(//g,e(a))+")+";n.languages.zig={comment:[{pattern:/\/\/[/!].*/,alias:"doc-comment"},/\/{2}.*/],string:[{pattern:/(^|[^\\@])c?"(?:[^"\\\r\n]|\\.)*"/,lookbehind:!0,greedy:!0},{pattern:/([\r\n])([ \t]+c?\\{2}).*(?:(?:\r\n?|\n)\2.*)*/,lookbehind:!0,greedy:!0},{pattern:/(^|[^\\])'(?:[^'\\\r\n]|[\uD800-\uDFFF]{2}|\\(?:.|x[a-fA-F\d]{2}|u\{[a-fA-F\d]{1,6}\}))'/,lookbehind:!0,greedy:!0}],builtin:/\B@(?!\d)\w+(?=\s*\()/,label:{pattern:/(\b(?:break|continue)\s*:\s*)\w+\b|\b(?!\d)\w+\b(?=\s*:\s*(?:\{|while\b))/,lookbehind:!0},"class-name":[/\b(?!\d)\w+(?=\s*=\s*(?:(?:extern|packed)\s+)?(?:enum|struct|union)\s*[({])/,{pattern:RegExp("(:\\s*)(?=\\s*(?:\\s*)?[=;,)])|(?=\\s*(?:\\s*)?\\{)".replace(//g,e(s)).replace(//g,e(o))),lookbehind:!0,inside:null},{pattern:RegExp("(\\)\\s*)(?=\\s*(?:\\s*)?;)".replace(//g,e(s)).replace(//g,e(o))),lookbehind:!0,inside:null}],"builtin-types":{pattern:/\b(?:anyerror|bool|c_u?(?:int|long|longlong|short)|c_longdouble|c_void|comptime_(?:float|int)|f(?:16|32|64|128)|[iu](?:8|16|32|64|128|size)|noreturn|type|void)\b/,alias:"keyword"},keyword:r,function:/\b(?!\d)\w+(?=\s*\()/,number:/\b(?:0b[01]+|0o[0-7]+|0x[a-fA-F\d]+(?:\.[a-fA-F\d]*)?(?:[pP][+-]?[a-fA-F\d]+)?|\d+(?:\.\d*)?(?:[eE][+-]?\d+)?)\b/,boolean:/\b(?:false|true)\b/,operator:/\.[*?]|\.{2,3}|[-=]>|\*\*|\+\+|\|\||(?:<<|>>|[-+*]%|[-+*/%^&|<>!=])=?|[?~]/,punctuation:/[.:,;(){}[\]]/},n.languages.zig["class-name"].forEach(function(e){null===e.inside&&(e.inside=n.languages.zig)})}(Prism); \ No newline at end of file +!function(n){function e(e){return function(){return e}}var r=/\b(?:align|allowzero|and|asm|async|await|break|cancel|catch|comptime|const|continue|defer|else|enum|errdefer|error|export|extern|fn|for|if|inline|linksection|nakedcc|noalias|null|or|orelse|packed|promise|pub|resume|return|stdcallcc|struct|suspend|switch|test|threadlocal|try|undefined|union|unreachable|usingnamespace|var|volatile|while)\b/,a="\\b(?!"+r.source+")(?!\\d)\\w+\\b",o="align\\s*\\((?:[^()]|\\([^()]*\\))*\\)",s="(?!\\s)(?:!?\\s*(?:"+"(?:\\?|\\bpromise->|(?:\\[[^[\\]]*\\]|\\*(?!\\*)|\\*\\*)(?:\\s*|\\s*const\\b|\\s*volatile\\b|\\s*allowzero\\b)*)".replace(//g,e(o))+"\\s*)*"+"(?:\\bpromise\\b|(?:\\berror\\.)?(?:\\.)*(?!\\s+))".replace(//g,e(a))+")+";n.languages.zig={comment:[{pattern:/\/\/[/!].*/,alias:"doc-comment"},/\/{2}.*/],string:[{pattern:/(^|[^\\@])c?"(?:[^"\\\r\n]|\\.)*"/,lookbehind:!0,greedy:!0},{pattern:/([\r\n])([ \t]+c?\\{2}).*(?:(?:\r\n?|\n)\2.*)*/,lookbehind:!0,greedy:!0}],char:{pattern:/(^|[^\\])'(?:[^'\\\r\n]|[\uD800-\uDFFF]{2}|\\(?:.|x[a-fA-F\d]{2}|u\{[a-fA-F\d]{1,6}\}))'/,lookbehind:!0,greedy:!0},builtin:/\B@(?!\d)\w+(?=\s*\()/,label:{pattern:/(\b(?:break|continue)\s*:\s*)\w+\b|\b(?!\d)\w+\b(?=\s*:\s*(?:\{|while\b))/,lookbehind:!0},"class-name":[/\b(?!\d)\w+(?=\s*=\s*(?:(?:extern|packed)\s+)?(?:enum|struct|union)\s*[({])/,{pattern:RegExp("(:\\s*)(?=\\s*(?:\\s*)?[=;,)])|(?=\\s*(?:\\s*)?\\{)".replace(//g,e(s)).replace(//g,e(o))),lookbehind:!0,inside:null},{pattern:RegExp("(\\)\\s*)(?=\\s*(?:\\s*)?;)".replace(//g,e(s)).replace(//g,e(o))),lookbehind:!0,inside:null}],"builtin-type":{pattern:/\b(?:anyerror|bool|c_u?(?:int|long|longlong|short)|c_longdouble|c_void|comptime_(?:float|int)|f(?:16|32|64|128)|[iu](?:8|16|32|64|128|size)|noreturn|type|void)\b/,alias:"keyword"},keyword:r,function:/\b(?!\d)\w+(?=\s*\()/,number:/\b(?:0b[01]+|0o[0-7]+|0x[a-fA-F\d]+(?:\.[a-fA-F\d]*)?(?:[pP][+-]?[a-fA-F\d]+)?|\d+(?:\.\d*)?(?:[eE][+-]?\d+)?)\b/,boolean:/\b(?:false|true)\b/,operator:/\.[*?]|\.{2,3}|[-=]>|\*\*|\+\+|\|\||(?:<<|>>|[-+*]%|[-+*/%^&|<>!=])=?|[?~]/,punctuation:/[.:,;(){}[\]]/},n.languages.zig["class-name"].forEach(function(e){null===e.inside&&(e.inside=n.languages.zig)})}(Prism); \ No newline at end of file diff --git a/tests/languages/zig/builtin-type_feature.test b/tests/languages/zig/builtin-type_feature.test new file mode 100644 index 0000000000..7f1043b5d6 --- /dev/null +++ b/tests/languages/zig/builtin-type_feature.test @@ -0,0 +1,75 @@ +i8 +u8 +i16 +u16 +i32 +u32 +i64 +u64 +i128 +u128 +isize +usize +c_short +c_ushort +c_int +c_uint +c_long +c_ulong +c_longlong +c_ulonglong +c_longdouble +c_void +f16 +f32 +f64 +f128 +bool +void +noreturn +type +anyerror +comptime_int +comptime_float + +---------------------------------------------------- + +[ + ["builtin-type", "i8"], + ["builtin-type", "u8"], + ["builtin-type", "i16"], + ["builtin-type", "u16"], + ["builtin-type", "i32"], + ["builtin-type", "u32"], + ["builtin-type", "i64"], + ["builtin-type", "u64"], + ["builtin-type", "i128"], + ["builtin-type", "u128"], + ["builtin-type", "isize"], + ["builtin-type", "usize"], + ["builtin-type", "c_short"], + ["builtin-type", "c_ushort"], + ["builtin-type", "c_int"], + ["builtin-type", "c_uint"], + ["builtin-type", "c_long"], + ["builtin-type", "c_ulong"], + ["builtin-type", "c_longlong"], + ["builtin-type", "c_ulonglong"], + ["builtin-type", "c_longdouble"], + ["builtin-type", "c_void"], + ["builtin-type", "f16"], + ["builtin-type", "f32"], + ["builtin-type", "f64"], + ["builtin-type", "f128"], + ["builtin-type", "bool"], + ["builtin-type", "void"], + ["builtin-type", "noreturn"], + ["builtin-type", "type"], + ["builtin-type", "anyerror"], + ["builtin-type", "comptime_int"], + ["builtin-type", "comptime_float"] +] + +---------------------------------------------------- + +Checks for builtin types. diff --git a/tests/languages/zig/builtin-types_feature.test b/tests/languages/zig/builtin-types_feature.test deleted file mode 100644 index 7af60750a9..0000000000 --- a/tests/languages/zig/builtin-types_feature.test +++ /dev/null @@ -1,75 +0,0 @@ -i8 -u8 -i16 -u16 -i32 -u32 -i64 -u64 -i128 -u128 -isize -usize -c_short -c_ushort -c_int -c_uint -c_long -c_ulong -c_longlong -c_ulonglong -c_longdouble -c_void -f16 -f32 -f64 -f128 -bool -void -noreturn -type -anyerror -comptime_int -comptime_float - ----------------------------------------------------- - -[ - ["builtin-types", "i8"], - ["builtin-types", "u8"], - ["builtin-types", "i16"], - ["builtin-types", "u16"], - ["builtin-types", "i32"], - ["builtin-types", "u32"], - ["builtin-types", "i64"], - ["builtin-types", "u64"], - ["builtin-types", "i128"], - ["builtin-types", "u128"], - ["builtin-types", "isize"], - ["builtin-types", "usize"], - ["builtin-types", "c_short"], - ["builtin-types", "c_ushort"], - ["builtin-types", "c_int"], - ["builtin-types", "c_uint"], - ["builtin-types", "c_long"], - ["builtin-types", "c_ulong"], - ["builtin-types", "c_longlong"], - ["builtin-types", "c_ulonglong"], - ["builtin-types", "c_longdouble"], - ["builtin-types", "c_void"], - ["builtin-types", "f16"], - ["builtin-types", "f32"], - ["builtin-types", "f64"], - ["builtin-types", "f128"], - ["builtin-types", "bool"], - ["builtin-types", "void"], - ["builtin-types", "noreturn"], - ["builtin-types", "type"], - ["builtin-types", "anyerror"], - ["builtin-types", "comptime_int"], - ["builtin-types", "comptime_float"] -] - ----------------------------------------------------- - -Checks for builtin types. diff --git a/tests/languages/zig/class-name_feature.test b/tests/languages/zig/class-name_feature.test index 9b0d92caf0..aa8a616255 100644 --- a/tests/languages/zig/class-name_feature.test +++ b/tests/languages/zig/class-name_feature.test @@ -61,75 +61,84 @@ var list2 = LinkedList(i32) {}; ["operator", "="], ["keyword", "struct"], ["punctuation", "{"], + "\r\n\tseconds", ["punctuation", ":"], ["class-name", [ - ["builtin-types", "i64"] + ["builtin-type", "i64"] ]], ["punctuation", ","], + "\r\n\tnanos", ["punctuation", ":"], ["class-name", [ - ["builtin-types", "u32"] + ["builtin-type", "u32"] ]], ["punctuation", ","], + ["keyword", "pub"], ["keyword", "fn"], ["function", "unixEpoch"], ["punctuation", "("], ["punctuation", ")"], - ["class-name", [ - "Timestamp" - ]], + ["class-name", ["Timestamp"]], ["punctuation", "{"], + ["keyword", "return"], - ["class-name", [ - "Timestamp" - ]], + ["class-name", ["Timestamp"]], ["punctuation", "{"], + ["punctuation", "."], "seconds ", ["operator", "="], ["number", "0"], ["punctuation", ","], + ["punctuation", "."], "nanos ", ["operator", "="], ["number", "0"], ["punctuation", ","], + ["punctuation", "}"], ["punctuation", ";"], + ["punctuation", "}"], + ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], " one_plus_one", ["punctuation", ":"], ["class-name", [ - ["builtin-types", "i32"] + ["builtin-type", "i32"] ]], ["operator", "="], ["number", "1"], ["operator", "+"], ["number", "1"], ["punctuation", ";"], + ["keyword", "var"], " x", ["punctuation", ":"], ["class-name", [ - ["builtin-types", "i32"] + ["builtin-type", "i32"] ]], ["punctuation", ";"], + ["keyword", "const"], " value", ["punctuation", ":"], ["class-name", [ ["operator", "?"], - ["builtin-types", "u32"] + ["builtin-type", "u32"] ]], ["operator", "="], ["keyword", "null"], ["punctuation", ";"], + ["keyword", "var"], " optional_value", ["punctuation", ":"], @@ -138,24 +147,26 @@ var list2 = LinkedList(i32) {}; ["punctuation", "["], ["punctuation", "]"], ["keyword", "const"], - ["builtin-types", "u8"] + ["builtin-type", "u8"] ]], ["operator", "="], ["keyword", "null"], ["punctuation", ";"], + ["keyword", "var"], " number_or_error", ["punctuation", ":"], ["class-name", [ - ["builtin-types", "anyerror"], + ["builtin-type", "anyerror"], ["operator", "!"], - ["builtin-types", "i32"] + ["builtin-type", "i32"] ]], ["operator", "="], ["keyword", "error"], ["punctuation", "."], "ArgNotFound", ["punctuation", ";"], + ["keyword", "const"], " array1 ", ["operator", "="], @@ -163,7 +174,7 @@ var list2 = LinkedList(i32) {}; ["punctuation", "["], "_", ["punctuation", "]"], - ["builtin-types", "u32"] + ["builtin-type", "u32"] ]], ["punctuation", "{"], ["number", "1"], @@ -171,12 +182,11 @@ var list2 = LinkedList(i32) {}; ["number", "2"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "var"], " foo", ["punctuation", ":"], - ["class-name", [ - "S" - ]], + ["class-name", ["S"]], ["keyword", "align"], ["punctuation", "("], ["number", "4"], @@ -184,31 +194,35 @@ var list2 = LinkedList(i32) {}; ["operator", "="], ["keyword", "undefined"], ["punctuation", ";"], + ["keyword", "fn"], ["function", "add"], ["punctuation", "("], "a", ["punctuation", ":"], ["class-name", [ - ["builtin-types", "i32"] + ["builtin-type", "i32"] ]], ["punctuation", ","], " b", ["punctuation", ":"], ["class-name", [ - ["builtin-types", "i32"] + ["builtin-type", "i32"] ]], ["punctuation", ")"], ["class-name", [ - ["builtin-types", "i32"] + ["builtin-type", "i32"] ]], ["punctuation", "{"], + ["keyword", "return"], " a ", ["operator", "+"], " b", ["punctuation", ";"], + ["punctuation", "}"], + ["keyword", "extern"], ["keyword", "fn"], ["function", "foo"], @@ -216,13 +230,14 @@ var list2 = LinkedList(i32) {}; "x", ["punctuation", ":"], ["class-name", [ - ["builtin-types", "f64"] + ["builtin-type", "f64"] ]], ["punctuation", ")"], ["class-name", [ - ["builtin-types", "f64"] + ["builtin-type", "f64"] ]], ["punctuation", ";"], + ["keyword", "fn"], ["function", "noop4"], ["punctuation", "("], @@ -232,10 +247,11 @@ var list2 = LinkedList(i32) {}; ["number", "4"], ["punctuation", ")"], ["class-name", [ - ["builtin-types", "void"] + ["builtin-type", "void"] ]], ["punctuation", "{"], ["punctuation", "}"], + ["keyword", "fn"], ["function", "derp"], ["punctuation", "("], @@ -244,28 +260,30 @@ var list2 = LinkedList(i32) {}; ["punctuation", "("], ["builtin", "@sizeOf"], ["punctuation", "("], - ["builtin-types", "usize"], + ["builtin-type", "usize"], ["punctuation", ")"], ["operator", "*"], ["number", "2"], ["punctuation", ")"], ["class-name", [ - ["builtin-types", "i32"] + ["builtin-type", "i32"] ]], ["punctuation", "{"], ["keyword", "return"], ["number", "1234"], ["punctuation", ";"], ["punctuation", "}"], + ["keyword", "fn"], ["function", "eventuallyNullSequence"], ["punctuation", "("], ["punctuation", ")"], ["class-name", [ ["operator", "?"], - ["builtin-types", "u32"] + ["builtin-type", "u32"] ]], ["punctuation", "{"], + ["keyword", "return"], ["keyword", "if"], ["punctuation", "("], @@ -278,18 +296,23 @@ var list2 = LinkedList(i32) {}; ["label", "blk"], ["punctuation", ":"], ["punctuation", "{"], + "\r\n\t\tnumbers_left ", ["operator", "-="], ["number", "1"], ["punctuation", ";"], + ["keyword", "break"], ["punctuation", ":"], ["label", "blk"], " numbers_left", ["punctuation", ";"], + ["punctuation", "}"], ["punctuation", ";"], + ["punctuation", "}"], + ["keyword", "const"], " message ", ["operator", "="], @@ -297,20 +320,21 @@ var list2 = LinkedList(i32) {}; ["punctuation", "["], "_", ["punctuation", "]"], - ["builtin-types", "u8"] + ["builtin-type", "u8"] ]], ["punctuation", "{"], - ["string", "'h'"], + ["char", "'h'"], ["punctuation", ","], - ["string", "'e'"], + ["char", "'e'"], ["punctuation", ","], - ["string", "'l'"], + ["char", "'l'"], ["punctuation", ","], - ["string", "'l'"], + ["char", "'l'"], ["punctuation", ","], - ["string", "'o'"], + ["char", "'o'"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], " mat4x4 ", ["operator", "="], @@ -321,14 +345,15 @@ var list2 = LinkedList(i32) {}; ["punctuation", "["], ["number", "4"], ["punctuation", "]"], - ["builtin-types", "f32"] + ["builtin-type", "f32"] ]], ["punctuation", "{"], + ["class-name", [ ["punctuation", "["], "_", ["punctuation", "]"], - ["builtin-types", "f32"] + ["builtin-type", "f32"] ]], ["punctuation", "{"], ["number", "1.0"], @@ -340,11 +365,12 @@ var list2 = LinkedList(i32) {}; ["number", "0.0"], ["punctuation", "}"], ["punctuation", ","], + ["class-name", [ ["punctuation", "["], "_", ["punctuation", "]"], - ["builtin-types", "f32"] + ["builtin-type", "f32"] ]], ["punctuation", "{"], ["number", "0.0"], @@ -356,11 +382,12 @@ var list2 = LinkedList(i32) {}; ["number", "1.0"], ["punctuation", "}"], ["punctuation", ","], + ["class-name", [ ["punctuation", "["], "_", ["punctuation", "]"], - ["builtin-types", "f32"] + ["builtin-type", "f32"] ]], ["punctuation", "{"], ["number", "0.0"], @@ -372,11 +399,12 @@ var list2 = LinkedList(i32) {}; ["number", "0.0"], ["punctuation", "}"], ["punctuation", ","], + ["class-name", [ ["punctuation", "["], "_", ["punctuation", "]"], - ["builtin-types", "f32"] + ["builtin-type", "f32"] ]], ["punctuation", "{"], ["number", "0.0"], @@ -388,8 +416,10 @@ var list2 = LinkedList(i32) {}; ["number", "1.0"], ["punctuation", "}"], ["punctuation", ","], + ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "Point"], ["operator", "="], @@ -397,6 +427,7 @@ var list2 = LinkedList(i32) {}; ["punctuation", "{"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "Point2"], ["operator", "="], @@ -405,6 +436,7 @@ var list2 = LinkedList(i32) {}; ["punctuation", "{"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "Type"], ["operator", "="], @@ -412,6 +444,7 @@ var list2 = LinkedList(i32) {}; ["punctuation", "{"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "Value"], ["operator", "="], @@ -422,17 +455,19 @@ var list2 = LinkedList(i32) {}; ["punctuation", "{"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "Number"], ["operator", "="], ["keyword", "packed"], ["keyword", "enum"], ["punctuation", "("], - ["builtin-types", "u8"], + ["builtin-type", "u8"], ["punctuation", ")"], ["punctuation", "{"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "Foo"], ["operator", "="], @@ -446,6 +481,7 @@ var list2 = LinkedList(i32) {}; " C ", ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "Foo"], ["operator", "="], @@ -459,6 +495,7 @@ var list2 = LinkedList(i32) {}; " C ", ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "Payload"], ["operator", "="], @@ -466,6 +503,7 @@ var list2 = LinkedList(i32) {}; ["punctuation", "{"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "const"], ["class-name", "ComplexType"], ["operator", "="], @@ -476,6 +514,7 @@ var list2 = LinkedList(i32) {}; ["punctuation", "{"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "var"], " node ", ["operator", "="], @@ -487,12 +526,13 @@ var list2 = LinkedList(i32) {}; ["punctuation", "{"], ["punctuation", "}"], ["punctuation", ";"], + ["keyword", "var"], " list2 ", ["operator", "="], ["function", "LinkedList"], ["punctuation", "("], - ["builtin-types", "i32"], + ["builtin-type", "i32"], ["punctuation", ")"], ["punctuation", "{"], ["punctuation", "}"], diff --git a/tests/languages/zig/label_feature.test b/tests/languages/zig/label_feature.test index e402699099..ccf5e8b54b 100644 --- a/tests/languages/zig/label_feature.test +++ b/tests/languages/zig/label_feature.test @@ -21,27 +21,33 @@ fn eventuallyErrorSequence() anyerror!u32 { ["boolean", "true"], ["punctuation", ")"], ["punctuation", "{"], + ["keyword", "while"], ["punctuation", "("], ["boolean", "true"], ["punctuation", ")"], ["punctuation", "{"], + ["keyword", "break"], ["punctuation", ":"], ["label", "outer"], ["punctuation", ";"], + ["punctuation", "}"], + ["punctuation", "}"], + ["keyword", "fn"], ["function", "eventuallyErrorSequence"], ["punctuation", "("], ["punctuation", ")"], ["class-name", [ - ["builtin-types", "anyerror"], + ["builtin-type", "anyerror"], ["operator", "!"], - ["builtin-types", "u32"] + ["builtin-type", "u32"] ]], ["punctuation", "{"], + ["keyword", "return"], ["keyword", "if"], ["punctuation", "("], @@ -56,17 +62,21 @@ fn eventuallyErrorSequence() anyerror!u32 { ["label", "blk"], ["punctuation", ":"], ["punctuation", "{"], + "\r\n\t\tnumbers_left ", ["operator", "-="], ["number", "1"], ["punctuation", ";"], + ["keyword", "break"], ["punctuation", ":"], ["label", "blk"], " numbers_left", ["punctuation", ";"], + ["punctuation", "}"], ["punctuation", ";"], + ["punctuation", "}"] ] diff --git a/tests/languages/zig/string_feature.test b/tests/languages/zig/string_char_feature.test similarity index 95% rename from tests/languages/zig/string_feature.test rename to tests/languages/zig/string_char_feature.test index 06b8ec952d..86399d964c 100644 --- a/tests/languages/zig/string_feature.test +++ b/tests/languages/zig/string_char_feature.test @@ -77,7 +77,7 @@ const hello_world_in_c = ["punctuation", ":"], ["number", "0"], ["punctuation", "]"], - ["builtin-types", "u8"], + ["builtin-type", "u8"], ["punctuation", ")"], ["punctuation", ";"], @@ -98,7 +98,7 @@ const hello_world_in_c = ["number", "1"], ["punctuation", "]"], ["operator", "=="], - ["string", "'e'"], + ["char", "'e'"], ["punctuation", ")"], ["punctuation", ";"], @@ -115,15 +115,15 @@ const hello_world_in_c = ["function", "expect"], ["punctuation", "("], - ["string", "'e'"], + ["char", "'e'"], ["operator", "=="], - ["string", "'\\x65'"], + ["char", "'\\x65'"], ["punctuation", ")"], ["punctuation", ";"], ["function", "expect"], ["punctuation", "("], - ["string", "'\\u{1f4a9}'"], + ["char", "'\\u{1f4a9}'"], ["operator", "=="], ["number", "128169"], ["punctuation", ")"], @@ -131,7 +131,7 @@ const hello_world_in_c = ["function", "expect"], ["punctuation", "("], - ["string", "'💯'"], + ["char", "'💯'"], ["operator", "=="], ["number", "128175"], ["punctuation", ")"], @@ -143,7 +143,7 @@ const hello_world_in_c = ["punctuation", "."], ["function", "eql"], ["punctuation", "("], - ["builtin-types", "u8"], + ["builtin-type", "u8"], ["punctuation", ","], ["string", "\"hello\""], ["punctuation", ","],