fix(highlight): apply fallback even if not defined

Fixes: #729
lewis6991 · Jan 27, 2023 · 0d4fe37 · 0d4fe37
1 parent c52162b
commit 0d4fe37
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/lua/gitsigns/highlight.lua b/lua/gitsigns/highlight.lua
diff --git a/teal/gitsigns/highlight.tl b/teal/gitsigns/highlight.tl
@@ -185,9 +185,17 @@ local function derive(hl: string, hldef: Hldef)
       else
         vim.api.nvim_set_hl(0, hl, {default = true, link = d })
       end
-      break
+      return
     end
   end
+  if hldef[1] and not hldef.bg_factor and not hldef.fg_factor then
+    -- No fallback found which is set. Just link to the first fallback
+    -- if there are no modifiers
+    dprintf('Deriving %s from %s', hl, hldef[1])
+    vim.api.nvim_set_hl(0, hl, {default = true, link = hldef[1] })
+  else
+    dprintf('Could not derive %s', hl)
+  end
 end
 
 -- Setup a GitSign* highlight by deriving it from other potentially present