refactor: restructure highlights a little bit better

Author: s1n7ax

lua/window-picker/config.lua

@@ -34,7 +34,7 @@ local config = {
 	filter_func = nil,
 
 	-- following filters are only applied when you are using the default filter
-	-- defined by this plugin. if you pass in a function to "filter_func"
+	-- defined by this plugin. If you pass in a function to "filter_func"
 	-- property, you are on your own
 	filter_rules = {
 		-- when there is only one window available to pick from, use that window
@@ -66,16 +66,34 @@ local config = {
 		file_name_contains = {},
 	},
 
-	-- the foreground (text) color of the picker
-	fg_color = '#ededed',
-
-	-- if you have include_current_win == true, then current_win_hl_color will
-	-- be highlighted using this background color
-	current_win_hl_color = '#e35e4f',
-
-	-- all the windows except the curren window will be highlighted using this
-	-- color
-	other_win_hl_color = '#44cc41',
+	-- You can pass in the highlight name or a table of content to set as
+	-- highlight
+	highlights = {
+		statusline = {
+			focused = {
+				fg = '#ededed',
+				bg = '#e35e4f',
+				bold = true,
+			},
+			unfocused = {
+				fg = '#ededed',
+				bg = '#44cc41',
+				bold = true,
+			},
+		},
+		winbar = {
+			focused = {
+				fg = '#ededed',
+				bg = '#e35e4f',
+				bold = true,
+			},
+			unfocused = {
+				fg = '#ededed',
+				bg = '#44cc41',
+				bold = true,
+			},
+		},
+	},
 }
 
 return config

lua/window-picker/configurer.lua

@@ -27,6 +27,9 @@ function M._basic_config_manipulations(config)
 end
 
 function M._backward_compatibility_config_changes(config)
+	----------------------------------------------------------------------
+	--                           filter rules                           --
+	----------------------------------------------------------------------
 	local filter_rules = config.filter_rules
 
 	-- backward compatibility to config.autoselect_one
@@ -39,6 +42,19 @@ function M._backward_compatibility_config_changes(config)
 		filter_rules.include_current_win = config.include_current_win
 	end
 
+	----------------------------------------------------------------------
+	--                        highlight changes                         --
+	----------------------------------------------------------------------
+	if config.current_win_hl_color then
+		config.highlights.statusline.focused.bg = config.current_win_hl_color
+		config.highlights.winbar.focused.bg = config.current_win_hl_color
+	end
+
+	if config.other_win_hl_color then
+		config.highlights.statusline.unfocused.bg = config.other_win_hl_color
+		config.highlights.winbar.unfocused.bg = config.other_win_hl_color
+	end
+
 	return config
 end
 

lua/window-picker/hints/statusline-winbar-hint.lua

@@ -13,29 +13,38 @@ function M:set_config(config)
 	self.use_winbar = config.use_winbar
 	self.show_prompt = config.show_prompt
 
-	vim.api.nvim_set_hl(0, 'WindowPickerStatusLine', {
-		fg = '#ededed',
-		bg = config.current_win_hl_color,
-		bold = true,
-	})
-
-	vim.api.nvim_set_hl(0, 'WindowPickerStatusLineNC', {
-		fg = '#ededed',
-		bg = config.other_win_hl_color,
-		bold = true,
-	})
-
-	vim.api.nvim_set_hl(0, 'WindowPickerWinBar', {
-		fg = '#ededed',
-		bg = config.current_win_hl_color,
-		bold = true,
-	})
-
-	vim.api.nvim_set_hl(0, 'WindowPickerWinBarNC', {
-		fg = '#ededed',
-		bg = config.other_win_hl_color,
-		bold = true,
-	})
+	-- registering highlights
+	if type(config.highlights.statusline.focused) == 'table' then
+		self.st_hi = 'WindowPickerStatusLine'
+		vim.api.nvim_set_hl(0, self.st_hi, config.highlights.statusline.focused)
+	end
+
+	if type(config.highlights.statusline.unfocused) == 'table' then
+		self.st_hi_nc = 'WindowPickerStatusLineNC'
+		vim.api.nvim_set_hl(
+			0,
+			self.st_hi_nc,
+			config.highlights.statusline.unfocused
+		)
+	end
+
+	if type(config.highlights.winbar.focused) == 'table' then
+		self.wb_hi = 'WindowPickerWinBar'
+		vim.api.nvim_set_hl(
+			0,
+			self.wb_hi,
+			config.highlights.statusline.unfocused
+		)
+	end
+
+	if type(config.highlights.winbar.unfocused) == 'table' then
+		self.wb_hi_nc = 'WindowPickerWinBarNC'
+		vim.api.nvim_set_hl(
+			0,
+			self.wb_hi_nc,
+			config.highlights.statusline.unfocused
+		)
+	end
 end
 
 --- Shows the characters in status line
@@ -77,11 +86,11 @@ function M:draw(windows)
 			or '%=' .. char .. '%='
 
 		local winhl = string.format(
-			'%s:WindowPicker%s,%sNC:WindowPicker%sNC',
-			indicator_hl,
+			'%s:%s,%sNC:%s',
 			indicator_hl,
+			use_winbar and self.wb_hi or self.st_hi,
 			indicator_hl,
-			indicator_hl
+			use_winbar and self.wb_hi_nc or self.wb_hi
 		)
 
 		local ok, result = pcall(