From 99814350e51ad1c64040501cee5cf267e9e3ed79 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Mon, 19 Feb 2024 23:59:03 +0200 Subject: Update zig mode and theme --- src/Syntax/zig.zig | 53 ++++++++++++++++++++++++++++++----------------------- src/highlight.zig | 20 ++++++++++---------- 2 files changed, 40 insertions(+), 33 deletions(-) diff --git a/src/Syntax/zig.zig b/src/Syntax/zig.zig index c8bc225..4e82496 100644 --- a/src/Syntax/zig.zig +++ b/src/Syntax/zig.zig @@ -27,12 +27,12 @@ pub const syntax = Syntax{ const keywords1 = [_][]const u8 { // keywords - "align", "allowzero", "and", "anyframe", "anytype", "asm", "async", "await", "break", "callconv", - "catch", "comptime", "const", "continue", "defer", "else", "enum", "errdefer", "error", "export", - "extern", "fn", "for", "if", "inline", "noalias", "nosuspend", "noinline", "opaque", "or", - "orelse", "packed", "pub", "resume", "return", "linksection", "struct", "suspend", "switch", - "test", "threadlocal", "try", "union", "unreachable", "usingnamespace", "var", "volatile", - "while", + "addrspace", "align", "allowzero", "and", "anyframe", "anytype", "asm", "async", "await", + "break", "callconv", "catch", "comptime", "const", "continue", "defer", "else", "enum", + "errdefer", "error", "export", "extern", "fn", "for", "if", "inline", "linksection", "noalias", + "noinline", "nosuspend", "opaque", "or", "orelse", "packed", "pub", "resume", "return", "struct", + "suspend", "switch", "test", "threadlocal", "try", "union", "unreachable", "usingnamespace", + "var", "volatile", "while", // primitive values "false", "null", "true", "undefined", @@ -41,28 +41,35 @@ const keywords1 = [_][]const u8 { const keywords2 = [_][]const u8 { // primitive types // TODO: generate all the integer types - "i8", "u8", "i16", "u16", "i32", "u32", "i64", "u64", "i128", "u128", "isize", "usize", + "i8", "u8", "i16", "u16", "i32", "u32", "i64", "u64", "i128", "u128", "isize", "usize", "c_char", "c_short", "c_ushort", "c_int", "c_uint", "c_long", "c_ulong", "c_longlong", "c_ulonglong", - "c_longdouble", "f16", "f32", "f64", "f128", "bool", "anyopaque", "void", "noreturn", "type", - "anyerror", "comptime_int", "comptime_float", + "c_longdouble", "f16", "f32", "f64", "f80", "f128", "bool", "anyopaque", "void", "noreturn", + "type", "anyerror", "comptime_int", "comptime_float", // former primitive types "c_void", // builtin functions - "@addWithOverflow", "@alignCast", "@alignOf", "@as", "@asyncCall", "@atomicLoad", "@atomicRmw", - "@atomicStore", "@bitCast", "@bitOffsetOf", "@boolToInt", "@bitSizeOf", "@breakpoint", "@mulAdd", + "@addrSpaceCast", "@addWithOverflow", "@alignCast", "@alignOf", "@as", "@atomicLoad", + "@atomicRmw", "@atomicStore", "@bitCast", "@bitOffsetOf", "@bitSizeOf", "@breakpoint", "@mulAdd", "@byteSwap", "@bitReverse", "@offsetOf", "@call", "@cDefine", "@cImport", "@cInclude", "@clz", - "@cmpxchgStrong", "@cmpxchgWeak", "@compileError", "@compileLog", "@ctz", "@cUndef", "@divExact", - "@divFloor", "@divTrunc", "@embedFile", "@enumToInt", "@errorName", "@errorReturnTrace", - "@errorToInt", "@errSetCast", "@export", "@extern", "@fence", "@field", "@fieldParentPtr", - "@floatCast", "@floatToInt", "@frame", "@Frame", "@frameAddress", "@frameSize", "@hasDecl", - "@hasField", "@import", "@intCast", "@intToEnum", "@intToError" , "@intToFloat", "@intToPtr", - "@maximum", "@memcpy", "@memset", "@minimum", "@wasmMemorySize", "@wasmMemoryGrow", "@mod", - "@mulWithOverflow", "@panic", "@popCount", "@prefetch", "@ptrCast", "@ptrToInt", "@rem", - "@returnAddress", "@select", "@setAlignStack", "@setCold", "@setEvalBranchQuota", - "@setFloatMode", "@setRuntimeSafety", "@shlExact", "@shlWithOverflow", "@shrExact", "@shuffle", - "@sizeOf", "@splat", "@reduce", "@src", "@sqrt", "@sin", "@cos", "@exp", "@exp2", "@log", - "@log2", "@log10", "@fabs", "@floor", "@ceil", "@trunc", "@round", "@subWithOverflow", - "@tagName", "@This", "@truncate", "@Type", "@typeInfo", "@typeName", "@TypeOf", "@unionInit", + "@cmpxchgStrong", "@cmpxchgWeak", "@compileError", "@compileLog", "@constCast", "@ctz", + "@cUndef", "@cVaArg", "@cVaCopy", "@cVaEnd", "@cVaStart", "@divExact", "@divFloor", "@divTrunc", + "@embedFile", "@enumFromInt", "@errorFromInt", "@errorName", "@errorReturnTrace", "@errorCast", + "@export", "@extern", "@fence", "@field", "@fieldParentPtr", "@floatCast", "@floatFromInt", + "@frameAddress", "@hasDecl", "@hasField", "@import", "@inComptime", "@intCast", "@intFromBool", + "@intFromEnum", "@intFromError", "@intFromFloat", "@intFromPtr", "@max", "@memcpy", "@memset", + "@min", "@wasmMemorySize", "@wasmMemoryGrow", "@mod", "@mulWithOverflow", "@panic", "@popCount", + "@prefetch", "@ptrCast", "@ptrFromInt", "@rem", "@returnAddress", "@select", "@setAlignStack", + "@setCold", "@setEvalBranchQuota", "@setFloatMode", "@setRuntimeSafety", "@shlExact", + "@shlWithOverflow", "@shrExact", "@shuffle", "@sizeOf", "@splat", "@reduce", "@src", "@sqrt", + "@sin", "@cos", "@tan", "@exp", "@exp2", "@log", "@log2", "@log10", "@abs", "@floor", "@ceil", + "@trunc", "@round", "@subWithOverflow", "@tagName", "@This", "@trap", "@truncate", "@Type", + "@typeInfo", "@typeName", "@TypeOf", "@unionInit", "@Vector", "@volatileCast", "@workGroupId", + "@workGroupSize", "@workItemId", + + // former builtin functions + "@asyncCall", "@boolToInt", "@enumToInt", "@errorToInt", "@errSetCast", "@floatToInt", "@frame", + "@Frame", "@frameSize", "@intToEnum", "@intToError" , "@intToFloat", "@intToPtr", "@maximum", + "@minimum", "@ptrToInt", "@fabs", }; diff --git a/src/highlight.zig b/src/highlight.zig index b0f4cfd..b6876d6 100644 --- a/src/highlight.zig +++ b/src/highlight.zig @@ -17,18 +17,18 @@ pub const Highlight = enum { return switch (hl) { .none => "\x1b[m", - .normal => "\x1b[39m", + .normal => "\x1b[;39m", - .comment => "\x1b[36m", - .comment_ml => "\x1b[36m", - .keyword1 => "\x1b[33m", - .keyword2 => "\x1b[32m", - .number => "\x1b[31m", - .string => "\x1b[35m", + .comment => "\x1b[;2;3;36m", + .comment_ml => "\x1b[;2;3;36m", + .keyword1 => "\x1b[;1;33m", + .keyword2 => "\x1b[;32m", + .number => "\x1b[;31m", + .string => "\x1b[;35m", - .line_no => "\x1b[0;90m", - .match => "\x1b[34m", - .overlong_line => "\x1b[91m", + .line_no => "\x1b[;90m", + .match => "\x1b[;4;34m", + .overlong_line => "\x1b[;7;91m", }; } }; -- cgit v1.2.3