From 191574b3a5e8de47351e538f74509c8b0bce8fe5 Mon Sep 17 00:00:00 2001 From: siduck76 Date: Sun, 6 Jun 2021 09:02:28 +0530 Subject: [PATCH 1/4] test treesiter highlights --- lua/base16.lua | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/lua/base16.lua b/lua/base16.lua index 09d21be..56561a6 100644 --- a/lua/base16.lua +++ b/lua/base16.lua @@ -330,6 +330,58 @@ local function apply_base16_theme(theme, use_256_colorspace) -- Java highlighting highlight("javaOperator", theme.base0D, nil, cterm0D, nil, nil, nil) + -- treesitter + highlight('TSNone', theme.base05, theme.base00, cterm05, cterm00, nil, nil) + highlight('TSPunctDelimiter', theme.base07, nil, cterm07, nil, nil, nil) + highlight('TSPunctBracket', theme.base07, nil, cterm07, nil, nil, nil) + highlight('TSPunctSpecial', theme.base0F, nil, cterm0F, nil, nil, nil) + highlight('TSConstant', theme.base09, nil, cterm0B, nil, "bold", nil) + highlight('TSConstBuiltin', theme.base0C, nil, cterm0C, nil, nil, nil) + highlight('TSConstMacro', theme.base0E, nil, cterm0E, nil, "none", nil) + highlight('TSString', theme.base0B, nil, cterm0B, nil, nil, nil) + highlight('TSStringRegex', theme.base0B, nil, cterm0B, nil, nil, nil) + highlight('TSStringEscape', theme.base0F, nil, cterm0F, nil, nil, nil) + highlight('TSCharacter', theme.base08, nil, cterm08, nil, nil, nil) + highlight('TSNumber', theme.base0B, nil, cterm0B, nil, nil, nil) + highlight('TSBoolean', theme.base0B, nil, cterm0B, nil, "bold", nil) + highlight('TSFloat', theme.base0B, nil, cterm0B, nil, nil, nil) + highlight('TSFunction', theme.base0D, nil, cterm0D, nil, "bold", nil) + highlight('TSFuncBuiltin', theme.base0C, nil, cterm0C, nil, nil, nil) + highlight('TSFuncMacro', theme.base08, nil, cterm08, nil, nil, nil) + highlight('TSParameter', theme.base08, nil, cterm08, nil, "none", nil) + highlight('TSParameterReference', theme.base08, nil, cterm08, nil, "none", nil) + highlight('TSMethod', theme.base0D, nil, cterm0D, nil, "bold", nil) + highlight('TSField', theme.base0A, nil, cterm0A, nil, "none", nil) + highlight('TSProperty', theme.base08, nil, cterm08, nil, "none", nil) + highlight('TSConstructor', theme.base0C, nil, cterm0C, nil, nil, nil) + highlight('TSAnnotation', theme.base0A, nil, cterm0A, nil, nil, nil) + highlight('TSAttribute', theme.base0A, nil, cterm0A, nil, nil, nil) + highlight('TSNamespace', theme.base0D, nil, cterm0D, nil, nil, nil) + highlight('TSConditional', theme.base0E, nil, cterm0E, nil, nil, nil) + highlight('TSRepeat', theme.base0A, nil, cterm0A, nil, nil, nil) + highlight('TSLabel', theme.base0A, nil, cterm0A, nil, nil, nil) + highlight('TSOperator', theme.base07, nil, cterm07, nil, "none", nil) + highlight('TSKeyword', theme.base0E, nil, cterm0E, nil, nil, nil) + highlight('TSKeywordFunction', theme.base0E, nil, cterm0E, nil, "bold", nil) + highlight('TSKeywordOperator', theme.base05, nil, cterm05, nil, "none", nil) + highlight('TSException', theme.base08, nil, cterm08, nil, nil, nil) + highlight('TSType', theme.base0A, nil, cterm0A, nil, "bold", nil) + highlight('TSTypeBuiltin', theme.base0A, nil, cterm0A, nil, "bold", nil) + highlight('TSInclude', theme.base0D, nil, cterm0D, nil, nil, nil) + highlight('TSVariableBuiltin', theme.base0C, nil, cterm0C, nil, nil, nil) + highlight('TSText', theme.base05, theme.base00, cterm05, cterm00, nil, nil) + highlight('TSStrong', theme.base07, theme.base00, cterm07, cterm00, "bold", nil) + highlight('TSEmphasis', theme.base06, theme.base00, cterm06, cterm00, "italic", nil) + highlight('TSUnderline', theme.base05, theme.base00, cterm05, cterm00, "underline", nil) + highlight('TSTitle', theme.base0D, nil, cterm0D, nil, "none", nil) + highlight('TSLiteral', theme.base0B, nil, cterm0B, nil, nil, nil) + highlight('TSURI', theme.base08, nil, cterm08, nil, nil, nil) + highlight('TSTag', theme.base0A, nil, cterm0A, nil, nil, nil) + highlight('TSTagDelimiter', theme.base0F, nil, cterm0F, nil, nil, nil) + highlight('TSDefinitionUsage', nil, theme.base02, nil, cterm02, nil, nil) + highlight('TSDefinition', theme.base01, theme.base0A, cterm01, cterm0A, nil, nil) + highlight('TSCurrentScope', nil, theme.base01, nil, cterm01, "none", nil) + -- TODO -- nvim.command 'syntax on' end From 5b359493e0678ad5af7ef7330583d5a29b923ee9 Mon Sep 17 00:00:00 2001 From: siduck76 Date: Sun, 6 Jun 2021 09:04:31 +0530 Subject: [PATCH 2/4] update onedark bg --- lua/base16.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base16.lua b/lua/base16.lua index 56561a6..d5f7c1d 100644 --- a/lua/base16.lua +++ b/lua/base16.lua @@ -971,7 +971,7 @@ themes["one-light"] = { base0C = "0184bc"; base0D = "4078f2"; base0E = "a626a4"; base0F = "986801"; } themes["onedark"] = { - base00 = "282c34"; base01 = "353b45"; base02 = "3e4451"; base03 = "545862"; + base00 = "1e222a"; base01 = "353b45"; base02 = "3e4451"; base03 = "545862"; base04 = "565c64"; base05 = "abb2bf"; base06 = "b6bdca"; base07 = "c8ccd4"; base08 = "e06c75"; base09 = "d19a66"; base0A = "e5c07b"; base0B = "98c379"; base0C = "56b6c2"; base0D = "61afef"; base0E = "c678dd"; base0F = "be5046"; From a4be45eef1ef9781fc4c345fca97c9f9bd7c8148 Mon Sep 17 00:00:00 2001 From: siduck76 Date: Sun, 6 Jun 2021 09:28:39 +0530 Subject: [PATCH 3/4] change color for tspuncBrackets --- lua/base16.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/base16.lua b/lua/base16.lua index d5f7c1d..c4218af 100644 --- a/lua/base16.lua +++ b/lua/base16.lua @@ -333,7 +333,7 @@ local function apply_base16_theme(theme, use_256_colorspace) -- treesitter highlight('TSNone', theme.base05, theme.base00, cterm05, cterm00, nil, nil) highlight('TSPunctDelimiter', theme.base07, nil, cterm07, nil, nil, nil) - highlight('TSPunctBracket', theme.base07, nil, cterm07, nil, nil, nil) + highlight('TSPunctBracket', theme.base08, nil, cterm07, nil, nil, nil) highlight('TSPunctSpecial', theme.base0F, nil, cterm0F, nil, nil, nil) highlight('TSConstant', theme.base09, nil, cterm0B, nil, "bold", nil) highlight('TSConstBuiltin', theme.base0C, nil, cterm0C, nil, nil, nil) From 44e62b3bce38ed6c4bfe0bc5514a06c2444a16c7 Mon Sep 17 00:00:00 2001 From: siduck76 Date: Sun, 6 Jun 2021 09:54:44 +0530 Subject: [PATCH 4/4] ts highlights dont look good :/ --- lua/base16.lua | 54 +------------------------------------------------- 1 file changed, 1 insertion(+), 53 deletions(-) diff --git a/lua/base16.lua b/lua/base16.lua index c4218af..60f108c 100644 --- a/lua/base16.lua +++ b/lua/base16.lua @@ -329,59 +329,7 @@ local function apply_base16_theme(theme, use_256_colorspace) -- Java highlighting highlight("javaOperator", theme.base0D, nil, cterm0D, nil, nil, nil) - - -- treesitter - highlight('TSNone', theme.base05, theme.base00, cterm05, cterm00, nil, nil) - highlight('TSPunctDelimiter', theme.base07, nil, cterm07, nil, nil, nil) - highlight('TSPunctBracket', theme.base08, nil, cterm07, nil, nil, nil) - highlight('TSPunctSpecial', theme.base0F, nil, cterm0F, nil, nil, nil) - highlight('TSConstant', theme.base09, nil, cterm0B, nil, "bold", nil) - highlight('TSConstBuiltin', theme.base0C, nil, cterm0C, nil, nil, nil) - highlight('TSConstMacro', theme.base0E, nil, cterm0E, nil, "none", nil) - highlight('TSString', theme.base0B, nil, cterm0B, nil, nil, nil) - highlight('TSStringRegex', theme.base0B, nil, cterm0B, nil, nil, nil) - highlight('TSStringEscape', theme.base0F, nil, cterm0F, nil, nil, nil) - highlight('TSCharacter', theme.base08, nil, cterm08, nil, nil, nil) - highlight('TSNumber', theme.base0B, nil, cterm0B, nil, nil, nil) - highlight('TSBoolean', theme.base0B, nil, cterm0B, nil, "bold", nil) - highlight('TSFloat', theme.base0B, nil, cterm0B, nil, nil, nil) - highlight('TSFunction', theme.base0D, nil, cterm0D, nil, "bold", nil) - highlight('TSFuncBuiltin', theme.base0C, nil, cterm0C, nil, nil, nil) - highlight('TSFuncMacro', theme.base08, nil, cterm08, nil, nil, nil) - highlight('TSParameter', theme.base08, nil, cterm08, nil, "none", nil) - highlight('TSParameterReference', theme.base08, nil, cterm08, nil, "none", nil) - highlight('TSMethod', theme.base0D, nil, cterm0D, nil, "bold", nil) - highlight('TSField', theme.base0A, nil, cterm0A, nil, "none", nil) - highlight('TSProperty', theme.base08, nil, cterm08, nil, "none", nil) - highlight('TSConstructor', theme.base0C, nil, cterm0C, nil, nil, nil) - highlight('TSAnnotation', theme.base0A, nil, cterm0A, nil, nil, nil) - highlight('TSAttribute', theme.base0A, nil, cterm0A, nil, nil, nil) - highlight('TSNamespace', theme.base0D, nil, cterm0D, nil, nil, nil) - highlight('TSConditional', theme.base0E, nil, cterm0E, nil, nil, nil) - highlight('TSRepeat', theme.base0A, nil, cterm0A, nil, nil, nil) - highlight('TSLabel', theme.base0A, nil, cterm0A, nil, nil, nil) - highlight('TSOperator', theme.base07, nil, cterm07, nil, "none", nil) - highlight('TSKeyword', theme.base0E, nil, cterm0E, nil, nil, nil) - highlight('TSKeywordFunction', theme.base0E, nil, cterm0E, nil, "bold", nil) - highlight('TSKeywordOperator', theme.base05, nil, cterm05, nil, "none", nil) - highlight('TSException', theme.base08, nil, cterm08, nil, nil, nil) - highlight('TSType', theme.base0A, nil, cterm0A, nil, "bold", nil) - highlight('TSTypeBuiltin', theme.base0A, nil, cterm0A, nil, "bold", nil) - highlight('TSInclude', theme.base0D, nil, cterm0D, nil, nil, nil) - highlight('TSVariableBuiltin', theme.base0C, nil, cterm0C, nil, nil, nil) - highlight('TSText', theme.base05, theme.base00, cterm05, cterm00, nil, nil) - highlight('TSStrong', theme.base07, theme.base00, cterm07, cterm00, "bold", nil) - highlight('TSEmphasis', theme.base06, theme.base00, cterm06, cterm00, "italic", nil) - highlight('TSUnderline', theme.base05, theme.base00, cterm05, cterm00, "underline", nil) - highlight('TSTitle', theme.base0D, nil, cterm0D, nil, "none", nil) - highlight('TSLiteral', theme.base0B, nil, cterm0B, nil, nil, nil) - highlight('TSURI', theme.base08, nil, cterm08, nil, nil, nil) - highlight('TSTag', theme.base0A, nil, cterm0A, nil, nil, nil) - highlight('TSTagDelimiter', theme.base0F, nil, cterm0F, nil, nil, nil) - highlight('TSDefinitionUsage', nil, theme.base02, nil, cterm02, nil, nil) - highlight('TSDefinition', theme.base01, theme.base0A, cterm01, cterm0A, nil, nil) - highlight('TSCurrentScope', nil, theme.base01, nil, cterm01, "none", nil) - + -- TODO -- nvim.command 'syntax on' end