Fix things more

This commit is contained in:
Lyssieth 2024-12-02 04:54:13 +02:00
parent 7784de231a
commit 182f09c877
Signed by untrusted user who does not match committer: lyssieth
GPG key ID: 200268854934CFAB

View file

@ -155,45 +155,49 @@ fn logFnImpl(comptime level: Level, comptime scope: Scope, comptime format: []co
} }
var scopeLen: usize = 4; var scopeLen: usize = 4;
const scopeText = switch (scope) { const scopeText = scopeTextBlk: {
.default => "main", switch (scope) {
.gpa => gpaBlock: { .default => break :scopeTextBlk "main",
const gpa = "General Purpose Allocator"; .gpa => {
scopeLen = gpa.len; const gpa = "General Purpose Allocator";
scopeLen = gpa.len;
break :gpaBlock try c.redBright().fmt("{s}", .{gpa}); break :scopeTextBlk try c.redBright().fmt("{s}", .{gpa});
}, },
else => elseBlock: { else => {
for (globals.additionalScopes.items) |modifier| { for (globals.additionalScopes.items) |modifier| {
if (std.mem.eql(u8, modifier.scope, @tagName(scope))) { if (std.mem.eql(u8, modifier.scope, @tagName(scope))) {
const text = blk: { const text = blk: {
if (modifier.rename) |rename| { if (modifier.rename) |rename| {
break :blk rename; break :blk rename;
} else {
break :blk @tagName(scope);
}
};
scopeLen = text.len;
if (modifier.color) |color| {
switch (color) {
.default => break :scopeTextBlk text,
.blue => break :scopeTextBlk try c.blue().fmt("{s}", .{text}),
.green => break :scopeTextBlk try c.green().fmt("{s}", .{text}),
.red => break :scopeTextBlk try c.red().fmt("{s}", .{text}),
.white => break :scopeTextBlk try c.white().fmt("{s}", .{text}),
.yellow => break :scopeTextBlk try c.yellow().fmt("{s}", .{text}),
.magenta => break :scopeTextBlk try c.magenta().fmt("{s}", .{text}),
.cyan => break :scopeTextBlk try c.cyan().fmt("{s}", .{text}),
}
} else { } else {
break :blk @tagName(scope); break :scopeTextBlk text;
} }
};
scopeLen = text.len;
if (modifier.color) |color| {
switch (color) {
.default => break :elseBlock text,
.blue => break :elseBlock try c.blue().fmt("{s}", .{text}),
.green => break :elseBlock try c.green().fmt("{s}", .{text}),
.red => break :elseBlock try c.red().fmt("{s}", .{text}),
.white => break :elseBlock try c.white().fmt("{s}", .{text}),
.yellow => break :elseBlock try c.yellow().fmt("{s}", .{text}),
.magenta => break :elseBlock try c.magenta().fmt("{s}", .{text}),
.cyan => break :elseBlock try c.cyan().fmt("{s}", .{text}),
}
} else {
break :elseBlock text;
} }
} }
} },
}, }
unreachable;
}; };
if (scopeLen > longestScopeYet) if (scopeLen > longestScopeYet)