fix: move bc to appropriate place

catppuccin · Dec 8, 2023 · 16331da · 16331da
1 parent f923efa
commit 16331da
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lua/catppuccin/groups/integrations/dap_ui.lua b/lua/catppuccin/groups/integrations/dap_ui.lua
@@ -1,10 +1,6 @@
 local M = {}
 
 function M.get()
-	if O.integrations.dap.enabled and O.integrations.dap.enable_ui ~= nil then
-		O.integrations.dap_ui = O.integrations.dap.enable_ui
-	end
-
 	return {
 		DapUIScope = { fg = C.sky },
 		DapUIType = { fg = C.mauve },

diff --git a/lua/catppuccin/lib/mapper.lua b/lua/catppuccin/lib/mapper.lua
@@ -26,6 +26,12 @@ function M.apply(flavour)
 	theme.editor = require("catppuccin.groups.editor").get()
 	local final_integrations = {}
 
+	-- https://github.com/catppuccin/nvim/pull/624
+	if type(O.integrations.dap) == "table" and O.integrations.dap.enable_ui ~= nil then
+		O.integrations.dap_ui = O.integrations.dap.enable_ui
+		O.integrations.dap.enable_ui = nil
+	end
+
 	for integration in pairs(O.integrations) do
 		local cot = false
 		if type(O.integrations[integration]) == "table" then
@@ -46,6 +52,7 @@ function M.apply(flavour)
 			)
 		end
 	end
+
 	theme.integrations = final_integrations -- plugins
 	theme.terminal = require("catppuccin.groups.terminal").get() -- terminal colors
 	local user_highlights = O.highlight_overrides