remove treesitter icon, colorize filetype if no treesitter

Author: davidosomething

nvim/lua/dko/heirline/winbar-filename.lua

@@ -1,5 +1,5 @@
+local dkohl = require("dko.heirline.utils").hl
 local utils = require("heirline.utils")
-local hl = require("dko.heirline.utils").hl
 
 local DIRTY = { fg = utils.get_highlight("Todo").fg }
 
@@ -17,7 +17,7 @@ return {
     end,
     provider = " ",
     hl = function()
-      return hl("Special")
+      return dkohl("Special")
     end,
   },
 
@@ -37,7 +37,7 @@ return {
       return vim.fn.fnamemodify(self.filepath, ":t")
     end,
     hl = function()
-      return hl(vim.bo.modified and DIRTY or "StatusLine")
+      return dkohl(vim.bo.modified and DIRTY or "StatusLine")
     end,
   },
   { provider = " " },

nvim/lua/dko/heirline/winbar-filepath.lua

@@ -13,7 +13,7 @@ return {
   end,
   provider = function(self)
     local win_width = vim.api.nvim_win_get_width(0)
-    local extrachars = 3 + 3 + self.filetype_text:len()
+    local extrachars = 3 + self.filetype_text:len()
     local remaining = win_width - extrachars
 
     local cwd = vim.fn.fnamemodify(vim.uv.cwd() or "", ":~")

nvim/lua/dko/heirline/winbar-filetype.lua

@@ -1,4 +1,5 @@
-local hl = require("dko.heirline.utils").hl
+local dkohl = require("dko.heirline.utils").hl
+local dkots = require("dko.utils.treesitter")
 local utils = require("heirline.utils")
 
 -- =======================================================================
@@ -10,8 +11,25 @@ return {
     return vim.bo.filetype ~= ""
   end,
 
+  init = function(self)
+    self.bg = dkots.is_highlight_enabled()
+        and utils.get_highlight("dkoStatusKey").bg
+      or utils.get_highlight("DiffDelete").bg
+    self.fg = dkots.is_highlight_enabled()
+        and utils.get_highlight("StatusLine").fg
+      or utils.get_highlight("DiffDelete").fg
+    self.treesitter_active = {
+      fg = self.fg,
+      bg = self.bg,
+    }
+  end,
+
   utils.surround({ "", "" }, function()
-    return utils.get_highlight("dkoStatusKey").bg
+    local bg = dkots.is_highlight_enabled()
+        and utils.get_highlight("dkoStatusKey").bg
+      or utils.get_highlight("DiffDelete").bg
+    --- red if no treesitter
+    return dkohl(bg, utils.get_highlight("dkoStatusKey").bg)
   end, {
     {
       condition = function(self)
@@ -20,12 +38,12 @@ return {
       provider = function(self)
         return self.icon
       end,
-      hl = function()
+      hl = function(self)
         local _, icons = pcall(require, "nvim-web-devicons")
         if icons then
           local _, color = icons.get_icon_color_by_filetype(vim.bo.filetype)
           if color then
-            return hl({ fg = color }, "dkoStatusKey")
+            return dkohl({ fg = color, bg = self.bg }, "dkoStatusKey")
           end
         end
         return ""
@@ -38,7 +56,9 @@ return {
       provider = function(self)
         return (self.icon ~= "" and " " or "") .. self.filetype_text
       end,
-      hl = "dkoStatusKey",
+      hl = function(self)
+        return dkohl(self.treesitter_active, "dkoStatusKey")
+      end,
     },
   }),
 }

nvim/lua/dko/heirline/winbar-treesitter.lua

@@ -22,7 +22,6 @@ return {
   hl = function()
     return hl()
   end,
-  require("dko.heirline.winbar-treesitter"),
   require("dko.heirline.winbar-filetype"),
   require("dko.heirline.winbar-filename"),
   require("dko.heirline.winbar-filepath"),

nvim/lua/dko/heirline/winbar.lua

@@ -2,7 +2,10 @@ local M = {}
 
 M.is_highlight_enabled = function(bufnr)
   bufnr = bufnr and vim.fn.bufnr(bufnr) or vim.fn.bufnr()
-  return bufnr > -1 and vim.treesitter.highlighter.active[bufnr] ~= nil
+  if bufnr > -1 then
+    return vim.treesitter.highlighter.active[bufnr] ~= nil
+  end
+  return false
 end
 
 return M