fix(hl): handle nil return of hl function

refactor(hl): more elegant handle of `force` kw
rebelot · Jan 12, 2022 · 7a46e28 · 7a46e28
1 parent 6983be1
commit 7a46e28
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lua/heirline/statusline.lua b/lua/heirline/statusline.lua
@@ -64,11 +64,11 @@ function StatusLine:eval()
 
     local stl = {}
 
-    local hl = type(self.hl) == "function" and self:hl() or self.hl -- self raw hl
+    local hl = type(self.hl) == "function" and (self:hl() or {}) or self.hl -- self raw hl
     local cur_hl = getmetatable(self).__index(self, "cur_hl") -- the parent hl
 
     if cur_hl.force then
-        self.cur_hl = vim.tbl_extend("force", hl, cur_hl) -- merged hl
+        self.cur_hl = vim.tbl_extend("keep", cur_hl, hl) -- merged hl
     else
         self.cur_hl = vim.tbl_extend("force", cur_hl, hl) -- merged hl
     end