From 4eb246fb8997680ee284ce399f3ea74e218dc257 Mon Sep 17 00:00:00 2001 From: Pocco81 Date: Fri, 29 Oct 2021 11:50:07 -0500 Subject: [PATCH] fix: _br stuff --- lua/catppuccino/core/integrations/treesitter.lua | 8 ++++---- lua/catppuccino/core/integrations/which_key.lua | 1 - lua/catppuccino/core/mapper.lua | 12 ++++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lua/catppuccino/core/integrations/treesitter.lua b/lua/catppuccino/core/integrations/treesitter.lua index cdcafd7..55aea43 100644 --- a/lua/catppuccino/core/integrations/treesitter.lua +++ b/lua/catppuccino/core/integrations/treesitter.lua @@ -11,7 +11,7 @@ function M.get(cp) -- 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 = { fg = cp.catppuccino7_br, style = cnf.styles.keywords }, -- For booleans. + TSBoolean = { fg = cp.catppuccino7, style = cnf.styles.keywords }, -- For booleans. -- TSCharacter = { }; -- For characters. -- TSComment = { }; -- For comment blocks. TSNote = { fg = cp.catppuccino2, catppuccino2 = cp.info }, @@ -20,7 +20,7 @@ function M.get(cp) TSConstructor = { fg = cp.catppuccino5 }, -- For constructor calls and definitions: `= { }` in Lua, and Java constructors. TSConditional = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to conditionnals. TSConstant = { fg = cp.catppuccino7 }, -- For constants - TSConstBuiltin = { fg = cp.catppuccino7_br, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua. + TSConstBuiltin = { fg = cp.catppuccino7, style = cnf.styles.keywords }, -- For constant that are built in the language: `nil` in Lua. -- TSConstMacro = { }; -- For constants that are defined by macros: `NULL` in cp. -- TSError = { }; -- For syntax/parser errors. TSException = { fg = cp.catppuccino4, style = cnf.styles.keywords }, -- For exception related keywords. @@ -40,11 +40,11 @@ function M.get(cp) -- TSNone = { }; -- TODO: docs -- TSNumber = { }; -- For all numbers TSOperator = { fg = cp.catppuccino3 }, -- For any operator: `+`, but also `->` and `*` in cp. - TSParameter = { fg = cp.catppuccino7_br }, -- For parameters of a function. + TSParameter = { fg = cp.catppuccino7 }, -- For parameters of a function. -- TSParameterReference= { }; -- For references to parameters of a function. TSProperty = { fg = cp.catppuccino6 }, -- Same as `TSField`. tomlTSProperty = { fg = cp.catppuccino10 }, -- Differentiates between string and properties - TSPunctDelimiter = { fg = cp.catppuccino8_br }, -- For delimiters ie: `.` + TSPunctDelimiter = { fg = cp.catppuccino8 }, -- For delimiters ie: `.` TSPunctBracket = { fg = cp.catppuccino6 }, -- For brackets and parenthesis. TSPunctSpecial = { fg = cp.catppuccino0 }, -- For special punctutation that does not fall in the catagories before. TSRepeat = { fg = cp.catppuccino6, style = cnf.styles.keywords }, -- For keywords related to loops. diff --git a/lua/catppuccino/core/integrations/which_key.lua b/lua/catppuccino/core/integrations/which_key.lua index b76be06..8bbe9ad 100644 --- a/lua/catppuccino/core/integrations/which_key.lua +++ b/lua/catppuccino/core/integrations/which_key.lua @@ -12,5 +12,4 @@ function M.get(cp) } end -print("llo ) return M diff --git a/lua/catppuccino/core/mapper.lua b/lua/catppuccino/core/mapper.lua index aa38f36..10fff3b 100644 --- a/lua/catppuccino/core/mapper.lua +++ b/lua/catppuccino/core/mapper.lua @@ -10,7 +10,7 @@ local function get_properties() background = "dark", } - if colors_util.assert_brightness(color_palette.catppuccino2) then + if colors_util.assertightness(color_palette.catppuccino2) then props["background"] = "light" end @@ -86,9 +86,9 @@ local function get_base() Constant = { fg = cp.catppuccino7 }, -- (prefercatppuccino6) any constant String = { fg = cp.catppuccino8, style = cnf.styles.strings }, -- a string constant: "this is a string" Character = { fg = cp.catppuccino8 }, -- a character constant: 'c', '\n' - Number = { fg = cp.catppuccino7_br }, -- a number constant: 234, 0xff - Float = { fg = cp.catppuccino7_br }, -- a floating point constant: 2.3e10 - Boolean = { fg = cp.catppuccino7_br }, -- a boolean constant: TRUE, false + Number = { fg = cp.catppuccino7 }, -- a number constant: 234, 0xff + Float = { fg = cp.catppuccino7 }, -- a floating point constant: 2.3e10 + Boolean = { fg = cp.catppuccino7 }, -- a boolean constant: TRUE, false Identifier = { fg = cp.catppuccino3, style = cnf.styles.variables }, -- (prefercatppuccino6) any variable name Function = { fg = cp.catppuccino10, style = cnf.styles.functions }, -- function name (also: methods for classes) Statement = { fg = cp.catppuccino4 }, -- (prefercatppuccino6) any statement @@ -156,7 +156,7 @@ local function get_base() DiffText = { fg = cp.diff.text, catppuccino2 = cp.catppuccino2 }, -- diff mode: Changed text within a changed line |diff.txt| -- NeoVim healthError = { fg = cp.error }, - healthSuccess = { fg = cp.catppuccino8_br }, + healthSuccess = { fg = cp.catppuccino8 }, healthWarning = { fg = cp.warning }, -- misc @@ -165,7 +165,7 @@ local function get_base() GlyphPalette2 = { fg = cp.catppuccino8 }, GlyphPalette3 = { fg = cp.catppuccino9 }, GlyphPalette4 = { fg = cp.catppuccino10 }, - GlyphPalette6 = { fg = cp.catppuccino8_br }, + GlyphPalette6 = { fg = cp.catppuccino8 }, GlyphPalette7 = { fg = cp.fg }, GlyphPalette9 = { fg = cp.catppuccino6 }, }