From fc44f0372cff579d6859521a65e5cadc540e450f Mon Sep 17 00:00:00 2001
From: siduck <siduck@tutanota.com>
Date: Sun, 29 Jan 2023 21:38:04 +0530
Subject: [PATCH] put syntax & treesitter highlights in the same file

---
 lua/base46/init.lua                  | 5 +++--
 lua/base46/integrations/defaults.lua | 4 +---
 lua/base46/integrations/syntax.lua   | 5 ++++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lua/base46/init.lua b/lua/base46/init.lua
index 3b0be61..3b66423 100644
--- a/lua/base46/init.lua
+++ b/lua/base46/init.lua
@@ -120,12 +120,13 @@ M.saveStr_to_cache = function(filename, tb)
 end
 
 M.compile = function()
+
   -- All integration modules, each file returns a table
   local hl_files = vim.g.base46_custom_path or vim.fn.stdpath "data" .. "/lazy/base46/lua/base46/integrations"
 
   for _, file in ipairs(vim.fn.readdir(hl_files)) do
-    -- skip caching statusline file as its done in defaults file
-    if file ~= "statusline" then
+    -- skip caching some files
+    if file ~= "statusline" or file ~= "treesitter" then
       local filename = vim.fn.fnamemodify(file, ":r")
       M.saveStr_to_cache(filename, M.load_highlight(filename))
     end
diff --git a/lua/base46/integrations/defaults.lua b/lua/base46/integrations/defaults.lua
index 61ace71..6cfd975 100644
--- a/lua/base46/integrations/defaults.lua
+++ b/lua/base46/integrations/defaults.lua
@@ -253,8 +253,6 @@ local defaults = {
 
 -- merge statusilne & hl_add tables!
 local merge_tb = require("base46").merge_tb
-
 defaults = merge_tb(defaults, require("base46").load_highlight "statusline")
-defaults = merge_tb(defaults, require("core.utils").load_config().ui.hl_add)
 
-return defaults
+return merge_tb(defaults, require("core.utils").load_config().ui.hl_add)
diff --git a/lua/base46/integrations/syntax.lua b/lua/base46/integrations/syntax.lua
index 9fb2a8d..924dac4 100644
--- a/lua/base46/integrations/syntax.lua
+++ b/lua/base46/integrations/syntax.lua
@@ -1,6 +1,6 @@
 local theme = require("base46").get_theme_tb "base_16"
 
-return {
+local syntax = {
   Boolean = {
     fg = theme.base09,
   },
@@ -114,3 +114,6 @@ return {
     fg = theme.base0A,
   },
 }
+
+local merge_tb = require("base46").merge_tb
+return merge_tb(syntax, require("base46").load_highlight "treesitter")