From 63fa98885e313ed08fdc216fad11045046dc1ca5 Mon Sep 17 00:00:00 2001 From: Michael Chris Lopez Date: Thu, 7 Oct 2021 09:41:21 +0800 Subject: [PATCH] Constant is different from TSConstant --- colors/zenbones.vim | 9 +++++---- colors/zenflesh.vim | 3 ++- lua/zenbones/init.lua | 12 ++++++------ lua/zenflesh/init.lua | 6 +++--- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/colors/zenbones.vim b/colors/zenbones.vim index c5ad1e7..f96c989 100644 --- a/colors/zenbones.vim +++ b/colors/zenbones.vim @@ -54,7 +54,7 @@ highlight CocMarkdownLink guifg=#3B8992 guibg=NONE guisp=NONE gui=underline highlight ColorColumn guifg=NONE guibg=#EFD8D3 guisp=NONE gui=NONE highlight Comment guifg=#948985 guibg=NONE guisp=NONE gui=italic highlight Conceal guifg=#4D5C65 guibg=NONE guisp=NONE gui=bold,italic -highlight Constant guifg=#556570 guibg=NONE guisp=NONE gui=italic +highlight Constant guifg=#53636D guibg=NONE guisp=NONE gui=italic highlight Cursor guifg=#F2F0EF guibg=#2C363C guisp=NONE gui=NONE highlight CursorLine guifg=NONE guibg=#E6E1DF guisp=NONE gui=NONE highlight CursorLineNr guifg=#2C363C guibg=NONE guisp=NONE gui=bold @@ -99,7 +99,7 @@ highlight NeogitHunkHeaderHighlight guifg=#2C363C guibg=#E6E1DF guisp=NONE gui=b highlight NonText guifg=#C0B0A8 guibg=NONE guisp=NONE gui=NONE highlight Normal guifg=#2C363C guibg=#F0EDEC guisp=NONE gui=NONE highlight NormalFloat guifg=NONE guibg=#E1DCD9 guisp=NONE gui=NONE -highlight Number guifg=NONE guibg=NONE guisp=NONE gui=italic +highlight Number guifg=#2C363C guibg=NONE guisp=NONE gui=italic highlight NvimTreeCursorLine guifg=NONE guibg=#DAD3CF guisp=NONE gui=NONE highlight NvimTreeRootFolder guifg=#286486 guibg=NONE guisp=NONE gui=bold highlight NvimTreeSpecialFile guifg=#88507D guibg=NONE guisp=NONE gui=underline @@ -111,7 +111,7 @@ highlight PmenuSel guifg=NONE guibg=#C4B6AF guisp=NONE gui=NONE highlight PmenuThumb guifg=NONE guibg=#F7F6F5 guisp=NONE gui=NONE highlight Search guifg=#2C363C guibg=#D2A6C8 guisp=NONE gui=NONE highlight SneakLabelMask guifg=#88507D guibg=#88507D guisp=NONE gui=NONE -highlight Special guifg=#4D5C65 guibg=NONE guisp=NONE gui=bold +highlight Special guifg=#51606B guibg=NONE guisp=NONE gui=bold highlight SpecialComment guifg=#948985 guibg=NONE guisp=NONE gui=bold highlight SpecialKey guifg=#C0B0A8 guibg=NONE guisp=NONE gui=italic highlight SpellBad guifg=#974352 guibg=NONE guisp=NONE gui=undercurl @@ -120,13 +120,14 @@ highlight SpellRare guifg=#974352 guibg=NONE guisp=NONE gui=undercurl highlight Statement guifg=#2C363C guibg=NONE guisp=NONE gui=bold highlight StatusLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=NONE highlight StatusLineNC guifg=#596A76 guibg=#DAD3CF guisp=NONE gui=NONE +highlight TSConstant guifg=#44525B guibg=NONE guisp=NONE gui=bold,italic highlight TabLine guifg=#2C363C guibg=#D1C7C3 guisp=NONE gui=italic highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold highlight TelescopeMatching guifg=#88507D guibg=NONE guisp=NONE gui=bold highlight TelescopeSelectionCaret guifg=#A8334C guibg=#E6E1DF guisp=NONE gui=NONE highlight Title guifg=NONE guibg=NONE guisp=NONE gui=bold highlight Todo guifg=NONE guibg=NONE guisp=NONE gui=bold,underline -highlight Type guifg=#5C534F guibg=NONE guisp=NONE gui=NONE +highlight Type guifg=#6A5549 guibg=NONE guisp=NONE gui=NONE highlight Underlined guifg=NONE guibg=NONE guisp=NONE gui=underline highlight Visual guifg=NONE guibg=#D2DFE7 guisp=NONE gui=NONE highlight WarningMsg guifg=#944927 guibg=NONE guisp=NONE gui=NONE diff --git a/colors/zenflesh.vim b/colors/zenflesh.vim index f669ce3..dde3afb 100644 --- a/colors/zenflesh.vim +++ b/colors/zenflesh.vim @@ -99,7 +99,7 @@ highlight NeogitHunkHeaderHighlight guifg=#B4BDC3 guibg=#24211F guisp=NONE gui=b highlight NonText guifg=#524C4A guibg=NONE guisp=NONE gui=NONE highlight Normal guifg=#B4BDC3 guibg=#1C1918 guisp=NONE gui=NONE highlight NormalFloat guifg=NONE guibg=#2B2725 guisp=NONE gui=NONE -highlight Number guifg=NONE guibg=NONE guisp=NONE gui=italic +highlight Number guifg=#B4BDC3 guibg=NONE guisp=NONE gui=italic highlight NvimTreeCursorLine guifg=NONE guibg=#312D2B guisp=NONE gui=NONE highlight NvimTreeRootFolder guifg=#6099C0 guibg=NONE guisp=NONE gui=bold highlight NvimTreeSpecialFile guifg=#B279A7 guibg=NONE guisp=NONE gui=underline @@ -120,6 +120,7 @@ highlight SpellRare guifg=#CB7A83 guibg=NONE guisp=NONE gui=undercurl highlight Statement guifg=#B4BDC3 guibg=NONE guisp=NONE gui=bold highlight StatusLine guifg=#B4BDC3 guibg=#3D3836 guisp=NONE gui=NONE highlight StatusLineNC guifg=#CAD0D4 guibg=#312D2B guisp=NONE gui=NONE +highlight TSConstant guifg=#979FA4 guibg=NONE guisp=NONE gui=bold,italic highlight TabLine guifg=#B4BDC3 guibg=#3D3836 guisp=NONE gui=italic highlight TabLineSel guifg=NONE guibg=NONE guisp=NONE gui=bold highlight TelescopeMatching guifg=#B279A7 guibg=NONE guisp=NONE gui=bold diff --git a/lua/zenbones/init.lua b/lua/zenbones/init.lua index 0f3f5e2..70a28c6 100644 --- a/lua/zenbones/init.lua +++ b/lua/zenbones/init.lua @@ -16,7 +16,7 @@ elseif lightness ~= nil then vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) end -local italic_comments = vim.g.zenbones_italic_comments ~= false and "italic" or nil +local italic_comments = vim.g.zenbones_italic_comments ~= false and "italic" or "NONE" -- stylua: ignore start local theme = lush(function() @@ -117,10 +117,10 @@ local theme = lush(function() -- default, -- Uncomment and edit if you want more specific syntax highlighting. - Constant { fg = p.fg.li(25), gui = "italic" }, -- (preferred) any constant + Constant { fg = p.fg.li(24), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' - Number { gui = "italic" }, -- a number constant: 234, 0xff + Number { fg = p.fg, gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 @@ -141,12 +141,12 @@ local theme = lush(function() -- Macro { }, -- same as Define -- PreCondit { }, -- preprocessor #if, #else, #endif, etp. - Type { fg = p.bg.da(62) }, -- (preferred) int, long, char, etp. + Type { fg = p.bg.sa(20).da(60) }, -- (preferred) int, long, char, etp. -- StorageClass { }, -- static, register, volatile, etc. -- Structure { }, -- struct, union, enum, etc. -- Typedef { }, -- A typedef - Special { fg = p.fg.li(21), gui = "bold" }, -- (preferred) any special symbol + Special { fg = p.fg.li(23), gui = "bold" }, -- (preferred) any special symbol -- SpecialChar { }, -- special character in a constant -- Tag { }, -- you can use CTRL-] on this Delimiter { fg = p.bg.da(42) }, -- character that needs attention @@ -219,7 +219,7 @@ local theme = lush(function() -- TSComment { }; -- For comment blocks. -- TSConstructor { }; -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. -- TSConditional { }; -- For keywords related to conditionnals. - -- TSConstant { }; -- For constants + TSConstant { Identifier, gui = "bold,italic" }; -- For constants TSConstBuiltin { Number }; -- For constant that are built in the language: `nil` in Lua. TSConstMacro { Number }; -- For constants that are defined by macros: `NULL` in C. -- TSError { }; -- For syntax/parser errors. diff --git a/lua/zenflesh/init.lua b/lua/zenflesh/init.lua index 1af62f8..b9824bf 100644 --- a/lua/zenflesh/init.lua +++ b/lua/zenflesh/init.lua @@ -16,7 +16,7 @@ elseif darkness ~= nil then vim.api.nvim_echo({ { error_msg, "WarningMsg" } }, true, {}) end -local italic_comments = vim.g.zenflesh_italic_comments ~= false and "italic" or nil +local italic_comments = vim.g.zenflesh_italic_comments ~= false and "italic" or "NONE" -- stylua: ignore start local theme = lush(function() @@ -120,7 +120,7 @@ local theme = lush(function() Constant { fg = p.fg.da(24), gui = "italic" }, -- (preferred) any constant -- String { }, -- a string constant: "this is a string" -- Character { }, -- a character constant: 'c', '\n' - Number { gui = "italic" }, -- a number constant: 234, 0xff + Number { fg = p.fg, gui = "italic" }, -- a number constant: 234, 0xff Boolean { Number }, -- a boolean constant: TRUE, false -- Float { }, -- a floating point constant: 2.3e10 @@ -219,7 +219,7 @@ local theme = lush(function() -- TSComment { }; -- For comment blocks. -- TSConstructor { }; -- For constructor calls and definitions: ` { }` in Lua, and Java constructors. -- TSConditional { }; -- For keywords related to conditionnals. - -- TSConstant { }; -- For constants + TSConstant { Identifier, gui = "bold,italic" }; -- For constants TSConstBuiltin { Number }; -- For constant that are built in the language: `nil` in Lua. TSConstMacro { Number }; -- For constants that are defined by macros: `NULL` in C. -- TSError { }; -- For syntax/parser errors.