From faa9265beea81fc938d2a395c60fcec92bc0771e Mon Sep 17 00:00:00 2001 From: He4eT Date: Tue, 12 Jul 2022 04:00:31 +0300 Subject: [PATCH] Extract colors --- lua/lush_theme/desolate.lua | 357 ++++++++++++++++++------------------ 1 file changed, 179 insertions(+), 178 deletions(-) diff --git a/lua/lush_theme/desolate.lua b/lua/lush_theme/desolate.lua index 4157328..f53b147 100644 --- a/lua/lush_theme/desolate.lua +++ b/lua/lush_theme/desolate.lua @@ -20,54 +20,20 @@ -- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS -- IN THE SOFTWARE. --- --- --- Lua configuration example: --- - vim.o.background = 'dark' - vim.g.monotone_h = 0 - vim.g.monotone_s = 0 - vim.g.monotone_l = 70 - vim.g.monotone_contrast = 120 --- +vim.o.background = 'dark' + +vim.g.monotone_h = 0 +vim.g.monotone_s = 0 +vim.g.monotone_l = 70 +vim.g.monotone_contrast = 120 local lush = require("lush") local hsl = lush.hsl --- Config options - -local opt = { - bg = vim.o.background, - contrast = (tonumber(vim.g.monotone_contrast) or 100) / 100, - color = hsl( - tonumber(vim.g.monotone_h) or 15, - tonumber(vim.g.monotone_s) or 5, - tonumber(vim.g.monotone_l) or 50), -} - --- Handle dark/light background color - local offset_fn = "lighten" -if opt.bg == "light" then - opt.color = opt.color.darken(50) - offset_fn = "darken" -end --- Monochrome shades - -local shade = function(color, offset) - return color[offset_fn](offset * opt.contrast) -end -local s = { 50, 20, 10, 0, -10, -25, -45, -60, -70 } --, inv = -100, normal = 100 } -for k, v in pairs(s) do - s[k] = shade(opt.color, v) -end - -s.normal = hsl("#cdcdcd") -s.inv = hsl("#383838") - --- Highlight colors +-- local red = hsl("#ff5111") local yellow = hsl("#ffc812") @@ -76,95 +42,129 @@ local yellow2 = hsl("#ffd700") local green = hsl("#4e9a06") local white = hsl("#ffffff") -local eob = s[4] -local nt = s[4] +-- Config options + +local opt = { + contrast = (tonumber(vim.g.monotone_contrast) or 100) / 100, + base_color = hsl( + tonumber(vim.g.monotone_h) or 15, + tonumber(vim.g.monotone_s) or 5, + tonumber(vim.g.monotone_l) or 50), +} + +-- Monochrome shades + +local colors = {} + +local shade = function(base_color, contrast, offset) + return base_color[offset_fn](contrast * offset) +end + +local offsets = { 50, 20, 10, 0, -10, -25, -45, -60, -70 } +for i, offset in pairs(offsets) do + colors[i] = shade(opt.base_color, opt.contrast, offset) +end + +colors.fg = hsl("#cdcdcd") +colors.bg = hsl("#383838") + +-- Highlight colors + +colors.error = red +colors.warning = yellow +colors.success = green +colors.info = white + +colors.constant = yellow2 +colors.identifier = yellow +colors.statement = white + +colors.nt = colors[4] ---@diagnostic disable: undefined-global return lush(function() return { - Normal({ fg = s.normal, bg = s.inv }), -- Normal text + Normal({ fg = colors.fg, bg = colors.bg }), -- Normal text - SyntaxError({ fg = red, gui = "underline" }), - SyntaxWarning({ fg = yellow, gui = "underline" }), - SyntaxInfo({ fg = yellow, gui = "underline" }), - SyntaxHint({ fg = green, gui = "underline" }), + SyntaxError({ fg = colors.error, gui = "underline" }), + SyntaxWarning({ fg = colors.warning, gui = "underline" }), + SyntaxInfo({ fg = colors.info, gui = "underline" }), + SyntaxHint({ fg = colors.success, gui = "underline" }), - Comment({ fg = s[6] }), -- any comment - ColorColumn({ bg = s[6] }), -- used for the columns set with 'colorcolumn' + Comment({ fg = colors[6] }), -- any comment + ColorColumn({ bg = colors[6] }), -- used for the columns set with 'colorcolumn' Conceal({}), -- placeholder characters substituted for concealed text (see 'conceallevel') - Cursor({ fg = s.inv, bg = yellow }), -- character under the cursor + Cursor({ fg = colors.bg, bg = colors.identifier }), -- character under the cursor -- CursorI({}), -- insert cursor TODO make this based on other colors -- CursorR({}), -- replace cursor -- CursorO({}), -- operator-pending cursor - -- lCursor { }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - -- CursorIM { }, -- like Cursor, but used when in IME mode |CursorIM| - -- CursorColumn { }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + -- lCursor({}), -- the character under the cursor when |language-mapping| is used (see 'guicursor') + -- CursorIM({}), -- like Cursor, but used when in IME mode |CursorIM| + -- CursorColumn({}), -- Screen-column at the cursor, when 'cursorcolumn' is set. CursorLine({ bg = Normal.bg[offset_fn](2) }), -- Screen-line at the cursor, when 'cursorline' is set. Low-priority if foreground (ctermfg OR guifg) is not set. - Directory({}), -- directory names (and other special names in listings) - DiffAdd({ fg = green, gui = "bold" }), -- diff mode: Added line |diff.txt| - DiffChange({ fg = yellow, gui = "bold" }), -- diff mode: Changed line |diff.txt| - DiffDelete({ fg = red }), -- diff mode: Deleted line |diff.txt| - DiffText({ fg = white, bg = red }), -- diff mode: Changed text within a changed line |diff.txt| - EndOfBuffer({ fg = eob }), -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. - -- TermCursor { }, -- cursor in a focused terminal - -- TermCursorNC { }, -- cursor in an unfocused terminal - Error({ fg = red, gui = "bold" }), -- (preferred) any erroneous construct - ErrorMsg({ fg = red, gui = "bold" }), -- error messages on the command line - VertSplit({ fg = s[8] }), -- the column separating vertically split windows - Folded({ fg = s[3], bg = s[9] }), -- line used for closed folds + Directory({ fg = colors.info }), -- directory names (and other special names in listings) + DiffAdd({ fg = colors.success }), -- diff mode: Added line |diff.txt| + DiffChange({ fg = colors.warning }), -- diff mode: Changed line |diff.txt| + DiffDelete({ fg = colors.error }), -- diff mode: Deleted line |diff.txt| + DiffText({ fg = colors.info, bg = colors.error }), -- diff mode: Changed text within a changed line |diff.txt| + -- EndOfBuffer({}), -- filler lines (~) after the end of the buffer. By default, this is highlighted like |hl-NonText|. + -- TermCursor({}), -- cursor in a focused terminal + -- TermCursorNC({}), -- cursor in an unfocused terminal + Error({ fg = colors.error }), -- (preferred) any erroneous construct + ErrorMsg({ fg = colors.error }), -- error messages on the command line + VertSplit({ fg = colors[8] }), -- the column separating vertically split windows + Folded({ fg = colors[3], bg = colors[9] }), -- line used for closed folds FoldColumn({}), -- 'foldcolumn' SignColumn({}), -- column where |signs| are displayed - IncSearch({ fg = s.inv, bg = yellow }), -- 'incsearch' highlighting; also used for the text replaced with ":s///c" - Substitute({}), -- |:substitute| replacement text highlighting - LineNr({ fg = s[6] }), -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. - CursorLineNr({ fg = s[1] }), -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - MatchParen({ fg = yellow2, gui = "underline" }), -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| + IncSearch({ fg = colors.bg, bg = colors.identifier }), -- 'incsearch' highlighting; also used for the text replaced with ":s///c" + -- Substitute({}), -- |:substitute| replacement text highlighting + LineNr({ fg = colors[6] }), -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + CursorLineNr({ fg = colors[1] }), -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + MatchParen({ fg = colors.constant, gui = "underline" }), -- The character under the cursor or just before it, if it is a paired bracket, and its match. |pi_paren.txt| ParenMatch({ MatchParen }), ModeMsg({}), -- 'showmode' message (e.g., "-- INSERT -- ") MsgArea({}), -- Area for messages and cmdline MsgSeparator({}), -- Separator for scrolled messages, `msgsep` flag of 'display' - MoreMsg({ fg = yellow, gui = "bold" }), -- |more-prompt| - NonText({ fg = nt }), -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. - NormalFloat({ bg = s[7], fg = s[1] }), -- Normal text in floating windows. + MoreMsg({ fg = colors.identifier, gui = "bold" }), -- |more-prompt| + NonText({ fg = colors.nt }), -- '@' at the end of the window, characters from 'showbreak' and other characters that do not really exist in the text (e.g., ">" displayed when a double-wide character doesn't fit at the end of the line). See also |hl-EndOfBuffer|. + NormalFloat({ bg = colors[7], fg = colors[1] }), -- Normal text in floating windows. NormalNC({}), -- Normal text in non-current windows Pmenu({NormalFloat}), -- Popup menu: Normal item. - PmenuSel({ fg = s.inv, bg = s.normal }), -- Popup menu: selected item. - PmenuSbar({ bg = s[6] }), -- Popup menu: scrollbar. - PmenuThumb({ bg = s[3] }), -- Popup menu: Thumb of the scrollbar. + PmenuSel({ fg = colors.bg, bg = colors.fg }), -- Popup menu: selected item. + PmenuSbar({ bg = colors[6] }), -- Popup menu: scrollbar. + PmenuThumb({ bg = colors[3] }), -- Popup menu: Thumb of the scrollbar. Question({}), -- |hit-enter| prompt and yes/no questions QuickFixLine({}), -- Current |quickfix| item in the quickfix window. Combined with |hl-CursorLine| when the cursor is there. - Search({ fg = s.inv, bg = yellow }), -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. + Search({ fg = colors.bg, bg = colors.identifier }), -- Last search pattern highlighting (see 'hlsearch'). Also used for similar items that need to stand out. SpecialKey({ gui = "bold" }), -- Unprintable characters: text displayed differently from what it really is. But not 'listchars' whitespace. |hl-Whitespace| SpellBad({ SyntaxError }), -- Word that is not recognized by the spellchecker. |spell| Combined with the highlighting used otherwise. SpellCap({ SyntaxInfo }), -- Word that should start with a capital. |spell| Combined with the highlighting used otherwise. SpellLocal({ SyntaxHint }), -- Word that is recognized by the spellchecker as one that is used in another region. |spell| Combined with the highlighting used otherwise. SpellRare({ SyntaxWarning }), -- Word that is recognized by the spellchecker as one that is hardly ever used. |spell| Combined with the highlighting used otherwise. - StatusLine({ fg = s.normal, bg = s.inv }), -- status line of current window - -- StatusLine({ fg = s[1], bg = s[8] }), -- status line of current window - StatusLineNC({ fg = s[6], bg = s.inv }), -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. - TabLine({ fg = s[3] }), -- tab pages line, not active tab page label - TabLineFill({ fg = s[3] }), -- tab pages line, where there are no labels - TabLineSel({ fg = s[1], gui = "bold" }), -- tab pages line, active tab page label + StatusLine({ fg = colors.fg, bg = colors.bg }), -- status line of current window + StatusLineNC({ fg = colors[6], bg = colors.bg }), -- status lines of not-current windows Note: if this is equal to "StatusLine" Vim will use "^^^" in the status line of the current window. + TabLine({ fg = colors[3] }), -- tab pages line, not active tab page label + TabLineFill({ fg = colors[3] }), -- tab pages line, where there are no labels + TabLineSel({ fg = colors[1], gui = "bold" }), -- tab pages line, active tab page label Title({ gui = "bold" }), -- titles for output from ":set all", ":autocmd" etc. - Visual({ fg = s.inv, bg = s.normal }), -- Visual mode selection - VisualNOS({}), -- Visual mode selection when vim is "Not Owning the Selection". - Warning({ fg = yellow, gui = "bold" }), -- warning messages + Visual({ fg = colors.bg, bg = colors.fg }), -- Visual mode selection + -- VisualNOS({}), -- Visual mode selection when vim is "Not Owning the Selection". + Warning({ fg = colors.warning }), -- warning messages WarningMsg({ Warning }), -- warning messages - Whitespace({ fg = s[7] }), -- "nbsp", "space", "tab" and "trail" in 'listchars' - WildMenu({ fg = s[6], bg = s.normal }), -- current match in 'wildmenu' completion + Whitespace({ fg = colors[7] }), -- "nbsp", "space", "tab" and "trail" in 'listchars' + WildMenu({ fg = colors[6], bg = colors.fg }), -- current match in 'wildmenu' completion - Constant({ fg = yellow2 }), -- (preferred) any constant - -- String({ fg = s[2] }), -- a string constant: "this is a string" + Constant({ fg = colors.constant }), -- (preferred) any constant + -- String({}), -- a string constant: "this is a string" -- Character({}), -- a character constant: 'c', '\n' -- Number({}), -- a number constant: 234, 0xff -- Boolean({}), -- a boolean constant: TRUE, false -- Float({}), -- a floating point constant: 2.3e10 - Identifier({ fg = yellow }), -- (preferred) any variable name - -- Identifier({ fg = white }), -- (preferred) any variable name + Identifier({ fg = colors.identifier }), -- (preferred) any variable name -- Function({}), -- function name (also: methods for classes) - Statement({ fg = white }), -- (preferred) any statement + Statement({ fg = colors.statement }), -- (preferred) any statement -- Conditional({}), -- if, then, else, endif, switch, etc. -- Repeat({}), -- for, do, while, etc. -- Label({}), -- case, default, etc. @@ -183,11 +183,10 @@ return lush(function() Structure({}), -- struct, union, enum, etc. Typedef({}), -- A typedef - -- Special({ fg = yellow2 }), -- (preferred) any special symbol - Special({ fg = white }), -- (preferred) any special symbol + Special({ fg = colors.statement }), -- (preferred) any special symbol -- SpecialChar({}), -- special character in a constant -- Tag({}), -- you can use CTRL-] on this - -- Delimiter({ fg = s[1] }), -- character that needs attention + -- Delimiter({}), -- character that needs attention -- SpecialComment({}), -- special things inside a comment -- Debug({}), -- debugging statements @@ -195,108 +194,110 @@ return lush(function() Bold({ gui = "bold" }), Italic({ gui = "italic" }), - -- Ignore { }, -- (preferred) left blank, hidden |hl-Ignore| + -- Ignore({}), -- (preferred) left blank, hidden |hl-Ignore| - Todo({ fg = yellow, gui = "bold" }), -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Todo({ fg = colors.identifier, gui = "bold" }), -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX - LspReferenceText({ gui = "underline", fg = yellow }), -- used for highlighting "text" references - LspReferenceRead({ gui = "underline", fg = yellow }), -- used for highlighting "read" references - LspReferenceWrite({ gui = "underline", fg = green }), -- used for highlighting "write" references + LspReferenceText({ gui = "underline", fg = colors.statement }), -- used for highlighting "text" references + LspReferenceRead({ gui = "underline", fg = colors.statement }), -- used for highlighting "read" references + LspReferenceWrite({ gui = "underline", fg = colors.success }), -- used for highlighting "write" references - IndentBlanklineChar({ fg = s[8] }), - IndentBlanklineContextChar({ fg = nt }), + IndentBlanklineChar({ fg = colors[8] }), + IndentBlanklineContextChar({ fg = colors.nt }), - DiagnosticError({ fg = red }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - DiagnosticWarn({ fg = yellow }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - DiagnosticInfo({ fg = yellow }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - DiagnosticHint({ fg = green }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticError({ fg = colors.error }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticWarn({ fg = colors.warning }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticInfo({ fg = colors.info }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) + DiagnosticHint({ fg = colors.success }), -- Used as the base highlight group. Other LspDiagnostic highlights link to this by default (except Underline) - -- LspDiagnosticsVirtualTextError { }, -- Used for "Error" diagnostic virtual text - -- LspDiagnosticsVirtualTextWarning { }, -- Used for "Warning" diagnostic virtual text - -- LspDiagnosticsVirtualTextInformation { }, -- Used for "Information" diagnostic virtual text - -- LspDiagnosticsVirtualTextHint { }, -- Used for "Hint" diagnostic virtual text + -- LspDiagnosticsVirtualTextError({}), -- Used for "Error" diagnostic virtual text + -- LspDiagnosticsVirtualTextWarning({}), -- Used for "Warning" diagnostic virtual text + -- LspDiagnosticsVirtualTextInformation({}), -- Used for "Information" diagnostic virtual text + -- LspDiagnosticsVirtualTextHint({}), -- Used for "Hint" diagnostic virtual text DiagnosticUnderlineError({ SyntaxError }), -- Used to underline "Error" diagnostics DiagnosticUnderlineWarn({ SyntaxWarning }), -- Used to underline "Warning" diagnostics DiagnosticUnderlineInfo({ SyntaxInfo }), -- Used to underline "Information" diagnostics DiagnosticUnderlineHint({ SyntaxHint }), -- Used to underline "Hint" diagnostics - -- LspDiagnosticsFloatingError { }, -- Used to color "Error" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingWarning { }, -- Used to color "Warning" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingInformation { }, -- Used to color "Information" diagnostic messages in diagnostics float - -- LspDiagnosticsFloatingHint { }, -- Used to color "Hint" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingError({}), -- Used to color "Error" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingWarning({}), -- Used to color "Warning" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingInformation({}), -- Used to color "Information" diagnostic messages in diagnostics float + -- LspDiagnosticsFloatingHint({}), -- Used to color "Hint" diagnostic messages in diagnostics float - DiagnosticSignError({ fg = red }), -- Used for "Error" signs in sign column - DiagnosticSignWarning({ fg = yellow }), -- Used for "Warning" signs in sign column - DiagnosticSignInformation({ fg = s.normal }), -- Used for "Information" signs in sign column - DiagnosticSignHint({ fg = green }), -- Used for "Hint" signs in sign column + DiagnosticSignError({ fg = colors.error }), -- Used for "Error" signs in sign column + DiagnosticSignWarning({ fg = colors.warning }), -- Used for "Warning" signs in sign column + DiagnosticSignInformation({ fg = colors.info }), -- Used for "Information" signs in sign column + DiagnosticSignHint({ fg = colors.success }), -- Used for "Hint" signs in sign column - -- TSAnnotation { }; -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. - -- TSAttribute { }; -- (unstable) TODO: docs - -- TSBoolean { }; -- For booleans. - -- TSCharacter { }; -- For characters. - -- TSComment { }; -- For comment blocks. - -- TSConstructor { }; -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. - -- TSConditional { }; -- For keywords related to conditionnals. - TSConstant({ gui = "underline", sp = "fg" }), -- For constants - -- TSConstBuiltin { }; -- For constant that are built in the language: `nil` in Lua. - -- TSConstMacro { }; -- For constants that are defined by macros: `NULL` in C. - -- TSError { }; -- For syntax/parser errors. - -- TSException { }; -- For exception related keywords. - -- TSField { }; -- For fields. - -- TSFloat { }; -- For floats. - -- TSFunction { }; -- For function (calls and definitions). - -- TSFuncBuiltin { }; -- For builtin functions: `table.insert` in Lua. - -- TSFuncMacro { }; -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. - -- TSInclude { }; -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. - -- TSKeyword { }; -- For keywords that don't fall in previous categories. - -- TSKeywordFunction { }; -- For keywords used to define a fuction. - -- TSLabel { }; -- For labels: `label:` in C and `:label:` in Lua. - -- TSMethod { }; -- For method calls and definitions. - -- TSNamespace { }; -- For identifiers referring to modules and namespaces. - -- TSNone { }; -- TODO: docs - -- TSNumber { }; -- For all numbers - -- TSOperator { }; -- For any operator: `+`, but also `->` and `*` in C. - -- TSParameter { }; -- For parameters of a function. - -- TSParameterReference { }; -- For references to parameters of a function. + -- Treesitter + + -- TSAnnotation({}); -- For C++/Dart attributes, annotations that can be attached to the code to denote some kind of meta information. + -- TSAttribute({}); -- (unstable) TODO: docs + -- TSBoolean({}); -- For booleans. + -- TSCharacter({}); -- For characters. + -- TSComment({}); -- For comment blocks. + -- TSConstructor({}); -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. + -- TSConditional({}); -- For keywords related to conditionnals. + -- TSConstant({}), -- For constants + -- TSConstBuiltin({}); -- For constant that are built in the language: `nil` in Lua. + -- TSConstMacro({}); -- For constants that are defined by macros: `NULL` in C. + -- TSError({}); -- For syntax/parser errors. + -- TSException({}); -- For exception related keywords. + -- TSField({}); -- For fields. + -- TSFloat({}); -- For floats. + -- TSFunction({}); -- For function (calls and definitions). + -- TSFuncBuiltin({}); -- For builtin functions: `table.insert` in Lua. + -- TSFuncMacro({}); -- For macro defined fuctions (calls and definitions): each `macro_rules` in Rust. + -- TSInclude({}); -- For includes: `#include` in C, `use` or `extern crate` in Rust, or `require` in Lua. + -- TSKeyword({}); -- For keywords that don't fall in previous categories. + -- TSKeywordFunction({}); -- For keywords used to define a fuction. + -- TSLabel({}); -- For labels: `label:` in C and `:label:` in Lua. + -- TSMethod({}); -- For method calls and definitions. + -- TSNamespace({}); -- For identifiers referring to modules and namespaces. + -- TSNone({}); -- TODO: docs + -- TSNumber({}); -- For all numbers + -- TSOperator({}); -- For any operator: `+`, but also `->` and `*` in C. + -- TSParameter({}); -- For parameters of a function. + -- TSParameterReference({}); -- For references to parameters of a function. TSProperty({}), -- Same as `TSField`. - -- TSPunctDelimiter { }; -- For delimiters ie: `.` - -- TSPunctBracket { }; -- For brackets and parens. - -- TSPunctSpecial { }; -- For special punctutation that does not fall in the catagories before. - -- TSRepeat { }; -- For keywords related to loops. - -- TSString { }; -- For strings. - TSStringRegex({ fg = s[1] }), -- For regexes. - TSStringEscape({ fg = s.normal, gui = "bold" }), -- For escape characters within a string. - -- TSSymbol { }; -- For identifiers referring to symbols or atoms. - -- TSType { }; -- For types. - -- TSTypeBuiltin { }; -- For builtin types. - -- TSVariable { }; -- Any variable name that does not have another highlight. - -- TSVariableBuiltin { }; -- Variable names that are defined by the languages, like `this` or `self`. + -- TSPunctDelimiter({}); -- For delimiters ie: `.` + -- TSPunctBracket({}); -- For brackets and parens. + -- TSPunctSpecial({}); -- For special punctutation that does not fall in the catagories before. + -- TSRepeat({}); -- For keywords related to loops. + -- TSString({}); -- For strings. + TSStringRegex({ fg = colors[1] }), -- For regexes. + TSStringEscape({ fg = colors.fg, gui = "bold" }), -- For escape characters within a string. + -- TSSymbol({}); -- For identifiers referring to symbols or atoms. + -- TSType({}); -- For types. + -- TSTypeBuiltin({}); -- For builtin types. + -- TSVariable({}); -- Any variable name that does not have another highlight. + -- TSVariableBuiltin({}); -- Variable names that are defined by the languages, like `this` or `self`. - -- TSTag { }; -- Tags like html tag names. - -- TSTagDelimiter { }; -- Tag delimiter like `<` `>` `/` - -- TSText { }; -- For strings considered text in a markup language. - -- TSEmphasis { }; -- For text to be represented with emphasis. - -- TSUnderline { }; -- For text to be represented with an underline. - -- TSStrike { }; -- For strikethrough text. - -- TSTitle { }; -- Text that is part of a title. - -- TSLiteral { }; -- Literal text. - -- TSURI { }; -- Any URI like a link or email. + -- TSTag({}); -- Tags like html tag names. + -- TSTagDelimiter({}); -- Tag delimiter like `<` `>` `/` + -- TSText({}); -- For strings considered text in a markup language. + -- TSEmphasis({}); -- For text to be represented with emphasis. + -- TSUnderline({}); -- For text to be represented with an underline. + -- TSStrike({}); -- For strikethrough text. + -- TSTitle({}); -- Text that is part of a title. + -- TSLiteral({}); -- Literal text. + -- TSURI({}); -- Any URI like a link or email. - IndentBlankLineContextStart({ gui = "underline", sp = nt }), - TreesitterContext({ fg = s[3] }), + IndentBlankLineContextStart({ gui = "underline", sp = colors.nt }), + TreesitterContext({ fg = colors[3] }), -- Lightspeed LightspeedGreyWash({ Comment }), - LightspeedLabel({ fg = white }), - LightspeedOverlapped({ fg = white.darken(15), gui = "underline" }), - LightspeedLabelDistant({ fg = yellow, gui = "underline" }), - LightspeedLabelDistantOverlapped({ fg = yellow.darken(15), gui = "underline" }), - LightspeedShortcut({ fg = yellow }), + LightspeedLabel({ fg = colors.statement }), + LightspeedOverlapped({ fg = colors.statement.darken(15), gui = "underline" }), + LightspeedLabelDistant({ fg = colors.identifier, gui = "underline" }), + LightspeedLabelDistantOverlapped({ fg = colors.identifier.darken(15), gui = "underline" }), + LightspeedShortcut({ fg = colors.identifier }), LightspeedShortcutOverlapped({ LightspeedShortcut }), - LightspeedMaskedChar({ fg = s.normal, gui = "none" }), - LightspeedUnlabeledMatch({ fg = s.normal, gui = "bold" }), + LightspeedMaskedChar({ fg = colors.fg, gui = "none" }), + LightspeedUnlabeledMatch({ fg = colors.fg, gui = "bold" }), LightspeedOneCharMatch({ LightspeedShortcut, gui = "none" }), LightspeedUniqueChar({ LightspeedUnlabeledMatch }), LightspeedPendingOpArea({ LightspeedShortcut, gui = "underline" }),