From 3d396bc40a89cb78fac968340c334e20b47e227b Mon Sep 17 00:00:00 2001 From: Yi Ming Date: Fri, 19 Jan 2024 17:21:28 +0000 Subject: [PATCH 1/4] feat(treesitter): add highlight for todo comments --- lua/catppuccin/groups/integrations/treesitter.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lua/catppuccin/groups/integrations/treesitter.lua b/lua/catppuccin/groups/integrations/treesitter.lua index df03f0fe..41ffa48a 100644 --- a/lua/catppuccin/groups/integrations/treesitter.lua +++ b/lua/catppuccin/groups/integrations/treesitter.lua @@ -90,6 +90,7 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci ["@comment.error"] = { fg = C.base, bg = C.red }, ["@comment.warning"] = { fg = C.base, bg = C.yellow }, ["@comment.note"] = { fg = C.base, bg = C.blue }, + ["@comment.todo"] = { fg = C.base, bg = C.flamingo }, -- Markup ["@markup"] = { fg = C.text }, -- For strings considerated text in a markup language. @@ -213,7 +214,7 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci colors["@text.todo.unchecked"] = colors["@markup.list.unchecked"] -- @text.todo is now for todo comments, not todo notes like in markdown - colors["@text.todo"] = colors["comment.warning"] + colors["@text.todo"] = colors["comment.todo"] colors["@text.warning"] = colors["comment.warning"] colors["@text.note"] = colors["comment.note"] colors["@text.danger"] = colors["comment.error"] From 0d840ed26c266fc54639b017de8afc9fe8f9c74d Mon Sep 17 00:00:00 2001 From: Yi Ming Date: Fri, 19 Jan 2024 17:34:50 +0000 Subject: [PATCH 2/4] feat: unify the color of todos --- lua/catppuccin/groups/integrations/NormalNvim.lua | 2 +- lua/catppuccin/groups/syntax.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lua/catppuccin/groups/integrations/NormalNvim.lua b/lua/catppuccin/groups/integrations/NormalNvim.lua index 80902d3e..7e711efd 100644 --- a/lua/catppuccin/groups/integrations/NormalNvim.lua +++ b/lua/catppuccin/groups/integrations/NormalNvim.lua @@ -3,7 +3,7 @@ local M = {} function M.get() return { MarkdownTask = { fg = C.teal, style = { "bold" } }, - MarkdownTodo = { fg = C.yellow, style = { "bold" } }, + MarkdownTodo = { fg = C.flamingo, style = { "bold" } }, MarkdownNote = { fg = C.red, style = { "bold" } }, MarkdownSee = { fg = C.blue, style = { "bold" } }, MarkdownCheck = { fg = C.green, style = { "bold" } }, diff --git a/lua/catppuccin/groups/syntax.lua b/lua/catppuccin/groups/syntax.lua index 76e10e0a..055ddfe1 100644 --- a/lua/catppuccin/groups/syntax.lua +++ b/lua/catppuccin/groups/syntax.lua @@ -43,7 +43,7 @@ function M.get() -- Ignore = { }, -- (preferred) left blank, hidden |hl-Ignore| Error = { fg = C.red }, -- (preferred) any erroneous construct - Todo = { bg = C.yellow, fg = C.base, style = { "bold" } }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX + Todo = { bg = C.flamingo, fg = C.base, style = { "bold" } }, -- (preferred) anything that needs extra attention; mostly the keywords TODO FIXME and XXX qfLineNr = { fg = C.yellow }, qfFileName = { fg = C.blue }, htmlH1 = { fg = C.pink, style = { "bold" } }, From 1742b719bb102096c47cbf41afdcb9d4bdf61dff Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Sat, 20 Jan 2024 23:00:10 +0700 Subject: [PATCH 3/4] feat: `@comment.note` -> `@comment.hint` --- lua/catppuccin/groups/integrations/treesitter.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lua/catppuccin/groups/integrations/treesitter.lua b/lua/catppuccin/groups/integrations/treesitter.lua index 41ffa48a..bb70ea07 100644 --- a/lua/catppuccin/groups/integrations/treesitter.lua +++ b/lua/catppuccin/groups/integrations/treesitter.lua @@ -89,7 +89,7 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci ["@comment.error"] = { fg = C.base, bg = C.red }, ["@comment.warning"] = { fg = C.base, bg = C.yellow }, - ["@comment.note"] = { fg = C.base, bg = C.blue }, + ["@comment.hint"] = { fg = C.base, bg = C.blue }, ["@comment.todo"] = { fg = C.base, bg = C.flamingo }, -- Markup @@ -252,6 +252,8 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci colors["@method.php"] = colors["@function.method.php"] colors["@method.call.php"] = colors["@function.method.call.php"] + colors["@comment.note"] = colors["@comment.hint"] + return colors end From 83717d0448ca8c272803bfc3abdad7b2eeaff769 Mon Sep 17 00:00:00 2001 From: mrtnvgr Date: Sat, 20 Jan 2024 23:06:25 +0700 Subject: [PATCH 4/4] fix: typos in legacy highlights --- lua/catppuccin/groups/integrations/treesitter.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lua/catppuccin/groups/integrations/treesitter.lua b/lua/catppuccin/groups/integrations/treesitter.lua index bb70ea07..0b315a6d 100644 --- a/lua/catppuccin/groups/integrations/treesitter.lua +++ b/lua/catppuccin/groups/integrations/treesitter.lua @@ -213,11 +213,13 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci colors["@text.todo.checked"] = colors["@markup.list.checked"] colors["@text.todo.unchecked"] = colors["@markup.list.unchecked"] + colors["@comment.note"] = colors["@comment.hint"] + -- @text.todo is now for todo comments, not todo notes like in markdown - colors["@text.todo"] = colors["comment.todo"] - colors["@text.warning"] = colors["comment.warning"] - colors["@text.note"] = colors["comment.note"] - colors["@text.danger"] = colors["comment.error"] + colors["@text.todo"] = colors["@comment.todo"] + colors["@text.warning"] = colors["@comment.warning"] + colors["@text.note"] = colors["@comment.note"] + colors["@text.danger"] = colors["@comment.error"] -- @text.uri is now -- @markup.link.url in markup links @@ -252,8 +254,6 @@ If you want to stay on nvim 0.7, either disable the integration or pin catppucci colors["@method.php"] = colors["@function.method.php"] colors["@method.call.php"] = colors["@function.method.call.php"] - colors["@comment.note"] = colors["@comment.hint"] - return colors end