neurocyte/flow-themes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add primary and secondary cursor styles

Browse source
This commit is contained in:
CJ van den Berg 2024-12-17 21:06:09 +01:00
parent 5f1ca2fd3c
commit 0c2a187c60
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
2 changed files with 59 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/compile.zig
View file

@ -57,6 +57,8 @@ fn load_json(theme_: *theme_file) theme {
.tokens = to_token_array(load_token_colors(file_name, cb)), .tokens = to_token_array(load_token_colors(file_name, cb)),
.editor = derive_style.editor(type_idx, cb), .editor = derive_style.editor(type_idx, cb),
.editor_cursor = derive_style.editor_cursor(type_idx, cb), .editor_cursor = derive_style.editor_cursor(type_idx, cb),
.editor_cursor_primary = derive_style.editor_cursor_primary(type_idx, cb),
.editor_cursor_secondary = derive_style.editor_cursor_secondary(type_idx, cb),
.editor_line_highlight = derive_style.editor_line_highlight(type_idx, cb), .editor_line_highlight = derive_style.editor_line_highlight(type_idx, cb),
.editor_error = derive_style.editor_error(type_idx, cb), .editor_error = derive_style.editor_error(type_idx, cb),
.editor_warning = derive_style.editor_warning(type_idx, cb), .editor_warning = derive_style.editor_warning(type_idx, cb),
@ -374,6 +376,40 @@ const derive_style = struct {
}; };
} }
fn editor_cursor_primary(type_idx: usize, cb: []const u8) Style {
return .{
.fg = if (find_color("editorMultiCursor.primary.background", cb)) |col|
col
else if (find_color("terminalCursor.background", cb)) |col|
col
else
defaults.@"editorMultiCursor.primary.background"(type_idx, cb),
.bg = if (find_color("editorMultiCursor.primary.foreground", cb)) |col|
col
else if (find_color("terminalCursor.foreground", cb)) |col|
col
else
defaults.@"editorMultiCursor.primary.foreground"(type_idx, cb),
};
}
fn editor_cursor_secondary(type_idx: usize, cb: []const u8) Style {
return .{
.fg = if (find_color("editorMultiCursor.secondary.background", cb)) |col|
col
else if (find_color("terminalCursor.background", cb)) |col|
col
else
defaults.@"editorMultiCursor.secondary.background"(type_idx, cb),
.bg = if (find_color("editorMultiCursor.secondary.foreground", cb)) |col|
col
else if (find_color("terminalCursor.foreground", cb)) |col|
col
else
defaults.@"editorMultiCursor.secondary.foreground"(type_idx, cb),
};
}
fn editor_line_highlight(type_idx: usize, cb: []const u8) Style { fn editor_line_highlight(type_idx: usize, cb: []const u8) Style {
return .{ return .{
.fg = if (find_color("editor.foreground", cb)) |col| col else defaults.@"editor.foreground"(type_idx, cb), .fg = if (find_color("editor.foreground", cb)) |col| col else defaults.@"editor.foreground"(type_idx, cb),
@ -600,6 +636,27 @@ const defaults = struct {
return derive_style.editor(type_idx, cb).bg; return derive_style.editor(type_idx, cb).bg;
} }
// registerColor('editorMultiCursor.primary.foreground', editorCursorForeground, nls.localize('editorMultiCursorPrimaryForeground', 'Color of the primary editor cursor when multiple cursors are present.'));
fn @"editorMultiCursor.primary.foreground"(type_idx: usize, cb: []const u8) ?Color {
return @"editorCursor.foreground"(type_idx, cb);
}
// registerColor('editorMultiCursor.primary.background', editorCursorBackground, nls.localize('editorMultiCursorPrimaryBackground', 'The background color of the primary editor cursor when multiple cursors are present. Allows customizing the color of a character overlapped by a block cursor.'));
fn @"editorMultiCursor.primary.background"(type_idx: usize, cb: []const u8) ?Color {
return derive_style.editor(type_idx, cb).bg;
}
// registerColor('editorMultiCursor.secondary.foreground', editorCursorForeground, nls.localize('editorMultiCursorSecondaryForeground', 'Color of secondary editor cursors when multiple cursors are present.'));
fn @"editorMultiCursor.secondary.foreground"(type_idx: usize, cb: []const u8) ?Color {
return @"editorCursor.foreground"(type_idx, cb);
}
// registerColor('editorMultiCursor.secondary.background', editorCursorBackground, nls.localize('editorMultiCursorSecondaryBackground', 'The background color of secondary editor cursors when multiple cursors are present. Allows customizing the color of a character overlapped by a block cursor.'));
fn @"editorMultiCursor.secondary.background"(type_idx: usize, cb: []const u8) ?Color {
return derive_style.editor(type_idx, cb).bg;
}
// registerColor('editor.lineHighlightBackground', { dark: null, light: null, hcDark: null, hcLight: null }, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.')); // registerColor('editor.lineHighlightBackground', { dark: null, light: null, hcDark: null, hcLight: null }, nls.localize('lineHighlight', 'Background color for the highlight of line at the cursor position.'));
fn @"editor.lineHighlightBackground"(type_idx: usize, cb: []const u8) ?Color { fn @"editor.lineHighlightBackground"(type_idx: usize, cb: []const u8) ?Color {
return derive_style.editor(type_idx, cb).bg; return derive_style.editor(type_idx, cb).bg;

2
src/theme.zig
View file

@ -5,6 +5,8 @@ tokens: Tokens,
editor: Style, editor: Style,
editor_cursor: Style, editor_cursor: Style,
editor_cursor_primary: Style,
editor_cursor_secondary: Style,
editor_line_highlight: Style, editor_line_highlight: Style,
editor_error: Style, editor_error: Style,
editor_warning: Style, editor_warning: Style,