diff --git a/example_config/palettes/dark.toml b/example_config/palettes/dark.toml index 49fbe27..bb2297e 100644 --- a/example_config/palettes/dark.toml +++ b/example_config/palettes/dark.toml @@ -21,21 +21,72 @@ base0F = '#D2D2D2FF' border = '#242424FF' border_focused = '#2E2E2EFF' cursor = '#D2D2D2FF' +# Editor - Basic editor_background = '#111111FF' -editor_command = '#3A898CFF' -editor_comment = '#849899FF' -editor_disabled = '#849899FF' -editor_emphasis = '#A9DC86FF' -editor_error = '#AA4E4AFF' -editor_inactive = '#849899FF' -editor_line_number = '#849899FF' -editor_link = '#B0779EFF' -editor_main = '#D2D2D2FF' -editor_selected = '#242424FF' +editor_foreground = '#D2D2D2FF' +editor_line_highlight = '#191919FF' +editor_selection = '#242424FF' editor_selection_inactive = '#1D1C1CFF' +editor_cursor = '#D2D2D2FF' +editor_whitespace = '#3A3A3AFF' + +# Editor - Gutter +editor_gutter_background = '#111111FF' +editor_gutter_foreground = '#849899FF' +editor_line_number = '#849899FF' +editor_line_number_active = '#D2D2D2FF' + +# Editor - Syntax +editor_comment = '#849899FF' editor_string = '#9A8652FF' -editor_success = '#668A51FF' +editor_number = '#B47837FF' +editor_boolean = '#B47837FF' +editor_keyword = '#3A898CFF' +editor_operator = '#D2D2D2FF' +editor_function = '#A9DC86FF' +editor_variable = '#D2D2D2FF' +editor_parameter = '#B0779EFF' +editor_property = '#9A8652FF' +editor_constant = '#B47837FF' +editor_type = '#3A898CFF' +editor_class = '#3A898CFF' +editor_interface = '#3A898CFF' +editor_enum = '#3A898CFF' +editor_namespace = '#B0779EFF' +editor_attribute = '#A9DC86FF' +editor_decorator = '#A9DC86FF' +editor_tag = '#AA4E4AFF' +editor_punctuation = '#D2D2D2FF' +editor_link = '#B0779EFF' +editor_regex = '#AA477BFF' +editor_escape_character = '#B47837FF' + +# Editor - Diagnostics +editor_invalid = '#AA4E4AFF' +editor_error = '#AA4E4AFF' +editor_error_background = '#3A1A1AFF' editor_warning = '#B47837FF' +editor_warning_background = '#3A2A1AFF' +editor_info = '#3A898CFF' +editor_info_background = '#1A2A3AFF' +editor_hint = '#668A51FF' +editor_hint_background = '#1A2A1AFF' + +# Editor - UI Elements +editor_active_line_border = '#2E2E2EFF' +editor_indent_guide = '#2A2A2AFF' +editor_indent_guide_active = '#3A3A3AFF' +editor_bracket_match = '#3A898CFF' +editor_search_match = '#9A865280' +editor_search_match_active = '#9A8652FF' +editor_find_range_highlight = '#9A865240' + +# Editor - Diff +editor_deleted = '#AA4E4AFF' +editor_inserted = '#668A51FF' +editor_modified = '#9A8652FF' +editor_ignored = '#849899FF' +editor_folded_background = '#191919FF' error = '#AA4E4AFF' foreground = '#D2D2D2FF' info = '#3A898CFF' diff --git a/example_config/palettes/light.toml b/example_config/palettes/light.toml index 047bf15..721afd2 100644 --- a/example_config/palettes/light.toml +++ b/example_config/palettes/light.toml @@ -21,21 +21,72 @@ base0F = '#2A2A2AFF' border = '#C5C5C5FF' border_focused = '#B9B9B9FF' cursor = '#2A2A2AFF' +# Editor - Basic editor_background = '#E0E0E0FF' -editor_command = '#3A898CFF' -editor_comment = '#849899FF' -editor_disabled = '#A0A0A0FF' -editor_emphasis = '#4A7A2EFF' -editor_error = '#AA4E4AFF' -editor_inactive = '#A0A0A0FF' -editor_line_number = '#9A9A95FF' -editor_link = '#90577EFF' -editor_main = '#2A2A2AFF' -editor_selected = '#C9C9C9FF' +editor_foreground = '#2A2A2AFF' +editor_line_highlight = '#D5D5D5FF' +editor_selection = '#C9C9C9FF' editor_selection_inactive = '#D2D2D2FF' +editor_cursor = '#2A2A2AFF' +editor_whitespace = '#B0B0B0FF' + +# Editor - Gutter +editor_gutter_background = '#E0E0E0FF' +editor_gutter_foreground = '#9A9A95FF' +editor_line_number = '#9A9A95FF' +editor_line_number_active = '#2A2A2AFF' + +# Editor - Syntax +editor_comment = '#849899FF' editor_string = '#9A8652FF' -editor_success = '#668A51FF' +editor_number = '#B47837FF' +editor_boolean = '#B47837FF' +editor_keyword = '#3A898CFF' +editor_operator = '#2A2A2AFF' +editor_function = '#4A7A2EFF' +editor_variable = '#2A2A2AFF' +editor_parameter = '#90577EFF' +editor_property = '#9A8652FF' +editor_constant = '#B47837FF' +editor_type = '#3A898CFF' +editor_class = '#3A898CFF' +editor_interface = '#3A898CFF' +editor_enum = '#3A898CFF' +editor_namespace = '#90577EFF' +editor_attribute = '#4A7A2EFF' +editor_decorator = '#4A7A2EFF' +editor_tag = '#AA4E4AFF' +editor_punctuation = '#2A2A2AFF' +editor_link = '#90577EFF' +editor_regex = '#AA477BFF' +editor_escape_character = '#B47837FF' + +# Editor - Diagnostics +editor_invalid = '#AA4E4AFF' +editor_error = '#AA4E4AFF' +editor_error_background = '#FFDDDDFF' editor_warning = '#B47837FF' +editor_warning_background = '#FFF0D0FF' +editor_info = '#3A898CFF' +editor_info_background = '#D0F0FFFF' +editor_hint = '#668A51FF' +editor_hint_background = '#D0FFD0FF' + +# Editor - UI Elements +editor_active_line_border = '#C5C5C5FF' +editor_indent_guide = '#CFCFCFFF' +editor_indent_guide_active = '#B0B0B0FF' +editor_bracket_match = '#3A898CFF' +editor_search_match = '#9A865280' +editor_search_match_active = '#9A8652FF' +editor_find_range_highlight = '#9A865240' + +# Editor - Diff +editor_deleted = '#AA4E4AFF' +editor_inserted = '#668A51FF' +editor_modified = '#9A8652FF' +editor_ignored = '#A0A0A0FF' +editor_folded_background = '#D5D5D5FF' error = '#AA4E4AFF' foreground = '#2A2A2AFF' info = '#3A898CFF' diff --git a/example_config/templates/nvim.lua b/example_config/templates/nvim.lua index 18fc91c..297a0ff 100644 --- a/example_config/templates/nvim.lua +++ b/example_config/templates/nvim.lua @@ -3,91 +3,370 @@ vim.cmd("syntax reset") vim.g.colors_name = "clrsync" local palette = { - -- Editor colors - Default = "{editor_main.hex}", - Keyword = "{editor_command.hex}", - Number = "{editor_warning.hex}", - String = "{editor_string.hex}", - CharLiteral = "{editor_string.hex}", - Punctuation = "{editor_main.hex}", - Preprocessor = "{editor_emphasis.hex}", - Identifier = "{editor_main.hex}", - KnownIdentifier = "{editor_link.hex}", - PreprocIdentifier = "{editor_link.hex}", + -- General UI + bg = "{editor_background.hex}", + bg_alt = "{surface_variant.hex}", + fg = "{editor_foreground.hex}", + fg_alt = "{on_surface_variant.hex}", + grey = "{editor_line_number.hex}", - Comment = "{editor_comment.hex}", - MultiLineComment = "{editor_comment.hex}", + -- Accent / keyword colors + blue = "{editor_keyword.hex}", + cyan = "{editor_info.hex}", + violet = "{editor_link.hex}", + magenta = "{editor_parameter.hex}", + orange = "{editor_number.hex}", + yellow = "{editor_warning.hex}", + green = "{success.hex}", + red = "{error.hex}", - Background = "{editor_background.hex}", - Cursor = "{cursor.hex}", + -- Editor - Basic + cursor = "{cursor.hex}", + selection = "{editor_selection.hex}", + dark_blue = "{editor_selection.hex}", + line_highlight = "{editor_line_highlight.hex}", - Selection = "{editor_selected.hex}", - ErrorMarker = "{editor_error.hex}", - Breakpoint = "{editor_error.hex}", + -- Editor - Gutter + line_number = "{editor_line_number.hex}", + line_number_active = "{editor_line_number_active.hex}", - LineNumber = "{editor_line_number.hex}", - CurrentLineFill = "{surface_variant.hex}", - CurrentLineFillInactive = "{surface.hex}", + -- Editor - Syntax + comment = "{editor_comment.hex}", + string = "{editor_string.hex}", + number = "{editor_number.hex}", + boolean = "{editor_boolean.hex}", + keyword = "{editor_keyword.hex}", + operator = "{editor_operator.hex}", + function_ = "{editor_function.hex}", + variable = "{editor_variable.hex}", + parameter = "{editor_parameter.hex}", + property = "{editor_property.hex}", + constant = "{editor_constant.hex}", + type_ = "{editor_type.hex}", + tag = "{editor_tag.hex}", + punctuation = "{editor_punctuation.hex}", + link = "{editor_link.hex}", + regex = "{editor_regex.hex}", + attribute = "{editor_attribute.hex}", + decorator = "{editor_decorator.hex}", + escape_char = "{editor_escape_character.hex}", - CurrentLineEdge = "{border_focused.hex}", - - -- Semantic colors - Success = "{success.hex}", - Warning = "{warning.hex}", - Error = "{error.hex}", - Info = "{info.hex}", + -- Editor - UI + border = "{border_focused.hex}", + indent_guide = "{editor_indent_guide.hex}", + search_match = "{editor_search_match.hex}", + search_match_active = "{editor_search_match_active.hex}", + bracket_match = "{editor_bracket_match.hex}", + whitespace = "{editor_whitespace.hex}", + + -- Editor - Diagnostics + error_fg = "{editor_error.hex}", + warning_fg = "{editor_warning.hex}", + info_fg = "{editor_info.hex}", + hint_fg = "{editor_hint.hex}", + + -- Editor - Diff + diff_add = "{editor_inserted.hex}", + diff_change = "{editor_modified.hex}", + diff_delete = "{editor_deleted.hex}", + + -- Semantic + success = "{success.hex}", + warning = "{warning.hex}", + error = "{error.hex}", + info = "{info.hex}", + + -- Base (terminal / muted) + base0 = "{background.hex}", + base1 = "{surface.hex}", + base2 = "{surface_variant.hex}", + base3 = "{border.hex}", + base4 = "{editor_line_number.hex}", + base5 = "{editor_comment.hex}", + base6 = "{editor_line_number.hex}", + base7 = "{on_surface_variant.hex}", + base8 = "{foreground.hex}", } --- Helper function to set highlights in Neovim local function set_hl(group, opts) vim.api.nvim_set_hl(0, group, opts) end vim.o.winborder = "rounded" --- Basic editor highlights using the mapped palette -set_hl("Normal", { fg = palette.Default, bg = palette.Background }) -set_hl("CursorLine", { bg = palette.CurrentLineFill }) -set_hl("Visual", { bg = palette.Selection }) -set_hl("LineNr", { fg = palette.LineNumber }) -set_hl("CursorLineNr", { fg = palette.Keyword }) +--- General UI +set_hl("Normal", { bg = palette.bg, fg = palette.fg }) +set_hl("NormalFloat", { bg = palette.bg, fg = palette.fg }) +set_hl("NormalBorder", { bg = palette.bg, fg = palette.fg }) +set_hl("EndOfBuffer", { bg = palette.bg, fg = palette.bg }) --- Syntax highlights -set_hl("Comment", { fg = palette.Comment, italic = true }) -set_hl("Constant", { fg = palette.Number }) -set_hl("String", { fg = palette.String }) -set_hl("Character", { fg = palette.CharLiteral }) -set_hl("Identifier", { fg = palette.Identifier }) -set_hl("Function", { fg = palette.Keyword }) -set_hl("Statement", { fg = palette.Keyword }) -set_hl("PreProc", { fg = palette.Preprocessor }) -set_hl("Type", { fg = palette.Keyword }) -set_hl("Special", { fg = palette.PreprocIdentifier }) -set_hl("Underlined", { fg = palette.KnownIdentifier }) -set_hl("Error", { fg = palette.ErrorMarker, bg = palette.Background }) -set_hl("Todo", { fg = palette.Default, bg = palette.Keyword }) +set_hl("Visual", { bg = palette.dark_blue }) +set_hl("VisualBold", { bg = palette.dark_blue, bold = true }) --- Floating windows -set_hl("NormalFloat", { bg = palette.Background }) -set_hl("FloatBorder", { fg = palette.CurrentLineEdge, bg = palette.Background }) +set_hl("LineNr", { bg = palette.bg, fg = palette.grey }) +set_hl("Cursor", { bg = palette.blue }) +set_hl("CursorLine", { bg = palette.bg_alt }) +set_hl("CursorLineNr", { bg = palette.bg_alt, fg = palette.fg }) +set_hl("CursorColumn", { bg = palette.bg_alt }) --- Completion menu -set_hl("Pmenu", { bg = palette.Background }) -set_hl("PmenuSel", { bg = palette.Keyword, fg = palette.Background }) +set_hl("Folded", { bg = palette.bg_alt, fg = palette.base5 }) +set_hl("FoldColumn", { bg = palette.bg, fg = palette.fg_alt }) +set_hl("SignColumn", { bg = palette.bg }) +set_hl("ColorColumn", { bg = palette.bg_alt }) --- Git and diagnostic highlights -set_hl("DiffAdd", { fg = palette.Success, bg = palette.Background }) -set_hl("DiffChange", { fg = palette.Keyword, bg = palette.Background }) -set_hl("DiffDelete", { fg = palette.ErrorMarker, bg = palette.Background }) -set_hl("DiagnosticError", { fg = palette.Error }) -set_hl("DiagnosticWarn", { fg = palette.Warning }) -set_hl("DiagnosticInfo", { fg = palette.Info }) -set_hl("DiagnosticHint", { fg = palette.PreprocIdentifier }) +set_hl("IndentGuide", { fg = palette.indent_guide }) +set_hl("IndentGuideEven", { link = "IndentGuide" }) +set_hl("IndentGuideOdd", { link = "IndentGuide" }) --- Treesitter links +set_hl("TermCursor", { fg = palette.fg, reverse = true }) +set_hl("TermCursorNC", { fg = palette.fg_alt, reverse = true }) +set_hl("TermNormal", { link = "Normal" }) +set_hl("TermNormalNC", { link = "TermNormal" }) + +set_hl("WildMenu", { bg = palette.dark_blue, fg = palette.fg }) +set_hl("Separator", { fg = palette.fg_alt }) +set_hl("VertSplit", { bg = palette.bg, fg = palette.grey }) + +set_hl("TabLine", { bg = palette.bg_alt, fg = palette.base7, bold = true }) +set_hl("TabLineSel", { bg = palette.bg, fg = palette.blue, bold = true }) +set_hl("TabLineFill", { bg = palette.base1, bold = true }) + +set_hl("StatusLine", { bg = palette.base3, fg = palette.base8 }) +set_hl("StatusLineNC", { bg = palette.bg_alt, fg = palette.base6 }) +set_hl("StatusLinePart", { bg = palette.bg_alt, fg = palette.base6, bold = true }) +set_hl("StatusLinePartNC", { link = "StatusLinePart" }) + +set_hl("Pmenu", { bg = palette.bg_alt, fg = palette.fg }) +set_hl("PmenuSel", { bg = palette.blue, fg = palette.base0 }) +set_hl("PmenuSelBold", { bg = palette.blue, fg = palette.base0, bold = true }) +set_hl("PmenuSbar", { bg = palette.bg_alt }) +set_hl("PmenuThumb", { bg = palette.grey }) + +set_hl("FloatBorder", { fg = palette.border, bg = palette.bg }) + +--- Search, Highlight, Conceal +set_hl("Search", { bg = palette.dark_blue, fg = palette.fg }) +set_hl("Substitute", { fg = palette.red, bold = true, strikethrough = true }) +set_hl("IncSearch", { bg = palette.yellow, fg = palette.bg, bold = true }) +set_hl("IncSearchCursor", { reverse = true }) + +set_hl("Conceal", { fg = palette.grey }) +set_hl("SpecialKey", { fg = palette.violet, bold = true }) +set_hl("NonText", { fg = palette.fg_alt, bold = true }) +set_hl("MatchParen", { fg = palette.red, bold = true }) +set_hl("Whitespace", { fg = palette.whitespace }) + +set_hl("Highlight", { bg = palette.bg_alt }) +set_hl("HighlightSubtle", { link = "Highlight" }) + +set_hl("Question", { fg = palette.green, bold = true }) + +set_hl("File", { fg = palette.fg }) +set_hl("Directory", { fg = palette.violet, bold = true }) +set_hl("Title", { fg = palette.violet, bold = true }) + +set_hl("Bold", { bold = true }) +set_hl("Emphasis", { italic = true }) + +--- Messages +set_hl("Msg", { fg = palette.green }) +set_hl("MoreMsg", { fg = palette.blue }) +set_hl("WarningMsg", { fg = palette.yellow }) +set_hl("Error", { fg = palette.red }) +set_hl("ErrorMsg", { fg = palette.red }) +set_hl("ModeMsg", { fg = palette.violet }) +set_hl("Todo", { fg = palette.yellow, bold = true }) + +set_hl("healthError", { link = "ErrorMsg" }) +set_hl("healthSuccess", { link = "Msg" }) +set_hl("healthWarning", { link = "WarningMsg" }) + +--- Syntax +set_hl("Tag", { fg = palette.cyan, bold = true }) +set_hl("Link", { fg = palette.green, underline = true }) +set_hl("URL", { link = "Link" }) +set_hl("Underlined", { fg = palette.cyan, underline = true }) + +set_hl("Comment", { fg = palette.comment, italic = true }) +set_hl("CommentBold", { fg = palette.comment, bold = true }) +set_hl("SpecialComment", { fg = palette.base7, bold = true }) + +set_hl("Macro", { fg = palette.violet }) +set_hl("Define", { fg = palette.violet, bold = true }) +set_hl("Include", { fg = palette.violet, bold = true }) +set_hl("PreProc", { fg = palette.violet, bold = true }) +set_hl("PreCondit", { fg = palette.violet, bold = true }) + +set_hl("Label", { fg = palette.blue }) +set_hl("Repeat", { fg = palette.blue }) +set_hl("Keyword", { fg = palette.blue }) +set_hl("Operator", { fg = palette.operator }) +set_hl("Delimiter", { fg = palette.blue }) +set_hl("Statement", { fg = palette.blue }) +set_hl("Exception", { fg = palette.blue }) +set_hl("Conditional", { fg = palette.blue }) + +set_hl("Variable", { fg = palette.variable }) +set_hl("VariableBuiltin", { fg = palette.magenta, bold = true }) +set_hl("Constant", { fg = palette.violet, bold = true }) + +set_hl("Number", { fg = palette.orange }) +set_hl("Float", { link = "Number" }) +set_hl("Boolean", { fg = palette.orange, bold = true }) +set_hl("Enum", { fg = palette.orange }) + +set_hl("Character", { fg = palette.violet, bold = true }) +set_hl("SpecialChar", { fg = palette.violet, bold = true }) +set_hl("String", { fg = palette.green }) +set_hl("StringDelimiter", { link = "String" }) + +set_hl("Special", { fg = palette.violet }) +set_hl("SpecialBold", { fg = palette.violet, bold = true }) + +set_hl("Field", { fg = palette.violet }) +set_hl("Argument", { fg = palette.parameter }) +set_hl("Attribute", { fg = palette.attribute }) +set_hl("Identifier", { fg = palette.variable }) +set_hl("Property", { fg = palette.property }) +set_hl("Function", { fg = palette.function_ }) +set_hl("FunctionBuiltin", { fg = palette.function_, bold = true }) +set_hl("KeywordFunction", { fg = palette.blue, bold = true }) +set_hl("Method", { fg = palette.function_ }) + +set_hl("Type", { fg = palette.type_ }) +set_hl("Typedef", { fg = palette.blue }) +set_hl("TypeBuiltin", { fg = palette.type_, bold = true }) +set_hl("Class", { fg = palette.blue }) +set_hl("StorageClass", { fg = palette.blue }) +set_hl("Structure", { fg = palette.blue }) + +set_hl("Regexp", { fg = palette.regex }) +set_hl("RegexpSpecial", { fg = palette.regex }) +set_hl("RegexpDelimiter", { fg = palette.regex, bold = true }) +set_hl("RegexpKey", { fg = palette.regex, bold = true }) + +set_hl("CommentURL", { link = "URL" }) +set_hl("CommentLabel", { link = "CommentBold" }) +set_hl("CommentSection", { link = "CommentBold" }) +set_hl("Noise", { link = "Comment" }) + +--- Diff +set_hl("DiffAddedGutter", { fg = palette.green, bold = true }) +set_hl("DiffModifiedGutter", { fg = palette.orange, bold = true }) +set_hl("DiffRemovedGutter", { fg = palette.red, bold = true }) + +set_hl("DiffAdd", { link = "DiffAddedGutter" }) +set_hl("DiffChange", { link = "DiffModifiedGutter" }) +set_hl("DiffDelete", { link = "DiffRemovedGutter" }) + +set_hl("diffAdded", { fg = palette.green, bg = palette.bg_alt }) +set_hl("diffChanged", { fg = palette.violet }) +set_hl("diffRemoved", { fg = palette.red, bg = palette.base3 }) +set_hl("diffLine", { fg = palette.violet }) +set_hl("diffIndexLine", { fg = palette.cyan }) +set_hl("diffSubname", { fg = palette.cyan }) +set_hl("diffFile", { fg = palette.cyan }) +set_hl("diffOldFile", { fg = palette.blue }) +set_hl("diffNewFile", { fg = palette.blue }) + +--- Markdown +set_hl("markdownCode", { link = "Comment" }) +set_hl("markdownCodeBlock", { link = "markdownCode" }) +set_hl("markdownH1", { bold = true }) +set_hl("markdownH2", { bold = true }) +set_hl("markdownLinkText", { underline = true }) + +--- LSP / Diagnostics +set_hl("LspHighlight", { bg = palette.bg_alt, bold = true }) +set_hl("LspSignatureActiveParameter", { fg = palette.violet }) + +set_hl("DiagnosticError", { fg = palette.error }) +set_hl("DiagnosticWarn", { fg = palette.warning }) +set_hl("DiagnosticInfo", { fg = palette.info }) +set_hl("DiagnosticHint", { fg = palette.hint_fg }) +set_hl("DiagnosticFloatingError", { link = "ErrorMsg" }) +set_hl("DiagnosticFloatingWarn", { link = "WarningMsg" }) +set_hl("DiagnosticFloatingInfo", { link = "MoreMsg" }) +set_hl("DiagnosticFloatingHint", { link = "Msg" }) +set_hl("DiagnosticDefaultError", { link = "ErrorMsg" }) +set_hl("DiagnosticDefaultWarn", { link = "WarningMsg" }) +set_hl("DiagnosticDefaultInfo", { link = "MoreMsg" }) +set_hl("DiagnosticDefaultHint", { link = "Msg" }) +set_hl("DiagnosticVirtualTextError", { link = "ErrorMsg" }) +set_hl("DiagnosticVirtualTextWarn", { link = "WarningMsg" }) +set_hl("DiagnosticVirtualTextInfo", { link = "MoreMsg" }) +set_hl("DiagnosticVirtualTextHint", { link = "Msg" }) +set_hl("DiagnosticSignError", { link = "ErrorMsg" }) +set_hl("DiagnosticSignWarning", { link = "WarningMsg" }) +set_hl("DiagnosticSignInformation", { link = "MoreMsg" }) +set_hl("DiagnosticSignHint", { link = "Msg" }) + +set_hl("LspReferenceText", { link = "LspHighlight" }) +set_hl("LspReferenceRead", { link = "LspHighlight" }) +set_hl("LspReferenceWrite", { link = "LspHighlight" }) + +--- Tree-Sitter +set_hl("@annotation", { link = "PreProc" }) +set_hl("@attribute", { link = "Attribute" }) +set_hl("@conditional", { link = "Conditional" }) set_hl("@comment", { link = "Comment" }) -set_hl("@string", { fg = palette.String }) -set_hl("@function", { fg = palette.Keyword }) -set_hl("@variable", { fg = palette.Identifier }) -set_hl("@keyword", { fg = palette.Keyword }) -set_hl("@type", { fg = palette.Preprocessor }) \ No newline at end of file +set_hl("@constructor", { link = "Structure" }) +set_hl("@constant", { link = "Constant" }) +set_hl("@constant.builtin", { link = "Constant" }) +set_hl("@constant.macro", { link = "Macro" }) +set_hl("@error", { link = "Error" }) +set_hl("@exception", { link = "Exception" }) +set_hl("@field", { link = "Field" }) +set_hl("@float", { link = "Float" }) +set_hl("@function", { link = "Function" }) +set_hl("@function.builtin", { link = "FunctionBuiltin" }) +set_hl("@function.macro", { link = "Macro" }) +set_hl("@include", { link = "Include" }) +set_hl("@keyword", { link = "Keyword" }) +set_hl("@keyword.function", { link = "KeywordFunction" }) +set_hl("@label", { link = "Label" }) +set_hl("@math", { link = "Special" }) +set_hl("@method", { link = "Method" }) +set_hl("@namespace", { link = "Directory" }) +set_hl("@number", { link = "Number" }) +set_hl("@boolean", { link = "Boolean" }) +set_hl("@operator", { link = "Operator" }) +set_hl("@parameter", { link = "Argument" }) +set_hl("@parameter.reference", { link = "Argument" }) +set_hl("@property", { link = "Property" }) +set_hl("@punctuation.delimiter", { link = "Delimiter" }) +set_hl("@punctuation.bracket", { link = "Delimiter" }) +set_hl("@punctuation.special", { link = "Delimiter" }) +set_hl("@repeat", { link = "Repeat" }) +set_hl("@string", { link = "String" }) +set_hl("@string.regex", { link = "StringDelimiter" }) +set_hl("@string.escape", { link = "StringDelimiter" }) +set_hl("@structure", { link = "Structure" }) +set_hl("@tag", { link = "Tag" }) +set_hl("@tag.attribute", { link = "Attribute" }) +set_hl("@tag.delimiter", { link = "Delimiter" }) +set_hl("@strong", { link = "Bold" }) +set_hl("@uri", { link = "URL" }) +set_hl("@warning", { link = "WarningMsg" }) +set_hl("@danger", { link = "ErrorMsg" }) +set_hl("@type", { link = "Type" }) +set_hl("@type.builtin", { link = "TypeBuiltin" }) +set_hl("@variable", { fg = palette.variable }) +set_hl("@variable.builtin", { link = "VariableBuiltin" }) +set_hl("@text", { link = "Normal" }) +set_hl("@text.strong", { fg = palette.fg, bold = true }) +set_hl("@text.emphasis", { link = "Emphasis" }) +set_hl("@text.underline", { underline = true }) +set_hl("@text.title", { link = "Title" }) +set_hl("@text.uri", { link = "URL" }) +set_hl("@text.note", { link = "MoreMsg" }) +set_hl("@text.warning", { link = "WarningMsg" }) +set_hl("@text.danger", { link = "ErrorMsg" }) +set_hl("@todo", { link = "Todo" }) + +--- NetRW +set_hl("netrwClassify", { fg = palette.blue }) +set_hl("netrwDir", { link = "Directory" }) +set_hl("netrwExe", { fg = palette.green, bold = true }) +set_hl("netrwMakefile", { fg = palette.yellow, bold = true }) +set_hl("netrwTreeBar", { link = "Comment" }) diff --git a/extra/palettes/dark/cursed/cursed.toml b/extra/palettes/dark/cursed/cursed.toml index 451ed8f..7e06681 100644 --- a/extra/palettes/dark/cursed/cursed.toml +++ b/extra/palettes/dark/cursed/cursed.toml @@ -21,21 +21,72 @@ base0F = '#B0AFA8FF' border = '#3F3639FF' border_focused = '#E1C135FF' cursor = '#E1C135FF' +# Editor - Basic editor_background = '#151515FF' -editor_command = '#CEB34FFF' -editor_comment = '#7A7A7AFF' -editor_disabled = '#3F3639FF' -editor_emphasis = '#DC7671FF' -editor_error = '#B44242FF' -editor_inactive = '#3F3639FF' -editor_line_number = '#86596CFF' -editor_link = '#60928FFF' -editor_main = '#C2C2B0FF' -editor_selected = '#3F3639FF' +editor_foreground = '#C2C2B0FF' +editor_line_highlight = '#1C1C1CFF' +editor_selection = '#3F3639FF' editor_selection_inactive = '#2A2A2AFF' +editor_cursor = '#E1C135FF' +editor_whitespace = '#3F3639FF' + +# Editor - Gutter +editor_gutter_background = '#151515FF' +editor_gutter_foreground = '#7A7A7AFF' +editor_line_number = '#86596CFF' +editor_line_number_active = '#C2C2B0FF' + +# Editor - Syntax +editor_comment = '#7A7A7AFF' editor_string = '#76C39BFF' -editor_success = '#95A328FF' +editor_number = '#DC7671FF' +editor_boolean = '#DC7671FF' +editor_keyword = '#CEB34FFF' +editor_operator = '#C2C2B0FF' +editor_function = '#95A328FF' +editor_variable = '#C2C2B0FF' +editor_parameter = '#60928FFF' +editor_property = '#76C39BFF' +editor_constant = '#DC7671FF' +editor_type = '#60928FFF' +editor_class = '#60928FFF' +editor_interface = '#60928FFF' +editor_enum = '#60928FFF' +editor_namespace = '#86596CFF' +editor_attribute = '#E1C135FF' +editor_decorator = '#E1C135FF' +editor_tag = '#B44242FF' +editor_punctuation = '#B0AFA8FF' +editor_link = '#60928FFF' +editor_regex = '#CEB34FFF' +editor_escape_character = '#DC7671FF' + +# Editor - Diagnostics +editor_invalid = '#B44242FF' +editor_error = '#B44242FF' +editor_error_background = '#2A1515FF' editor_warning = '#E1C135FF' +editor_warning_background = '#2A2515FF' +editor_info = '#60928FFF' +editor_info_background = '#15252AFF' +editor_hint = '#95A328FF' +editor_hint_background = '#1A2A15FF' + +# Editor - UI Elements +editor_active_line_border = '#3F3639FF' +editor_indent_guide = '#2A2A2AFF' +editor_indent_guide_active = '#3F3639FF' +editor_bracket_match = '#E1C135FF' +editor_search_match = '#E1C13580' +editor_search_match_active = '#E1C135FF' +editor_find_range_highlight = '#E1C13540' + +# Editor - Diff +editor_deleted = '#B44242FF' +editor_inserted = '#95A328FF' +editor_modified = '#E1C135FF' +editor_ignored = '#7A7A7AFF' +editor_folded_background = '#1C1C1CFF' error = '#B44242FF' foreground = '#C2C2B0FF' info = '#60928FFF' diff --git a/extra/palettes/dark/nord/nord.toml b/extra/palettes/dark/nord/nord.toml index 19d1714..729ab3b 100644 --- a/extra/palettes/dark/nord/nord.toml +++ b/extra/palettes/dark/nord/nord.toml @@ -21,21 +21,72 @@ base0F = '#ECEFF4FF' border = '#4C566AFF' border_focused = '#88C0D0FF' cursor = '#D8DEE9FF' +# Editor - Basic editor_background = '#2E3440FF' -editor_command = '#81A1C1FF' -editor_comment = '#616E88FF' -editor_disabled = '#4C566AFF' -editor_emphasis = '#B48EADFF' -editor_error = '#BF616AFF' -editor_inactive = '#616E88FF' -editor_line_number = '#4C566AFF' -editor_link = '#88C0D0FF' -editor_main = '#D8DEE9FF' -editor_selected = '#434C5EFF' +editor_foreground = '#D8DEE9FF' +editor_line_highlight = '#3B4252FF' +editor_selection = '#434C5EFF' editor_selection_inactive = '#3B4252FF' +editor_cursor = '#D8DEE9FF' +editor_whitespace = '#4C566AFF' + +# Editor - Gutter +editor_gutter_background = '#2E3440FF' +editor_gutter_foreground = '#4C566AFF' +editor_line_number = '#4C566AFF' +editor_line_number_active = '#D8DEE9FF' + +# Editor - Syntax +editor_comment = '#616E88FF' editor_string = '#A3BE8CFF' -editor_success = '#A3BE8CFF' +editor_number = '#B48EADFF' +editor_boolean = '#B48EADFF' +editor_keyword = '#81A1C1FF' +editor_operator = '#D8DEE9FF' +editor_function = '#88C0D0FF' +editor_variable = '#D8DEE9FF' +editor_parameter = '#D8DEE9FF' +editor_property = '#8FBCBBFF' +editor_constant = '#B48EADFF' +editor_type = '#8FBCBBFF' +editor_class = '#8FBCBBFF' +editor_interface = '#8FBCBBFF' +editor_enum = '#8FBCBBFF' +editor_namespace = '#5E81ACFF' +editor_attribute = '#D08770FF' +editor_decorator = '#D08770FF' +editor_tag = '#BF616AFF' +editor_punctuation = '#ECEFF4FF' +editor_link = '#88C0D0FF' +editor_regex = '#EBCB8BFF' +editor_escape_character = '#D08770FF' + +# Editor - Diagnostics +editor_invalid = '#BF616AFF' +editor_error = '#BF616AFF' +editor_error_background = '#3B2E2EFF' editor_warning = '#EBCB8BFF' +editor_warning_background = '#3B3B2EFF' +editor_info = '#5E81ACFF' +editor_info_background = '#2E3440FF' +editor_hint = '#A3BE8CFF' +editor_hint_background = '#2E3B2EFF' + +# Editor - UI Elements +editor_active_line_border = '#4C566AFF' +editor_indent_guide = '#3B4252FF' +editor_indent_guide_active = '#4C566AFF' +editor_bracket_match = '#88C0D0FF' +editor_search_match = '#EBCB8B80' +editor_search_match_active = '#EBCB8BFF' +editor_find_range_highlight = '#EBCB8B40' + +# Editor - Diff +editor_deleted = '#BF616AFF' +editor_inserted = '#A3BE8CFF' +editor_modified = '#EBCB8BFF' +editor_ignored = '#616E88FF' +editor_folded_background = '#3B4252FF' error = '#BF616AFF' foreground = '#D8DEE9FF' info = '#5E81ACFF' diff --git a/extra/palettes/light/cursed-light/cursed-light.toml b/extra/palettes/light/cursed-light/cursed-light.toml index f938c68..a6e2753 100644 --- a/extra/palettes/light/cursed-light/cursed-light.toml +++ b/extra/palettes/light/cursed-light/cursed-light.toml @@ -21,21 +21,72 @@ base0F = '#4F4F48FF' border = '#D0D0C8FF' border_focused = '#C9A305FF' cursor = '#C9A305FF' +# Editor - Basic editor_background = '#F5F5F5FF' -editor_command = '#B89A1FFF' -editor_comment = '#A0A098FF' -editor_disabled = '#C0C0B8FF' -editor_emphasis = '#DC7671FF' -editor_error = '#B44242FF' -editor_inactive = '#A0A098FF' -editor_line_number = '#86596CFF' -editor_link = '#60928FFF' -editor_main = '#3D3D2FFF' -editor_selected = '#D0D0C8FF' +editor_foreground = '#3D3D2FFF' +editor_line_highlight = '#E8E8E8FF' +editor_selection = '#D0D0C8FF' editor_selection_inactive = '#E0E0D8FF' +editor_cursor = '#C9A305FF' +editor_whitespace = '#C0C0B8FF' + +# Editor - Gutter +editor_gutter_background = '#F5F5F5FF' +editor_gutter_foreground = '#A0A098FF' +editor_line_number = '#86596CFF' +editor_line_number_active = '#3D3D2FFF' + +# Editor - Syntax +editor_comment = '#A0A098FF' editor_string = '#5FA37BFF' -editor_success = '#95A328FF' +editor_number = '#DC7671FF' +editor_boolean = '#DC7671FF' +editor_keyword = '#B89A1FFF' +editor_operator = '#3D3D2FFF' +editor_function = '#95A328FF' +editor_variable = '#3D3D2FFF' +editor_parameter = '#60928FFF' +editor_property = '#5FA37BFF' +editor_constant = '#DC7671FF' +editor_type = '#60928FFF' +editor_class = '#60928FFF' +editor_interface = '#60928FFF' +editor_enum = '#60928FFF' +editor_namespace = '#86596CFF' +editor_attribute = '#C9A305FF' +editor_decorator = '#C9A305FF' +editor_tag = '#B44242FF' +editor_punctuation = '#4F4F48FF' +editor_link = '#60928FFF' +editor_regex = '#B89A1FFF' +editor_escape_character = '#DC7671FF' + +# Editor - Diagnostics +editor_invalid = '#B44242FF' +editor_error = '#B44242FF' +editor_error_background = '#FFEDEDFF' editor_warning = '#C9A305FF' +editor_warning_background = '#FFF8E0FF' +editor_info = '#60928FFF' +editor_info_background = '#E0F8FFFF' +editor_hint = '#95A328FF' +editor_hint_background = '#E8FFE8FF' + +# Editor - UI Elements +editor_active_line_border = '#D0D0C8FF' +editor_indent_guide = '#E0E0D8FF' +editor_indent_guide_active = '#C0C0B8FF' +editor_bracket_match = '#C9A305FF' +editor_search_match = '#C9A30580' +editor_search_match_active = '#C9A305FF' +editor_find_range_highlight = '#C9A30540' + +# Editor - Diff +editor_deleted = '#B44242FF' +editor_inserted = '#95A328FF' +editor_modified = '#C9A305FF' +editor_ignored = '#A0A098FF' +editor_folded_background = '#E8E8E8FF' error = '#B44242FF' foreground = '#3D3D2FFF' info = '#60928FFF' diff --git a/extra/templates/text-editors/neovim/nvim.lua b/extra/templates/text-editors/neovim/nvim.lua index 18fc91c..297a0ff 100644 --- a/extra/templates/text-editors/neovim/nvim.lua +++ b/extra/templates/text-editors/neovim/nvim.lua @@ -3,91 +3,370 @@ vim.cmd("syntax reset") vim.g.colors_name = "clrsync" local palette = { - -- Editor colors - Default = "{editor_main.hex}", - Keyword = "{editor_command.hex}", - Number = "{editor_warning.hex}", - String = "{editor_string.hex}", - CharLiteral = "{editor_string.hex}", - Punctuation = "{editor_main.hex}", - Preprocessor = "{editor_emphasis.hex}", - Identifier = "{editor_main.hex}", - KnownIdentifier = "{editor_link.hex}", - PreprocIdentifier = "{editor_link.hex}", + -- General UI + bg = "{editor_background.hex}", + bg_alt = "{surface_variant.hex}", + fg = "{editor_foreground.hex}", + fg_alt = "{on_surface_variant.hex}", + grey = "{editor_line_number.hex}", - Comment = "{editor_comment.hex}", - MultiLineComment = "{editor_comment.hex}", + -- Accent / keyword colors + blue = "{editor_keyword.hex}", + cyan = "{editor_info.hex}", + violet = "{editor_link.hex}", + magenta = "{editor_parameter.hex}", + orange = "{editor_number.hex}", + yellow = "{editor_warning.hex}", + green = "{success.hex}", + red = "{error.hex}", - Background = "{editor_background.hex}", - Cursor = "{cursor.hex}", + -- Editor - Basic + cursor = "{cursor.hex}", + selection = "{editor_selection.hex}", + dark_blue = "{editor_selection.hex}", + line_highlight = "{editor_line_highlight.hex}", - Selection = "{editor_selected.hex}", - ErrorMarker = "{editor_error.hex}", - Breakpoint = "{editor_error.hex}", + -- Editor - Gutter + line_number = "{editor_line_number.hex}", + line_number_active = "{editor_line_number_active.hex}", - LineNumber = "{editor_line_number.hex}", - CurrentLineFill = "{surface_variant.hex}", - CurrentLineFillInactive = "{surface.hex}", + -- Editor - Syntax + comment = "{editor_comment.hex}", + string = "{editor_string.hex}", + number = "{editor_number.hex}", + boolean = "{editor_boolean.hex}", + keyword = "{editor_keyword.hex}", + operator = "{editor_operator.hex}", + function_ = "{editor_function.hex}", + variable = "{editor_variable.hex}", + parameter = "{editor_parameter.hex}", + property = "{editor_property.hex}", + constant = "{editor_constant.hex}", + type_ = "{editor_type.hex}", + tag = "{editor_tag.hex}", + punctuation = "{editor_punctuation.hex}", + link = "{editor_link.hex}", + regex = "{editor_regex.hex}", + attribute = "{editor_attribute.hex}", + decorator = "{editor_decorator.hex}", + escape_char = "{editor_escape_character.hex}", - CurrentLineEdge = "{border_focused.hex}", - - -- Semantic colors - Success = "{success.hex}", - Warning = "{warning.hex}", - Error = "{error.hex}", - Info = "{info.hex}", + -- Editor - UI + border = "{border_focused.hex}", + indent_guide = "{editor_indent_guide.hex}", + search_match = "{editor_search_match.hex}", + search_match_active = "{editor_search_match_active.hex}", + bracket_match = "{editor_bracket_match.hex}", + whitespace = "{editor_whitespace.hex}", + + -- Editor - Diagnostics + error_fg = "{editor_error.hex}", + warning_fg = "{editor_warning.hex}", + info_fg = "{editor_info.hex}", + hint_fg = "{editor_hint.hex}", + + -- Editor - Diff + diff_add = "{editor_inserted.hex}", + diff_change = "{editor_modified.hex}", + diff_delete = "{editor_deleted.hex}", + + -- Semantic + success = "{success.hex}", + warning = "{warning.hex}", + error = "{error.hex}", + info = "{info.hex}", + + -- Base (terminal / muted) + base0 = "{background.hex}", + base1 = "{surface.hex}", + base2 = "{surface_variant.hex}", + base3 = "{border.hex}", + base4 = "{editor_line_number.hex}", + base5 = "{editor_comment.hex}", + base6 = "{editor_line_number.hex}", + base7 = "{on_surface_variant.hex}", + base8 = "{foreground.hex}", } --- Helper function to set highlights in Neovim local function set_hl(group, opts) vim.api.nvim_set_hl(0, group, opts) end vim.o.winborder = "rounded" --- Basic editor highlights using the mapped palette -set_hl("Normal", { fg = palette.Default, bg = palette.Background }) -set_hl("CursorLine", { bg = palette.CurrentLineFill }) -set_hl("Visual", { bg = palette.Selection }) -set_hl("LineNr", { fg = palette.LineNumber }) -set_hl("CursorLineNr", { fg = palette.Keyword }) +--- General UI +set_hl("Normal", { bg = palette.bg, fg = palette.fg }) +set_hl("NormalFloat", { bg = palette.bg, fg = palette.fg }) +set_hl("NormalBorder", { bg = palette.bg, fg = palette.fg }) +set_hl("EndOfBuffer", { bg = palette.bg, fg = palette.bg }) --- Syntax highlights -set_hl("Comment", { fg = palette.Comment, italic = true }) -set_hl("Constant", { fg = palette.Number }) -set_hl("String", { fg = palette.String }) -set_hl("Character", { fg = palette.CharLiteral }) -set_hl("Identifier", { fg = palette.Identifier }) -set_hl("Function", { fg = palette.Keyword }) -set_hl("Statement", { fg = palette.Keyword }) -set_hl("PreProc", { fg = palette.Preprocessor }) -set_hl("Type", { fg = palette.Keyword }) -set_hl("Special", { fg = palette.PreprocIdentifier }) -set_hl("Underlined", { fg = palette.KnownIdentifier }) -set_hl("Error", { fg = palette.ErrorMarker, bg = palette.Background }) -set_hl("Todo", { fg = palette.Default, bg = palette.Keyword }) +set_hl("Visual", { bg = palette.dark_blue }) +set_hl("VisualBold", { bg = palette.dark_blue, bold = true }) --- Floating windows -set_hl("NormalFloat", { bg = palette.Background }) -set_hl("FloatBorder", { fg = palette.CurrentLineEdge, bg = palette.Background }) +set_hl("LineNr", { bg = palette.bg, fg = palette.grey }) +set_hl("Cursor", { bg = palette.blue }) +set_hl("CursorLine", { bg = palette.bg_alt }) +set_hl("CursorLineNr", { bg = palette.bg_alt, fg = palette.fg }) +set_hl("CursorColumn", { bg = palette.bg_alt }) --- Completion menu -set_hl("Pmenu", { bg = palette.Background }) -set_hl("PmenuSel", { bg = palette.Keyword, fg = palette.Background }) +set_hl("Folded", { bg = palette.bg_alt, fg = palette.base5 }) +set_hl("FoldColumn", { bg = palette.bg, fg = palette.fg_alt }) +set_hl("SignColumn", { bg = palette.bg }) +set_hl("ColorColumn", { bg = palette.bg_alt }) --- Git and diagnostic highlights -set_hl("DiffAdd", { fg = palette.Success, bg = palette.Background }) -set_hl("DiffChange", { fg = palette.Keyword, bg = palette.Background }) -set_hl("DiffDelete", { fg = palette.ErrorMarker, bg = palette.Background }) -set_hl("DiagnosticError", { fg = palette.Error }) -set_hl("DiagnosticWarn", { fg = palette.Warning }) -set_hl("DiagnosticInfo", { fg = palette.Info }) -set_hl("DiagnosticHint", { fg = palette.PreprocIdentifier }) +set_hl("IndentGuide", { fg = palette.indent_guide }) +set_hl("IndentGuideEven", { link = "IndentGuide" }) +set_hl("IndentGuideOdd", { link = "IndentGuide" }) --- Treesitter links +set_hl("TermCursor", { fg = palette.fg, reverse = true }) +set_hl("TermCursorNC", { fg = palette.fg_alt, reverse = true }) +set_hl("TermNormal", { link = "Normal" }) +set_hl("TermNormalNC", { link = "TermNormal" }) + +set_hl("WildMenu", { bg = palette.dark_blue, fg = palette.fg }) +set_hl("Separator", { fg = palette.fg_alt }) +set_hl("VertSplit", { bg = palette.bg, fg = palette.grey }) + +set_hl("TabLine", { bg = palette.bg_alt, fg = palette.base7, bold = true }) +set_hl("TabLineSel", { bg = palette.bg, fg = palette.blue, bold = true }) +set_hl("TabLineFill", { bg = palette.base1, bold = true }) + +set_hl("StatusLine", { bg = palette.base3, fg = palette.base8 }) +set_hl("StatusLineNC", { bg = palette.bg_alt, fg = palette.base6 }) +set_hl("StatusLinePart", { bg = palette.bg_alt, fg = palette.base6, bold = true }) +set_hl("StatusLinePartNC", { link = "StatusLinePart" }) + +set_hl("Pmenu", { bg = palette.bg_alt, fg = palette.fg }) +set_hl("PmenuSel", { bg = palette.blue, fg = palette.base0 }) +set_hl("PmenuSelBold", { bg = palette.blue, fg = palette.base0, bold = true }) +set_hl("PmenuSbar", { bg = palette.bg_alt }) +set_hl("PmenuThumb", { bg = palette.grey }) + +set_hl("FloatBorder", { fg = palette.border, bg = palette.bg }) + +--- Search, Highlight, Conceal +set_hl("Search", { bg = palette.dark_blue, fg = palette.fg }) +set_hl("Substitute", { fg = palette.red, bold = true, strikethrough = true }) +set_hl("IncSearch", { bg = palette.yellow, fg = palette.bg, bold = true }) +set_hl("IncSearchCursor", { reverse = true }) + +set_hl("Conceal", { fg = palette.grey }) +set_hl("SpecialKey", { fg = palette.violet, bold = true }) +set_hl("NonText", { fg = palette.fg_alt, bold = true }) +set_hl("MatchParen", { fg = palette.red, bold = true }) +set_hl("Whitespace", { fg = palette.whitespace }) + +set_hl("Highlight", { bg = palette.bg_alt }) +set_hl("HighlightSubtle", { link = "Highlight" }) + +set_hl("Question", { fg = palette.green, bold = true }) + +set_hl("File", { fg = palette.fg }) +set_hl("Directory", { fg = palette.violet, bold = true }) +set_hl("Title", { fg = palette.violet, bold = true }) + +set_hl("Bold", { bold = true }) +set_hl("Emphasis", { italic = true }) + +--- Messages +set_hl("Msg", { fg = palette.green }) +set_hl("MoreMsg", { fg = palette.blue }) +set_hl("WarningMsg", { fg = palette.yellow }) +set_hl("Error", { fg = palette.red }) +set_hl("ErrorMsg", { fg = palette.red }) +set_hl("ModeMsg", { fg = palette.violet }) +set_hl("Todo", { fg = palette.yellow, bold = true }) + +set_hl("healthError", { link = "ErrorMsg" }) +set_hl("healthSuccess", { link = "Msg" }) +set_hl("healthWarning", { link = "WarningMsg" }) + +--- Syntax +set_hl("Tag", { fg = palette.cyan, bold = true }) +set_hl("Link", { fg = palette.green, underline = true }) +set_hl("URL", { link = "Link" }) +set_hl("Underlined", { fg = palette.cyan, underline = true }) + +set_hl("Comment", { fg = palette.comment, italic = true }) +set_hl("CommentBold", { fg = palette.comment, bold = true }) +set_hl("SpecialComment", { fg = palette.base7, bold = true }) + +set_hl("Macro", { fg = palette.violet }) +set_hl("Define", { fg = palette.violet, bold = true }) +set_hl("Include", { fg = palette.violet, bold = true }) +set_hl("PreProc", { fg = palette.violet, bold = true }) +set_hl("PreCondit", { fg = palette.violet, bold = true }) + +set_hl("Label", { fg = palette.blue }) +set_hl("Repeat", { fg = palette.blue }) +set_hl("Keyword", { fg = palette.blue }) +set_hl("Operator", { fg = palette.operator }) +set_hl("Delimiter", { fg = palette.blue }) +set_hl("Statement", { fg = palette.blue }) +set_hl("Exception", { fg = palette.blue }) +set_hl("Conditional", { fg = palette.blue }) + +set_hl("Variable", { fg = palette.variable }) +set_hl("VariableBuiltin", { fg = palette.magenta, bold = true }) +set_hl("Constant", { fg = palette.violet, bold = true }) + +set_hl("Number", { fg = palette.orange }) +set_hl("Float", { link = "Number" }) +set_hl("Boolean", { fg = palette.orange, bold = true }) +set_hl("Enum", { fg = palette.orange }) + +set_hl("Character", { fg = palette.violet, bold = true }) +set_hl("SpecialChar", { fg = palette.violet, bold = true }) +set_hl("String", { fg = palette.green }) +set_hl("StringDelimiter", { link = "String" }) + +set_hl("Special", { fg = palette.violet }) +set_hl("SpecialBold", { fg = palette.violet, bold = true }) + +set_hl("Field", { fg = palette.violet }) +set_hl("Argument", { fg = palette.parameter }) +set_hl("Attribute", { fg = palette.attribute }) +set_hl("Identifier", { fg = palette.variable }) +set_hl("Property", { fg = palette.property }) +set_hl("Function", { fg = palette.function_ }) +set_hl("FunctionBuiltin", { fg = palette.function_, bold = true }) +set_hl("KeywordFunction", { fg = palette.blue, bold = true }) +set_hl("Method", { fg = palette.function_ }) + +set_hl("Type", { fg = palette.type_ }) +set_hl("Typedef", { fg = palette.blue }) +set_hl("TypeBuiltin", { fg = palette.type_, bold = true }) +set_hl("Class", { fg = palette.blue }) +set_hl("StorageClass", { fg = palette.blue }) +set_hl("Structure", { fg = palette.blue }) + +set_hl("Regexp", { fg = palette.regex }) +set_hl("RegexpSpecial", { fg = palette.regex }) +set_hl("RegexpDelimiter", { fg = palette.regex, bold = true }) +set_hl("RegexpKey", { fg = palette.regex, bold = true }) + +set_hl("CommentURL", { link = "URL" }) +set_hl("CommentLabel", { link = "CommentBold" }) +set_hl("CommentSection", { link = "CommentBold" }) +set_hl("Noise", { link = "Comment" }) + +--- Diff +set_hl("DiffAddedGutter", { fg = palette.green, bold = true }) +set_hl("DiffModifiedGutter", { fg = palette.orange, bold = true }) +set_hl("DiffRemovedGutter", { fg = palette.red, bold = true }) + +set_hl("DiffAdd", { link = "DiffAddedGutter" }) +set_hl("DiffChange", { link = "DiffModifiedGutter" }) +set_hl("DiffDelete", { link = "DiffRemovedGutter" }) + +set_hl("diffAdded", { fg = palette.green, bg = palette.bg_alt }) +set_hl("diffChanged", { fg = palette.violet }) +set_hl("diffRemoved", { fg = palette.red, bg = palette.base3 }) +set_hl("diffLine", { fg = palette.violet }) +set_hl("diffIndexLine", { fg = palette.cyan }) +set_hl("diffSubname", { fg = palette.cyan }) +set_hl("diffFile", { fg = palette.cyan }) +set_hl("diffOldFile", { fg = palette.blue }) +set_hl("diffNewFile", { fg = palette.blue }) + +--- Markdown +set_hl("markdownCode", { link = "Comment" }) +set_hl("markdownCodeBlock", { link = "markdownCode" }) +set_hl("markdownH1", { bold = true }) +set_hl("markdownH2", { bold = true }) +set_hl("markdownLinkText", { underline = true }) + +--- LSP / Diagnostics +set_hl("LspHighlight", { bg = palette.bg_alt, bold = true }) +set_hl("LspSignatureActiveParameter", { fg = palette.violet }) + +set_hl("DiagnosticError", { fg = palette.error }) +set_hl("DiagnosticWarn", { fg = palette.warning }) +set_hl("DiagnosticInfo", { fg = palette.info }) +set_hl("DiagnosticHint", { fg = palette.hint_fg }) +set_hl("DiagnosticFloatingError", { link = "ErrorMsg" }) +set_hl("DiagnosticFloatingWarn", { link = "WarningMsg" }) +set_hl("DiagnosticFloatingInfo", { link = "MoreMsg" }) +set_hl("DiagnosticFloatingHint", { link = "Msg" }) +set_hl("DiagnosticDefaultError", { link = "ErrorMsg" }) +set_hl("DiagnosticDefaultWarn", { link = "WarningMsg" }) +set_hl("DiagnosticDefaultInfo", { link = "MoreMsg" }) +set_hl("DiagnosticDefaultHint", { link = "Msg" }) +set_hl("DiagnosticVirtualTextError", { link = "ErrorMsg" }) +set_hl("DiagnosticVirtualTextWarn", { link = "WarningMsg" }) +set_hl("DiagnosticVirtualTextInfo", { link = "MoreMsg" }) +set_hl("DiagnosticVirtualTextHint", { link = "Msg" }) +set_hl("DiagnosticSignError", { link = "ErrorMsg" }) +set_hl("DiagnosticSignWarning", { link = "WarningMsg" }) +set_hl("DiagnosticSignInformation", { link = "MoreMsg" }) +set_hl("DiagnosticSignHint", { link = "Msg" }) + +set_hl("LspReferenceText", { link = "LspHighlight" }) +set_hl("LspReferenceRead", { link = "LspHighlight" }) +set_hl("LspReferenceWrite", { link = "LspHighlight" }) + +--- Tree-Sitter +set_hl("@annotation", { link = "PreProc" }) +set_hl("@attribute", { link = "Attribute" }) +set_hl("@conditional", { link = "Conditional" }) set_hl("@comment", { link = "Comment" }) -set_hl("@string", { fg = palette.String }) -set_hl("@function", { fg = palette.Keyword }) -set_hl("@variable", { fg = palette.Identifier }) -set_hl("@keyword", { fg = palette.Keyword }) -set_hl("@type", { fg = palette.Preprocessor }) \ No newline at end of file +set_hl("@constructor", { link = "Structure" }) +set_hl("@constant", { link = "Constant" }) +set_hl("@constant.builtin", { link = "Constant" }) +set_hl("@constant.macro", { link = "Macro" }) +set_hl("@error", { link = "Error" }) +set_hl("@exception", { link = "Exception" }) +set_hl("@field", { link = "Field" }) +set_hl("@float", { link = "Float" }) +set_hl("@function", { link = "Function" }) +set_hl("@function.builtin", { link = "FunctionBuiltin" }) +set_hl("@function.macro", { link = "Macro" }) +set_hl("@include", { link = "Include" }) +set_hl("@keyword", { link = "Keyword" }) +set_hl("@keyword.function", { link = "KeywordFunction" }) +set_hl("@label", { link = "Label" }) +set_hl("@math", { link = "Special" }) +set_hl("@method", { link = "Method" }) +set_hl("@namespace", { link = "Directory" }) +set_hl("@number", { link = "Number" }) +set_hl("@boolean", { link = "Boolean" }) +set_hl("@operator", { link = "Operator" }) +set_hl("@parameter", { link = "Argument" }) +set_hl("@parameter.reference", { link = "Argument" }) +set_hl("@property", { link = "Property" }) +set_hl("@punctuation.delimiter", { link = "Delimiter" }) +set_hl("@punctuation.bracket", { link = "Delimiter" }) +set_hl("@punctuation.special", { link = "Delimiter" }) +set_hl("@repeat", { link = "Repeat" }) +set_hl("@string", { link = "String" }) +set_hl("@string.regex", { link = "StringDelimiter" }) +set_hl("@string.escape", { link = "StringDelimiter" }) +set_hl("@structure", { link = "Structure" }) +set_hl("@tag", { link = "Tag" }) +set_hl("@tag.attribute", { link = "Attribute" }) +set_hl("@tag.delimiter", { link = "Delimiter" }) +set_hl("@strong", { link = "Bold" }) +set_hl("@uri", { link = "URL" }) +set_hl("@warning", { link = "WarningMsg" }) +set_hl("@danger", { link = "ErrorMsg" }) +set_hl("@type", { link = "Type" }) +set_hl("@type.builtin", { link = "TypeBuiltin" }) +set_hl("@variable", { fg = palette.variable }) +set_hl("@variable.builtin", { link = "VariableBuiltin" }) +set_hl("@text", { link = "Normal" }) +set_hl("@text.strong", { fg = palette.fg, bold = true }) +set_hl("@text.emphasis", { link = "Emphasis" }) +set_hl("@text.underline", { underline = true }) +set_hl("@text.title", { link = "Title" }) +set_hl("@text.uri", { link = "URL" }) +set_hl("@text.note", { link = "MoreMsg" }) +set_hl("@text.warning", { link = "WarningMsg" }) +set_hl("@text.danger", { link = "ErrorMsg" }) +set_hl("@todo", { link = "Todo" }) + +--- NetRW +set_hl("netrwClassify", { fg = palette.blue }) +set_hl("netrwDir", { link = "Directory" }) +set_hl("netrwExe", { fg = palette.green, bold = true }) +set_hl("netrwMakefile", { fg = palette.yellow, bold = true }) +set_hl("netrwTreeBar", { link = "Comment" }) diff --git a/extra/templates/text-editors/vscode/code.json b/extra/templates/text-editors/vscode/code.json index adce854..95af9a4 100644 --- a/extra/templates/text-editors/vscode/code.json +++ b/extra/templates/text-editors/vscode/code.json @@ -4,13 +4,13 @@ "semanticHighlighting": true, "semanticTokenColors": { "enumMember": { - "foreground": "{base0E}" + "foreground": "{editor_enum}" }, "variable.constant": { - "foreground": "{base02}" + "foreground": "{editor_constant}" }, "variable.defaultLibrary": { - "foreground": "{base0B}" + "foreground": "{editor_function}" } }, "tokenColors": [ @@ -18,105 +18,105 @@ "name": "unison punctuation", "scope": "punctuation.definition.delayed.unison,punctuation.definition.list.begin.unison,punctuation.definition.list.end.unison,punctuation.definition.ability.begin.unison,punctuation.definition.ability.end.unison,punctuation.operator.assignment.as.unison,punctuation.separator.pipe.unison,punctuation.separator.delimiter.unison,punctuation.definition.hash.unison", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "haskell variable generic-type", "scope": "variable.other.generic-type.haskell", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "haskell storage type", "scope": "storage.type.haskell", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "support.variable.magic.python", "scope": "support.variable.magic.python", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "punctuation.separator.parameters.python", "scope": "punctuation.separator.period.python,punctuation.separator.element.python,punctuation.parenthesis.begin.python,punctuation.parenthesis.end.python", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "variable.parameter.function.language.special.self.python", "scope": "variable.parameter.function.language.special.self.python", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "storage.modifier.lifetime.rust", "scope": "storage.modifier.lifetime.rust", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "support.function.std.rust", "scope": "support.function.std.rust", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "entity.name.lifetime.rust", "scope": "entity.name.lifetime.rust", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "variable.language.rust", "scope": "variable.language.rust", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "support.constant.edge", "scope": "support.constant.edge", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "regexp constant character-class", "scope": "constant.other.character-class.regexp", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "regexp operator.quantifier", "scope": "keyword.operator.quantifier.regexp", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "punctuation.definition", "scope": "punctuation.definition.string.begin,punctuation.definition.string.end", "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { "name": "Text", "scope": "variable.parameter.function", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { @@ -130,77 +130,77 @@ "name": "markup diff", "scope": "markup.changed.diff", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_modified}" } }, { "name": "diff", "scope": "meta.diff.header.from-file,meta.diff.header.to-file,punctuation.definition.from-file.diff,punctuation.definition.to-file.diff", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "inserted.diff", "scope": "markup.inserted.diff", "settings": { - "foreground": "{base01}" + "foreground": "{editor_inserted}" } }, { "name": "deleted.diff", "scope": "markup.deleted.diff", "settings": { - "foreground": "{base04}" + "foreground": "{editor_deleted}" } }, { "name": "c++ function", "scope": "meta.function.c,meta.function.cpp", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "c++ block", "scope": "punctuation.section.block.begin.bracket.curly.cpp,punctuation.section.block.end.bracket.curly.cpp,punctuation.terminator.statement.c,punctuation.section.block.begin.bracket.curly.c,punctuation.section.block.end.bracket.curly.c,punctuation.section.parens.begin.bracket.round.c,punctuation.section.parens.end.bracket.round.c,punctuation.section.parameters.begin.bracket.round.c,punctuation.section.parameters.end.bracket.round.c", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "js/ts punctuation separator key-value", "scope": "punctuation.separator.key-value", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "js/ts import keyword", "scope": "keyword.operator.expression.import", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "math js/ts", "scope": "support.constant.math", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "math property js/ts", "scope": "support.constant.property.math", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "js/ts variable.other.constant", "scope": "variable.other.constant", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -210,140 +210,140 @@ "storage.type.object.array.java" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "java source", "scope": "source.java", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "java modifier.import", "scope": "punctuation.section.block.begin.java,punctuation.section.block.end.java,punctuation.definition.method-parameters.begin.java,punctuation.definition.method-parameters.end.java,meta.method.identifier.java,punctuation.section.method.begin.java,punctuation.section.method.end.java,punctuation.terminator.java,punctuation.section.class.begin.java,punctuation.section.class.end.java,punctuation.section.inner-class.begin.java,punctuation.section.inner-class.end.java,meta.method-call.java,punctuation.section.class.begin.bracket.curly.java,punctuation.section.class.end.bracket.curly.java,punctuation.section.method.begin.bracket.curly.java,punctuation.section.method.end.bracket.curly.java,punctuation.separator.period.java,punctuation.bracket.angle.java,punctuation.definition.annotation.java,meta.method.body.java", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "java modifier.import", "scope": "meta.method.java", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "java modifier.import", "scope": "storage.modifier.import.java,storage.type.java,storage.type.generic.java", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "java instanceof", "scope": "keyword.operator.instanceof.java", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "java variable.name", "scope": "meta.definition.variable.name.java", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "operator logical", "scope": "keyword.operator.logical", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "operator bitwise", "scope": "keyword.operator.bitwise", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "operator channel", "scope": "keyword.operator.channel", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "support.constant.property-value.scss", "scope": "support.constant.property-value.scss,support.constant.property-value.css", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "CSS/SCSS/LESS Operators", "scope": "keyword.operator.css,keyword.operator.scss,keyword.operator.less", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "css color standard name", "scope": "support.constant.color.w3c-standard-color-name.css,support.constant.color.w3c-standard-color-name.scss", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "css comma", "scope": "punctuation.separator.list.comma.css", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "css attribute-name.id", "scope": "support.constant.color.w3c-standard-color-name.css", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "css property-name", "scope": "support.type.vendored.property-name.css", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "js/ts module", "scope": "support.module.node,support.type.object.module,support.module.node", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "entity.name.type.module", "scope": "entity.name.type.module", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "js variable readwrite", "scope": "variable.other.readwrite,meta.object-literal.key,support.variable.property,support.variable.object.process,support.variable.object.node", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "js/ts json", "scope": "support.constant.json", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { @@ -356,238 +356,238 @@ "keyword.operator.expression.keyof" ], "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "js/ts console", "scope": "support.type.object.console", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "js/ts support.variable.property.process", "scope": "support.variable.property.process", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "js console function", "scope": "entity.name.function,support.function.console", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "keyword.operator.misc.rust", "scope": "keyword.operator.misc.rust", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "keyword.operator.sigil.rust", "scope": "keyword.operator.sigil.rust", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "operator", "scope": "keyword.operator.delete", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "js dom", "scope": "support.type.object.dom", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "js dom variable", "scope": "support.variable.dom,support.variable.property.dom", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "keyword.operator", "scope": "keyword.operator.arithmetic,keyword.operator.comparison,keyword.operator.decrement,keyword.operator.increment,keyword.operator.relational", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "C operator assignment", "scope": "keyword.operator.assignment.c,keyword.operator.comparison.c,keyword.operator.c,keyword.operator.increment.c,keyword.operator.decrement.c,keyword.operator.bitwise.shift.c,keyword.operator.assignment.cpp,keyword.operator.comparison.cpp,keyword.operator.cpp,keyword.operator.increment.cpp,keyword.operator.decrement.cpp,keyword.operator.bitwise.shift.cpp", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Punctuation", "scope": "punctuation.separator.delimiter", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "Other punctuation .c", "scope": "punctuation.separator.c,punctuation.separator.cpp", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "C type posix-reserved", "scope": "support.type.posix-reserved.c,support.type.posix-reserved.cpp", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "keyword.operator.sizeof.c", "scope": "keyword.operator.sizeof.c,keyword.operator.sizeof.cpp", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "python parameter", "scope": "variable.parameter.function.language.python", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "python type", "scope": "support.type.python", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "python logical", "scope": "keyword.operator.logical.python", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "pyCs", "scope": "variable.parameter.function.python", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "python block", "scope": "punctuation.definition.arguments.begin.python,punctuation.definition.arguments.end.python,punctuation.separator.arguments.python,punctuation.definition.list.begin.python,punctuation.definition.list.end.python", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "python function-call.generic", "scope": "meta.function-call.generic.python", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "python placeholder reset to normal string", "scope": "constant.character.format.placeholder.other.python", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Operators", "scope": "keyword.operator", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "Compound Assignment Operators", "scope": "keyword.operator.assignment.compound", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Compound Assignment Operators js/ts", "scope": "keyword.operator.assignment.compound.js,keyword.operator.assignment.compound.ts", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "Keywords", "scope": "keyword", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Namespaces", "scope": "entity.name.namespace", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Variables", "scope": "variable", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "Variables", "scope": "variable.c", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "Language variables", "scope": "variable.language", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Java Variables", "scope": "token.variable.parameter.java", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "Java Imports", "scope": "import.storage.java", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Packages", "scope": "token.package.keyword", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Packages", "scope": "token.package", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { @@ -599,28 +599,28 @@ "variable.function" ], "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "Classes", "scope": "entity.name.type.namespace", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Classes", "scope": "support.class, entity.name.type.class", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Class name", "scope": "entity.name.class.identifier.namespace.type", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -631,287 +631,287 @@ "variable.other.class.ts" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Class name php", "scope": "variable.other.class.php", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "Type Name", "scope": "entity.name.type", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Keyword Control", "scope": "keyword.control", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Control Elements", "scope": "control.elements, keyword.operator.less", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Methods", "scope": "keyword.other.special-method", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "Storage", "scope": "storage", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Storage JS TS", "scope": "token.storage", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Source Js Keyword Operator Delete,source Js Keyword Operator In,source Js Keyword Operator Of,source Js Keyword Operator Instanceof,source Js Keyword Operator New,source Js Keyword Operator Typeof,source Js Keyword Operator Void", "scope": "keyword.operator.expression.delete,keyword.operator.expression.in,keyword.operator.expression.of,keyword.operator.expression.instanceof,keyword.operator.new,keyword.operator.expression.typeof,keyword.operator.expression.void", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Java Storage", "scope": "token.storage.type.java", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Support", "scope": "support.function", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "Support type", "scope": "support.type.property-name", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "Support type", "scope": "support.constant.property-value", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "Support type", "scope": "support.constant.font-name", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Meta tag", "scope": "meta.tag", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "Strings", "scope": "string", "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { "name": "Inherited Class", "scope": "entity.other.inherited-class", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "Constant other symbol", "scope": "constant.other.symbol", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "Integers", "scope": "constant.numeric", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Constants", "scope": "constant", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Constants", "scope": "punctuation.definition.constant", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Tags", "scope": "entity.name.tag", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "Attributes", "scope": "entity.other.attribute-name", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Attribute IDs", "scope": "entity.other.attribute-name.id", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "Attribute class", "scope": "entity.other.attribute-name.class.css", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Selector", "scope": "meta.selector", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "Headings", "scope": "markup.heading", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "Headings", "scope": "markup.heading punctuation.definition.heading, entity.name.section", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "Units", "scope": "keyword.other.unit", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "Bold", "scope": "markup.bold,todo.bold", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "Bold", "scope": "punctuation.definition.bold", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "markup Italic", "scope": "markup.italic, punctuation.definition.italic,todo.emphasis", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "emphasis md", "scope": "emphasis md", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "[VSCODE-CUSTOM] Markdown headings", "scope": "entity.name.section.markdown", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "[VSCODE-CUSTOM] Markdown heading Punctuation Definition", "scope": "punctuation.definition.heading.markdown", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "punctuation.definition.list.begin.markdown", "scope": "punctuation.definition.list.begin.markdown", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "[VSCODE-CUSTOM] Markdown heading setext", "scope": "markup.heading.setext", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "[VSCODE-CUSTOM] Markdown Punctuation Definition Bold", "scope": "punctuation.definition.bold.markdown", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "[VSCODE-CUSTOM] Markdown Inline Raw", "scope": "markup.inline.raw.markdown", "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { "name": "[VSCODE-CUSTOM] Markdown Inline Raw", "scope": "markup.inline.raw.string.markdown", "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { "name": "[VSCODE-CUSTOM] Markdown List Punctuation Definition", "scope": "punctuation.definition.list.markdown", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -922,7 +922,7 @@ "punctuation.definition.metadata.markdown" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -931,381 +931,381 @@ "beginning.punctuation.definition.list.markdown" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "[VSCODE-CUSTOM] Markdown Punctuation Definition Link", "scope": "punctuation.definition.metadata.markdown", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "[VSCODE-CUSTOM] Markdown Underline Link/Image", "scope": "markup.underline.link.markdown,markup.underline.link.image.markdown", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "[VSCODE-CUSTOM] Markdown Link Title/Description", "scope": "string.other.link.title.markdown,string.other.link.description.markdown", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "Regular Expressions", "scope": "string.regexp", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "Escape Characters", "scope": "constant.character.escape", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "Embedded", "scope": "punctuation.section.embedded, variable.interpolation", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "Embedded", "scope": "punctuation.section.embedded.begin,punctuation.section.embedded.end", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "illegal", "scope": "invalid.illegal", "settings": { - "foreground": "{foreground}" + "foreground": "{editor_invalid}" } }, { "name": "illegal", "scope": "invalid.illegal.bad-ampersand.html", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_invalid}" } }, { "name": "Broken", "scope": "invalid.broken", "settings": { - "foreground": "{foreground}" + "foreground": "{editor_invalid}" } }, { "name": "Deprecated", "scope": "invalid.deprecated", "settings": { - "foreground": "{foreground}" + "foreground": "{editor_invalid}" } }, { "name": "Unimplemented", "scope": "invalid.unimplemented", "settings": { - "foreground": "{foreground}" + "foreground": "{editor_invalid}" } }, { "name": "Source Json Meta Structure Dictionary Json > String Quoted Json", "scope": "source.json meta.structure.dictionary.json > string.quoted.json", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "Source Json Meta Structure Dictionary Json > String Quoted Json > Punctuation String", "scope": "source.json meta.structure.dictionary.json > string.quoted.json > punctuation.string", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "Source Json Meta Structure Dictionary Json > Value Json > String Quoted Json,source Json Meta Structure Array Json > Value Json > String Quoted Json,source Json Meta Structure Dictionary Json > Value Json > String Quoted Json > Punctuation,source Json Meta Structure Array Json > Value Json > String Quoted Json > Punctuation", "scope": "source.json meta.structure.dictionary.json > value.json > string.quoted.json,source.json meta.structure.array.json > value.json > string.quoted.json,source.json meta.structure.dictionary.json > value.json > string.quoted.json > punctuation,source.json meta.structure.array.json > value.json > string.quoted.json > punctuation", "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { "name": "Source Json Meta Structure Dictionary Json > Constant Language Json,source Json Meta Structure Array Json > Constant Language Json", "scope": "source.json meta.structure.dictionary.json > constant.language.json,source.json meta.structure.array.json > constant.language.json", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "[VSCODE-CUSTOM] JSON Property Name", "scope": "support.type.property-name.json", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "[VSCODE-CUSTOM] JSON Punctuation for Property Name", "scope": "support.type.property-name.json punctuation", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "laravel blade tag", "scope": "text.html.laravel-blade source.php.embedded.line.html entity.name.tag.laravel-blade", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "laravel blade @", "scope": "text.html.laravel-blade source.php.embedded.line.html support.constant.laravel-blade", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "use statement for other classes", "scope": "support.other.namespace.use.php,support.other.namespace.use-as.php,support.other.namespace.php,entity.other.alias.php,meta.interface.php", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "error suppression", "scope": "keyword.operator.error-control.php", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "php instanceof", "scope": "keyword.operator.type.php", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "style double quoted array index normal begin", "scope": "punctuation.section.array.begin.php", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "style double quoted array index normal end", "scope": "punctuation.section.array.end.php", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "php illegal.non-null-typehinted", "scope": "invalid.illegal.non-null-typehinted.php", "settings": { - "foreground": "{error}" + "foreground": "{editor_error}" } }, { "name": "php types", "scope": "storage.type.php,meta.other.type.phpdoc.php,keyword.other.type.php,keyword.other.array.phpdoc.php", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "php call-function", "scope": "meta.function-call.php,meta.function-call.object.php,meta.function-call.static.php", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "php function-resets", "scope": "punctuation.definition.parameters.begin.bracket.round.php,punctuation.definition.parameters.end.bracket.round.php,punctuation.separator.delimiter.php,punctuation.section.scope.begin.php,punctuation.section.scope.end.php,punctuation.terminator.expression.php,punctuation.definition.arguments.begin.bracket.round.php,punctuation.definition.arguments.end.bracket.round.php,punctuation.definition.storage-type.begin.bracket.round.php,punctuation.definition.storage-type.end.bracket.round.php,punctuation.definition.array.begin.bracket.round.php,punctuation.definition.array.end.bracket.round.php,punctuation.definition.begin.bracket.round.php,punctuation.definition.end.bracket.round.php,punctuation.definition.begin.bracket.curly.php,punctuation.definition.end.bracket.curly.php,punctuation.definition.section.switch-block.end.bracket.curly.php,punctuation.definition.section.switch-block.start.bracket.curly.php,punctuation.definition.section.switch-block.begin.bracket.curly.php,punctuation.definition.section.switch-block.end.bracket.curly.php", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "support php constants", "scope": "support.constant.core.rust", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "support php constants", "scope": "support.constant.ext.php,support.constant.std.php,support.constant.core.php,support.constant.parser-token.php", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "php goto", "scope": "entity.name.goto-label.php,support.other.php", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "php logical/bitwise operator", "scope": "keyword.operator.logical.php,keyword.operator.bitwise.php,keyword.operator.arithmetic.php", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "php regexp operator", "scope": "keyword.operator.regexp.php", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "php comparison", "scope": "keyword.operator.comparison.php", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "php heredoc/nowdoc", "scope": "keyword.operator.heredoc.php,keyword.operator.nowdoc.php", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { "name": "python function decorator @", "scope": "meta.function.decorator.python", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "name": "python function support", "scope": "support.token.decorator.python,meta.function.decorator.identifier.python", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "parameter function js/ts", "scope": "function.parameter", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "brace function", "scope": "function.brace", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "parameter function ruby cs", "scope": "function.parameter.ruby, function.parameter.cs", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "constant.language.symbol.ruby", "scope": "constant.language.symbol.ruby", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "rgb-value", "scope": "rgb-value", "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { "name": "rgb value", "scope": "inline-color-decoration rgb-value", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "rgb value less", "scope": "less rgb-value", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "name": "sass selector", "scope": "selector.sass", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "name": "ts primitive/builtin types", "scope": "support.type.primitive.ts,support.type.builtin.ts,support.type.primitive.tsx,support.type.builtin.tsx", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "block scope", "scope": "block.scope.end,block.scope.begin", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { "name": "cs storage type", "scope": "storage.type.cs", "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { "name": "cs local variable", "scope": "entity.name.variable.local.cs", "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { "scope": "token.info-token", "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { "scope": "token.warn-token", "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { "scope": "token.error-token", "settings": { - "foreground": "{error}" + "foreground": "{editor_error}" } }, { "scope": "token.debug-token", "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { @@ -1316,7 +1316,7 @@ "punctuation.section.embedded" ], "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { @@ -1325,7 +1325,7 @@ "meta.template.expression" ], "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { @@ -1334,7 +1334,7 @@ "keyword.operator.module" ], "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { @@ -1343,7 +1343,7 @@ "support.type.type.flowtype" ], "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { @@ -1352,7 +1352,7 @@ "support.type.primitive" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1361,7 +1361,7 @@ "meta.property.object" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1370,7 +1370,7 @@ "variable.parameter.function.js" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1379,7 +1379,7 @@ "keyword.other.template.begin" ], "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { @@ -1388,7 +1388,7 @@ "keyword.other.template.end" ], "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { @@ -1397,7 +1397,7 @@ "keyword.other.substitution.begin" ], "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { @@ -1406,7 +1406,7 @@ "keyword.other.substitution.end" ], "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { @@ -1415,7 +1415,7 @@ "keyword.operator.assignment" ], "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { @@ -1424,7 +1424,7 @@ "keyword.operator.assignment.go" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1434,7 +1434,7 @@ "keyword.operator.address.go" ], "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { @@ -1443,7 +1443,7 @@ "entity.name.package.go" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1452,7 +1452,7 @@ "support.type.prelude.elm" ], "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { @@ -1461,7 +1461,7 @@ "support.constant.elm" ], "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { @@ -1470,7 +1470,7 @@ "punctuation.quasi.element" ], "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { @@ -1479,7 +1479,7 @@ "constant.character.entity" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1489,7 +1489,7 @@ "entity.other.attribute-name.pseudo-class" ], "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { @@ -1498,7 +1498,7 @@ "entity.global.clojure" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1507,7 +1507,7 @@ "meta.symbol.clojure" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1516,7 +1516,7 @@ "constant.keyword.clojure" ], "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { @@ -1526,7 +1526,7 @@ "variable.parameter.function.coffee" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1535,7 +1535,7 @@ "source.ini" ], "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { @@ -1544,7 +1544,7 @@ "meta.scope.prerequisites.makefile" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1553,7 +1553,7 @@ "source.makefile" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1562,7 +1562,7 @@ "storage.modifier.import.groovy" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1571,7 +1571,7 @@ "meta.method.groovy" ], "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { @@ -1580,7 +1580,7 @@ "meta.definition.variable.name.groovy" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1589,7 +1589,7 @@ "meta.definition.class.inherited.classes.groovy" ], "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { @@ -1598,7 +1598,7 @@ "support.variable.semantic.hlsl" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1612,7 +1612,7 @@ "support.type.object.hlsl" ], "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { @@ -1622,7 +1622,7 @@ "text.bracketed" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1632,7 +1632,7 @@ "support.type.vb.asp" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1641,7 +1641,7 @@ "entity.name.function.xi" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1650,7 +1650,7 @@ "entity.name.class.xi" ], "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { @@ -1659,7 +1659,7 @@ "constant.character.character-class.regexp.xi" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1668,7 +1668,7 @@ "constant.regexp.xi" ], "settings": { - "foreground": "{base05}" + "foreground": "{editor_parameter}" } }, { @@ -1677,7 +1677,7 @@ "keyword.control.xi" ], "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { @@ -1686,7 +1686,7 @@ "invalid.xi" ], "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { @@ -1695,7 +1695,7 @@ "beginning.punctuation.definition.quote.markdown.xi" ], "settings": { - "foreground": "{base01}" + "foreground": "{editor_string}" } }, { @@ -1713,7 +1713,7 @@ "constant.character.xi" ], "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { @@ -1722,7 +1722,7 @@ "accent.xi" ], "settings": { - "foreground": "{base06}" + "foreground": "{editor_keyword}" } }, { @@ -1731,7 +1731,7 @@ "wikiword.xi" ], "settings": { - "foreground": "{base02}" + "foreground": "{editor_property}" } }, { @@ -1740,7 +1740,7 @@ "constant.other.color.rgb-value.xi" ], "settings": { - "foreground": "{foreground}" + "foreground": "{editor_foreground}" } }, { @@ -1760,7 +1760,7 @@ "entity.name.scope-resolution.function.definition" ], "settings": { - "foreground": "{base0B}" + "foreground": "{editor_type}" } }, { @@ -1771,7 +1771,7 @@ "markup.heading.setext.2.markdown" ], "settings": { - "foreground": "{base04}" + "foreground": "{editor_variable}" } }, { @@ -1780,7 +1780,7 @@ " meta.brace.square" ], "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { @@ -1802,7 +1802,7 @@ "name": "punctuation.definition.block.sequence.item.yaml", "scope": "punctuation.definition.block.sequence.item.yaml", "settings": { - "foreground": "{on_background}" + "foreground": "{editor_foreground}" } }, { @@ -1810,7 +1810,7 @@ "constant.language.symbol.elixir" ], "settings": { - "foreground": "{base0E}" + "foreground": "{editor_operator}" } }, { @@ -1845,7 +1845,7 @@ "colors": { "foreground": "{on_surface}", "focusBorder": "{accent}", - "selection.background": "{editor_selected}", + "selection.background": "{editor_selection}", "scrollbar.shadow": "{background}", "activityBar.foreground": "{on_surface}", "activityBar.background": "{surface}", @@ -1863,12 +1863,12 @@ "list.inactiveSelectionForeground": "{on_surface}", "list.hoverBackground": "{surface_variant}", "list.hoverForeground": "{on_surface}", - "list.activeSelectionBackground": "{editor_selected}", + "list.activeSelectionBackground": "{editor_selection}", "list.activeSelectionForeground": "{foreground}", "tree.indentGuidesStroke": "{border}", "list.dropBackground": "{surface_variant}", "list.highlightForeground": "{editor_link}", - "list.focusBackground": "{editor_selected}", + "list.focusBackground": "{editor_selection}", "list.focusForeground": "{on_surface}", "listFilterWidget.background": "{base03}", "listFilterWidget.outline": "{border}", @@ -1892,7 +1892,7 @@ "menu.foreground": "{on_surface}", "menu.background": "{surface}", "menu.selectionForeground": "{foreground}", - "menu.selectionBackground": "{editor_selected}", + "menu.selectionBackground": "{editor_selection}", "menu.selectionBorder": "{border}", "menu.separatorBackground": "{editor_comment}", "menu.border": "{border}85", @@ -1911,56 +1911,56 @@ "input.placeholderForeground": "{editor_comment}", "textLink.foreground": "{editor_link}", "editor.background": "{editor_background}", - "editor.foreground": "{on_background}", + "editor.foreground": "{editor_foreground}", "editorLineNumber.foreground": "{editor_line_number}", - "editorCursor.foreground": "{cursor}", - "editorCursor.background": "{background}", - "editor.selectionBackground": "{editor_selected}", - "editor.inactiveSelectionBackground": "{surface_variant}cc", - "editorWhitespace.foreground": "{editor_comment}29", - "editor.selectionHighlightBackground": "{info}26", + "editorLineNumber.activeForeground": "{editor_line_number_active}", + "editorCursor.foreground": "{editor_cursor}", + "editorCursor.background": "{editor_background}", + "editor.selectionBackground": "{editor_selection}", + "editor.inactiveSelectionBackground": "{editor_selection_inactive}", + "editorWhitespace.foreground": "{editor_whitespace}", + "editor.selectionHighlightBackground": "{editor_info_background}", "editor.selectionHighlightBorder": "{border}", - "editor.findMatchBackground": "{surface_variant}", - "editor.findMatchBorder": "{border_focused}", - "editor.findMatchHighlightBackground": "{warning}55", + "editor.findMatchBackground": "{editor_search_match}", + "editor.findMatchBorder": "{editor_search_match_active}", + "editor.findMatchHighlightBackground": "{editor_warning_background}", "editor.findMatchHighlightBorder": "#ffffff00", - "editor.findRangeHighlightBackground": "{surface_variant}66", + "editor.findRangeHighlightBackground": "{editor_find_range_highlight}", "editor.findRangeHighlightBorder": "#ffffff00", - "editor.rangeHighlightBackground": "{foreground}0b", + "editor.rangeHighlightBackground": "{editor_foreground}0b", "editor.rangeHighlightBorder": "#ffffff00", - "editor.hoverHighlightBackground": "{editor_selected}40", - "editor.wordHighlightStrongBackground": "{editor_selected}b8", + "editor.hoverHighlightBackground": "{editor_selection}40", + "editor.wordHighlightStrongBackground": "{editor_selection}b8", "editor.wordHighlightBackground": "{border}b8", - "editor.lineHighlightBackground": "{foreground}0A", - "editor.lineHighlightBorder": "{background}", - "editorLineNumber.activeForeground": "{editor_line_number}", + "editor.lineHighlightBackground": "{editor_line_highlight}", + "editor.lineHighlightBorder": "{editor_background}", "editorLink.activeForeground": "{editor_link}", - "editorIndentGuide.background1": "{surface_variant}", - "editorIndentGuide.activeBackground1": "{border_focused}", + "editorIndentGuide.background1": "{editor_indent_guide}", + "editorIndentGuide.activeBackground1": "{editor_indent_guide_active}", "editorRuler.foreground": "{border}", - "editorBracketMatch.background": "{success}1a", - "editorBracketMatch.border": "{border}", - "editor.foldBackground": "{editor_selected}4d", + "editorBracketMatch.background": "{editor_bracket_match}1a", + "editorBracketMatch.border": "{editor_bracket_match}", + "editor.foldBackground": "{editor_folded_background}", "editorOverviewRuler.background": "{surface}00", "editorOverviewRuler.border": "{border}", - "editorError.foreground": "{error}", - "editorError.background": "{error}00", + "editorError.foreground": "{editor_error}", + "editorError.background": "{editor_error_background}", "editorError.border": "#ffffff00", - "editorWarning.foreground": "{warning}", - "editorWarning.background": "{warning}00", + "editorWarning.foreground": "{editor_warning}", + "editorWarning.background": "{editor_warning_background}", "editorWarning.border": "#ffffff00", - "editorInfo.foreground": "{info}", - "editorInfo.background": "{info}00", + "editorInfo.foreground": "{editor_info}", + "editorInfo.background": "{editor_info_background}", "editorInfo.border": "{info}00", - "editorGutter.background": "{editor_background}", - "editorGutter.modifiedBackground": "{base0E}", - "editorGutter.addedBackground": "{success}", - "editorGutter.deletedBackground": "{error}", + "editorGutter.background": "{editor_gutter_background}", + "editorGutter.modifiedBackground": "{editor_modified}", + "editorGutter.addedBackground": "{editor_inserted}", + "editorGutter.deletedBackground": "{editor_deleted}", "editorGutter.foldingControlForeground": "{editor_line_number}", "editorCodeLens.foreground": "{editor_comment}", "editorGroup.border": "{border}", - "diffEditor.insertedTextBackground": "{success}33", - "diffEditor.removedTextBackground": "{error}33", + "diffEditor.insertedTextBackground": "{editor_inserted}33", + "diffEditor.removedTextBackground": "{editor_deleted}33", "diffEditor.border": "{border}", "panel.background": "{editor_background}", "panel.border": "{border}", @@ -2023,19 +2023,19 @@ "notificationCenterHeader.foreground": "{on_surface}", "notificationCenterHeader.background": "{surface}", "notifications.border": "{surface}", - "gitDecoration.addedResourceForeground": "{success}", - "gitDecoration.conflictingResourceForeground": "{base06}", - "gitDecoration.deletedResourceForeground": "{error}", - "gitDecoration.ignoredResourceForeground": "{editor_comment}", - "gitDecoration.modifiedResourceForeground": "{base0B}", - "gitDecoration.stageDeletedResourceForeground": "{error}", - "gitDecoration.stageModifiedResourceForeground": "{base0B}", - "gitDecoration.submoduleResourceForeground": "{base06}", - "gitDecoration.untrackedResourceForeground": "{success}", + "gitDecoration.addedResourceForeground": "{editor_inserted}", + "gitDecoration.conflictingResourceForeground": "{editor_warning}", + "gitDecoration.deletedResourceForeground": "{editor_deleted}", + "gitDecoration.ignoredResourceForeground": "{editor_ignored}", + "gitDecoration.modifiedResourceForeground": "{editor_modified}", + "gitDecoration.stageDeletedResourceForeground": "{editor_deleted}", + "gitDecoration.stageModifiedResourceForeground": "{editor_modified}", + "gitDecoration.submoduleResourceForeground": "{editor_info}", + "gitDecoration.untrackedResourceForeground": "{editor_inserted}", "editorMarkerNavigation.background": "{surface}", - "editorMarkerNavigationError.background": "{error}", - "editorMarkerNavigationWarning.background": "{warning}", - "editorMarkerNavigationInfo.background": "{info}", + "editorMarkerNavigationError.background": "{editor_error}", + "editorMarkerNavigationWarning.background": "{editor_warning}", + "editorMarkerNavigationInfo.background": "{editor_info}", "merge.currentHeaderBackground": "{success}cb", "merge.currentContentBackground": "{success}cb", "merge.incomingHeaderBackground": "{info}cb", @@ -2044,9 +2044,9 @@ "merge.commonContentBackground": "{background}cb", "editorSuggestWidget.background": "{surface}", "editorSuggestWidget.border": "{surface_variant}", - "editorSuggestWidget.foreground": "{on_background}", + "editorSuggestWidget.foreground": "{editor_foreground}", "editorSuggestWidget.highlightForeground": "{editor_link}", - "editorSuggestWidget.selectedBackground": "{editor_selected}", + "editorSuggestWidget.selectedBackground": "{editor_selection}", "editorHoverWidget.foreground": "{on_surface}", "editorHoverWidget.background": "{surface}", "editorHoverWidget.border": "{surface_variant}", @@ -2072,12 +2072,12 @@ "dropdown.foreground": "{on_surface}", "dropdown.border": "{border}", "minimapGutter.addedBackground": "{success}", - "minimapGutter.modifiedBackground": "{base0E}", - "minimapGutter.deletedBackground": "{error}", + "minimapGutter.modifiedBackground": "{editor_modified}", + "minimapGutter.deletedBackground": "{editor_deleted}", "minimap.findMatchHighlight": "{surface_variant}cc", - "minimap.selectionHighlight": "{editor_selected}cc", - "minimap.errorHighlight": "{error}", - "minimap.warningHighlight": "{warning}", + "minimap.selectionHighlight": "{editor_selection}cc", + "minimap.errorHighlight": "{editor_error}", + "minimap.warningHighlight": "{editor_warning}", "minimap.background": "{editor_background}", "sideBar.dropBackground": "{surface_variant}", "editorGroup.emptyBackground": "{editor_background}", diff --git a/src/core/common/version.hpp b/src/core/common/version.hpp index ae038f1..830f2c7 100644 --- a/src/core/common/version.hpp +++ b/src/core/common/version.hpp @@ -6,7 +6,7 @@ namespace clrsync::core { -const std::string GIT_SEMVER = "1.0.5+git.g2d015c6"; +const std::string GIT_SEMVER = "1.1.1+git.g3277873"; const std::string version_string(); } // namespace clrsync::core diff --git a/src/core/palette/color_keys.hpp b/src/core/palette/color_keys.hpp index 51c7de6..6e39fcb 100644 --- a/src/core/palette/color_keys.hpp +++ b/src/core/palette/color_keys.hpp @@ -39,22 +39,72 @@ constexpr const char *COLOR_KEYS[] = { "on_warning", "on_error", - // Editor + // Editor - Basic "editor_background", - "editor_command", - "editor_comment", - "editor_disabled", - "editor_emphasis", - "editor_error", - "editor_inactive", - "editor_line_number", - "editor_link", - "editor_main", - "editor_selected", + "editor_foreground", + "editor_line_highlight", + "editor_selection", "editor_selection_inactive", + "editor_cursor", + "editor_whitespace", + + // Editor - Gutter + "editor_gutter_background", + "editor_gutter_foreground", + "editor_line_number", + "editor_line_number_active", + + // Editor - Syntax + "editor_comment", "editor_string", - "editor_success", + "editor_number", + "editor_boolean", + "editor_keyword", + "editor_operator", + "editor_function", + "editor_variable", + "editor_parameter", + "editor_property", + "editor_constant", + "editor_type", + "editor_class", + "editor_interface", + "editor_enum", + "editor_namespace", + "editor_attribute", + "editor_decorator", + "editor_tag", + "editor_punctuation", + "editor_link", + "editor_regex", + "editor_escape_character", + + // Editor - Diagnostics + "editor_invalid", + "editor_error", + "editor_error_background", "editor_warning", + "editor_warning_background", + "editor_info", + "editor_info_background", + "editor_hint", + "editor_hint_background", + + // Editor - UI Elements + "editor_active_line_border", + "editor_indent_guide", + "editor_indent_guide_active", + "editor_bracket_match", + "editor_search_match", + "editor_search_match_active", + "editor_find_range_highlight", + + // Editor - Diff + "editor_deleted", + "editor_inserted", + "editor_modified", + "editor_ignored", + "editor_folded_background", // Terminal "base00", @@ -106,21 +156,72 @@ inline const std::unordered_map DEFAULT_COLORS = { {"on_warning", 0xd2d2d2ff}, {"on_error", 0xd2d2d2ff}, + // Editor - Basic {"editor_background", 0x111111ff}, - {"editor_command", 0x3a898cff}, - {"editor_comment", 0x849899ff}, - {"editor_disabled", 0x849899ff}, - {"editor_emphasis", 0xa9dc86ff}, - {"editor_error", 0xaa4e4aff}, - {"editor_inactive", 0x849899ff}, - {"editor_line_number", 0x849899ff}, - {"editor_link", 0xb0779eff}, - {"editor_main", 0xd2d2d2ff}, - {"editor_selected", 0x242424ff}, + {"editor_foreground", 0xd2d2d2ff}, + {"editor_line_highlight", 0x191919ff}, + {"editor_selection", 0x242424ff}, {"editor_selection_inactive", 0x1d1c1cff}, + {"editor_cursor", 0xd2d2d2ff}, + {"editor_whitespace", 0x3a3a3aff}, + + // Editor - Gutter + {"editor_gutter_background", 0x111111ff}, + {"editor_gutter_foreground", 0x849899ff}, + {"editor_line_number", 0x849899ff}, + {"editor_line_number_active", 0xd2d2d2ff}, + + // Editor - Syntax + {"editor_comment", 0x849899ff}, {"editor_string", 0x9a8652ff}, - {"editor_success", 0x668a51ff}, + {"editor_number", 0xb47837ff}, + {"editor_boolean", 0xb47837ff}, + {"editor_keyword", 0x3a898cff}, + {"editor_operator", 0xd2d2d2ff}, + {"editor_function", 0xa9dc86ff}, + {"editor_variable", 0xd2d2d2ff}, + {"editor_parameter", 0xb0779eff}, + {"editor_property", 0x9a8652ff}, + {"editor_constant", 0xb47837ff}, + {"editor_type", 0x3a898cff}, + {"editor_class", 0x3a898cff}, + {"editor_interface", 0x3a898cff}, + {"editor_enum", 0x3a898cff}, + {"editor_namespace", 0xb0779eff}, + {"editor_attribute", 0xa9dc86ff}, + {"editor_decorator", 0xa9dc86ff}, + {"editor_tag", 0xaa4e4aff}, + {"editor_punctuation", 0xd2d2d2ff}, + {"editor_link", 0xb0779eff}, + {"editor_regex", 0xaa477bff}, + {"editor_escape_character", 0xb47837ff}, + + // Editor - Diagnostics + {"editor_invalid", 0xaa4e4aff}, + {"editor_error", 0xaa4e4aff}, + {"editor_error_background", 0x3a1a1aff}, {"editor_warning", 0xb47837ff}, + {"editor_warning_background", 0x3a2a1aff}, + {"editor_info", 0x3a898cff}, + {"editor_info_background", 0x1a2a3aff}, + {"editor_hint", 0x668a51ff}, + {"editor_hint_background", 0x1a2a1aff}, + + // Editor - UI Elements + {"editor_active_line_border", 0x2e2e2eff}, + {"editor_indent_guide", 0x2a2a2aff}, + {"editor_indent_guide_active", 0x3a3a3aff}, + {"editor_bracket_match", 0x3a898cff}, + {"editor_search_match", 0x9a865280}, + {"editor_search_match_active", 0x9a8652ff}, + {"editor_find_range_highlight", 0x9a865240}, + + // Editor - Diff + {"editor_deleted", 0xaa4e4aff}, + {"editor_inserted", 0x668a51ff}, + {"editor_modified", 0x9a8652ff}, + {"editor_ignored", 0x849899ff}, + {"editor_folded_background", 0x191919ff}, {"base00", 0x111111ff}, {"base01", 0x668a51ff}, diff --git a/src/core/palette/hellwal_generator.cpp b/src/core/palette/hellwal_generator.cpp index 669029f..6460be1 100644 --- a/src/core/palette/hellwal_generator.cpp +++ b/src/core/palette/hellwal_generator.cpp @@ -159,21 +159,72 @@ palette hellwal_generator::generate_from_image(const std::string &image_path, co pal.set_color("on_surface_variant", get_color_by_index(7)); pal.set_color("on_background", get_color_by_index(7)); + // Editor - Basic pal.set_color("editor_background", get_color_by_index(0)); - pal.set_color("editor_main", get_color_by_index(7)); - pal.set_color("editor_comment", get_color_by_index(8)); - pal.set_color("editor_disabled", get_color_by_index(8)); - pal.set_color("editor_inactive", get_color_by_index(8)); - pal.set_color("editor_string", get_color_by_index(2)); - pal.set_color("editor_command", get_color_by_index(5)); - pal.set_color("editor_emphasis", get_color_by_index(11)); - pal.set_color("editor_link", get_color_by_index(4)); - pal.set_color("editor_line_number", get_color_by_index(8)); - pal.set_color("editor_selected", get_color_by_index(8)); + pal.set_color("editor_foreground", get_color_by_index(7)); + pal.set_color("editor_line_highlight", get_color_by_index(8)); + pal.set_color("editor_selection", get_color_by_index(8)); pal.set_color("editor_selection_inactive", get_color_by_index(8)); + pal.set_color("editor_cursor", get_color_by_index(7)); + pal.set_color("editor_whitespace", get_color_by_index(8)); + + // Editor - Gutter + pal.set_color("editor_gutter_background", get_color_by_index(0)); + pal.set_color("editor_gutter_foreground", get_color_by_index(8)); + pal.set_color("editor_line_number", get_color_by_index(8)); + pal.set_color("editor_line_number_active", get_color_by_index(7)); + + // Editor - Syntax + pal.set_color("editor_comment", get_color_by_index(8)); + pal.set_color("editor_string", get_color_by_index(2)); + pal.set_color("editor_number", get_color_by_index(3)); + pal.set_color("editor_boolean", get_color_by_index(3)); + pal.set_color("editor_keyword", get_color_by_index(5)); + pal.set_color("editor_operator", get_color_by_index(7)); + pal.set_color("editor_function", get_color_by_index(11)); + pal.set_color("editor_variable", get_color_by_index(7)); + pal.set_color("editor_parameter", get_color_by_index(4)); + pal.set_color("editor_property", get_color_by_index(2)); + pal.set_color("editor_constant", get_color_by_index(3)); + pal.set_color("editor_type", get_color_by_index(6)); + pal.set_color("editor_class", get_color_by_index(6)); + pal.set_color("editor_interface", get_color_by_index(6)); + pal.set_color("editor_enum", get_color_by_index(6)); + pal.set_color("editor_namespace", get_color_by_index(4)); + pal.set_color("editor_attribute", get_color_by_index(11)); + pal.set_color("editor_decorator", get_color_by_index(11)); + pal.set_color("editor_tag", get_color_by_index(1)); + pal.set_color("editor_punctuation", get_color_by_index(7)); + pal.set_color("editor_link", get_color_by_index(4)); + pal.set_color("editor_regex", get_color_by_index(5)); + pal.set_color("editor_escape_character", get_color_by_index(3)); + + // Editor - Diagnostics + pal.set_color("editor_invalid", get_color_by_index(1)); pal.set_color("editor_error", get_color_by_index(1)); + pal.set_color("editor_error_background", get_color_by_index(0)); pal.set_color("editor_warning", get_color_by_index(3)); - pal.set_color("editor_success", get_color_by_index(2)); + pal.set_color("editor_warning_background", get_color_by_index(0)); + pal.set_color("editor_info", get_color_by_index(4)); + pal.set_color("editor_info_background", get_color_by_index(0)); + pal.set_color("editor_hint", get_color_by_index(2)); + pal.set_color("editor_hint_background", get_color_by_index(0)); + + // Editor - UI Elements + pal.set_color("editor_active_line_border", get_color_by_index(8)); + pal.set_color("editor_indent_guide", get_color_by_index(8)); + pal.set_color("editor_indent_guide_active", get_color_by_index(7)); + pal.set_color("editor_bracket_match", get_color_by_index(6)); + pal.set_color("editor_search_match", get_color_by_index(3)); + pal.set_color("editor_search_match_active", get_color_by_index(3)); + pal.set_color("editor_find_range_highlight", get_color_by_index(3)); + + // Editor - Diff + pal.set_color("editor_deleted", get_color_by_index(1)); + pal.set_color("editor_inserted", get_color_by_index(2)); + pal.set_color("editor_modified", get_color_by_index(3)); + pal.set_color("editor_ignored", get_color_by_index(8)); + pal.set_color("editor_folded_background", get_color_by_index(8)); return pal; } diff --git a/src/core/palette/matugen_generator.cpp b/src/core/palette/matugen_generator.cpp index cedd912..0bf6d07 100644 --- a/src/core/palette/matugen_generator.cpp +++ b/src/core/palette/matugen_generator.cpp @@ -105,21 +105,72 @@ static palette parse_matugen_output(const std::string &out, const matugen_genera {"error", "error"}, {"on_error", "on_error"}, + // Editor - Basic {"editor_background", "background"}, - {"editor_main", "on_surface"}, + {"editor_foreground", "on_surface"}, + {"editor_line_highlight", "surface_container"}, + {"editor_selection", "primary_container"}, + {"editor_selection_inactive", "surface_container_low"}, + {"editor_cursor", "on_surface"}, + {"editor_whitespace", "outline_variant"}, + + // Editor - Gutter + {"editor_gutter_background", "background"}, + {"editor_gutter_foreground", "outline"}, + {"editor_line_number", "outline"}, + {"editor_line_number_active", "on_surface"}, + + // Editor - Syntax {"editor_comment", "outline"}, {"editor_string", "tertiary"}, - {"editor_emphasis", "primary"}, - {"editor_command", "secondary"}, + {"editor_number", "secondary"}, + {"editor_boolean", "secondary"}, + {"editor_keyword", "primary"}, + {"editor_operator", "on_surface"}, + {"editor_function", "tertiary_container"}, + {"editor_variable", "on_surface"}, + {"editor_parameter", "tertiary"}, + {"editor_property", "tertiary"}, + {"editor_constant", "secondary"}, + {"editor_type", "primary"}, + {"editor_class", "primary"}, + {"editor_interface", "primary"}, + {"editor_enum", "primary"}, + {"editor_namespace", "primary_container"}, + {"editor_attribute", "tertiary_container"}, + {"editor_decorator", "tertiary_container"}, + {"editor_tag", "error"}, + {"editor_punctuation", "on_surface"}, {"editor_link", "primary_container"}, + {"editor_regex", "secondary_container"}, + {"editor_escape_character", "secondary"}, + + // Editor - Diagnostics + {"editor_invalid", "error"}, {"editor_error", "error"}, + {"editor_error_background", "error_container"}, {"editor_warning", "secondary"}, - {"editor_success", "primary"}, - {"editor_disabled", "outline_variant"}, - {"editor_inactive", "outline_variant"}, - {"editor_line_number", "outline"}, - {"editor_selected", "primary_container"}, - {"editor_selection_inactive", "surface_container_low"}, + {"editor_warning_background", "secondary_container"}, + {"editor_info", "tertiary"}, + {"editor_info_background", "tertiary_container"}, + {"editor_hint", "primary"}, + {"editor_hint_background", "primary_container"}, + + // Editor - UI Elements + {"editor_active_line_border", "outline_variant"}, + {"editor_indent_guide", "outline_variant"}, + {"editor_indent_guide_active", "outline"}, + {"editor_bracket_match", "primary"}, + {"editor_search_match", "tertiary_container"}, + {"editor_search_match_active", "tertiary"}, + {"editor_find_range_highlight", "tertiary_container"}, + + // Editor - Diff + {"editor_deleted", "error"}, + {"editor_inserted", "primary"}, + {"editor_modified", "secondary"}, + {"editor_ignored", "outline_variant"}, + {"editor_folded_background", "surface_container"}, {"base00", "background"}, {"base01", "surface_container_lowest"}, diff --git a/src/gui/controllers/theme_applier.cpp b/src/gui/controllers/theme_applier.cpp index 8f692dd..fcae472 100644 --- a/src/gui/controllers/theme_applier.cpp +++ b/src/gui/controllers/theme_applier.cpp @@ -15,32 +15,38 @@ void apply_to_editor(TextEditor &editor, const clrsync::core::palette ¤t) auto palette = editor.GetPalette(); - palette[int(TextEditor::PaletteIndex::Default)] = get_color_u32("editor_main"); - palette[int(TextEditor::PaletteIndex::Keyword)] = get_color_u32("editor_command"); - palette[int(TextEditor::PaletteIndex::Number)] = get_color_u32("editor_warning"); + // Basic syntax + palette[int(TextEditor::PaletteIndex::Default)] = get_color_u32("editor_foreground"); + palette[int(TextEditor::PaletteIndex::Keyword)] = get_color_u32("editor_keyword"); + palette[int(TextEditor::PaletteIndex::Number)] = get_color_u32("editor_number"); palette[int(TextEditor::PaletteIndex::String)] = get_color_u32("editor_string"); palette[int(TextEditor::PaletteIndex::CharLiteral)] = get_color_u32("editor_string"); - palette[int(TextEditor::PaletteIndex::Punctuation)] = get_color_u32("editor_main"); - palette[int(TextEditor::PaletteIndex::Preprocessor)] = get_color_u32("editor_emphasis"); - palette[int(TextEditor::PaletteIndex::Identifier)] = get_color_u32("editor_main"); - palette[int(TextEditor::PaletteIndex::KnownIdentifier)] = get_color_u32("editor_link"); - palette[int(TextEditor::PaletteIndex::PreprocIdentifier)] = get_color_u32("editor_link"); + palette[int(TextEditor::PaletteIndex::Punctuation)] = get_color_u32("editor_punctuation"); + palette[int(TextEditor::PaletteIndex::Preprocessor)] = get_color_u32("editor_attribute"); + palette[int(TextEditor::PaletteIndex::Identifier)] = get_color_u32("editor_variable"); + palette[int(TextEditor::PaletteIndex::KnownIdentifier)] = get_color_u32("editor_function"); + palette[int(TextEditor::PaletteIndex::PreprocIdentifier)] = get_color_u32("editor_constant"); + // Comments palette[int(TextEditor::PaletteIndex::Comment)] = get_color_u32("editor_comment"); palette[int(TextEditor::PaletteIndex::MultiLineComment)] = get_color_u32("editor_comment"); + // Background and cursor palette[int(TextEditor::PaletteIndex::Background)] = get_color_u32("editor_background"); - palette[int(TextEditor::PaletteIndex::Cursor)] = get_color_u32("cursor"); + palette[int(TextEditor::PaletteIndex::Cursor)] = get_color_u32("editor_cursor"); - palette[int(TextEditor::PaletteIndex::Selection)] = get_color_u32("editor_selected"); - palette[int(TextEditor::PaletteIndex::ErrorMarker)] = get_color_u32("editor_error"); + // Selection + palette[int(TextEditor::PaletteIndex::Selection)] = get_color_u32("editor_selection"); + palette[int(TextEditor::PaletteIndex::ErrorMarker)] = get_color_u32("editor_error_background"); palette[int(TextEditor::PaletteIndex::Breakpoint)] = get_color_u32("editor_error"); + // Line numbers palette[int(TextEditor::PaletteIndex::LineNumber)] = get_color_u32("editor_line_number"); - palette[int(TextEditor::PaletteIndex::CurrentLineFill)] = get_color_u32("surface_variant"); - palette[int(TextEditor::PaletteIndex::CurrentLineFillInactive)] = get_color_u32("surface"); - palette[int(TextEditor::PaletteIndex::CurrentLineEdge)] = get_color_u32("border_focused"); + // Current line highlight + palette[int(TextEditor::PaletteIndex::CurrentLineFill)] = get_color_u32("editor_line_highlight"); + palette[int(TextEditor::PaletteIndex::CurrentLineFillInactive)] = get_color_u32("editor_folded_background"); + palette[int(TextEditor::PaletteIndex::CurrentLineEdge)] = get_color_u32("editor_active_line_border"); editor.SetPalette(palette); }