From 8be1f68ec8a8310109a9204ec9a8599614d8d623 Mon Sep 17 00:00:00 2001
From: Randy Palamar <randy@rnpnr.xyz>
Date: Sun, 28 Apr 2024 12:53:05 -0600
Subject: [PATCH] lua: small filetype/style setting cleanup

Filetype extension mapping already needs to match regular
expressions so we might as well us it to simplify things.

set_syntax doesn't need to handle pseudo scintilla style
definitions. I couldn't even find any examples of table style
definitions anywhere let alone references to other definitions as
$(style.myvarname) (hint: variables in lua already handle this).
---
 lua/plugins/filetype.lua | 11 +++--------
 lua/vis.lua              | 14 ++------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/lua/plugins/filetype.lua b/lua/plugins/filetype.lua
index e8a594513..391621d99 100644
--- a/lua/plugins/filetype.lua
+++ b/lua/plugins/filetype.lua
@@ -178,7 +178,7 @@ vis.ftdetect.filetypes = {
 		ext = { "%.gleam$" },
 	},
 	glsl = {
-		ext = { "%.glslf$", "%.glslv$" },
+		ext = { "%.glsl[fv]?$" },
 	},
 	gnuplot = {
 		ext = { "%.dem$", "%.plt$" },
@@ -200,7 +200,7 @@ vis.ftdetect.filetypes = {
 		mime = { "text/x-haskell" },
 	},
 	html = {
-		ext = { "%.htm$", "%.html$", "%.shtm$", "%.shtml$", "%.xhtml$" },
+		ext = { "%.[sx]?htm[l]?$" },
 		mime = { "text/x-html" },
 	},
 	icon = {
@@ -272,12 +272,7 @@ vis.ftdetect.filetypes = {
 		mime = { "text/x-makefile" },
 	},
 	man = {
-		ext = {
-			"%.1$", "%.2$", "%.3$", "%.4$", "%.5$", "%.6$", "%.7$",
-			"%.8$", "%.9$", "%.1x$", "%.2x$", "%.3x$", "%.4x$",
-			"%.5x$", "%.6x$", "%.7x$", "%.8x$", "%.9x$",
-			"%.ms$", "%.me$", "%.mom$", "%.mm$", "%.tmac$"
-		},
+		ext = { "%.[1-9][xp]?$", "%.ms$", "%.me$", "%.mom$", "%.mm$", "%.tmac$" },
 	},
 	markdown = {
 		ext = { "%.md$", "%.markdown$" },
diff --git a/lua/vis.lua b/lua/vis.lua
index 2432c7200..32fb2a12b 100644
--- a/lua/vis.lua
+++ b/lua/vis.lua
@@ -283,12 +283,8 @@ vis.types.window.set_syntax = function(win, syntax)
 		local style = lexers['STYLE_' .. token_name:upper():gsub("%.", "_")] or ''
 		if type(style) == 'table' then
 			local s = ''
-			if style.bold then
-				s = string.format("%s,bold", s)
-			elseif style.italics then
-				s = string.format("%s,italics", s)
-			elseif style.underlined then
-				s = string.format("%s,underlined", s)
+			if style.attr then
+				s = string.format("%s,%s", s, attr)
 			elseif style.fore then
 				s = string.format("%s,fore:%s", s, style.fore)
 			elseif style.back then
@@ -296,12 +292,6 @@ vis.types.window.set_syntax = function(win, syntax)
 			end
 			style = s
 		end
-		local pattern = "%$%(style%..*%)"
-		local prop_name = style:match(pattern)
-		if prop_name ~= nil then
-			local real_value = tostring(lexers["STYLE_" .. string.upper(prop_name:sub(9,string.len(prop_name)-1))])
-			style = string.gsub(style, pattern, real_value)
-		end
 		if style ~= nil then win:style_define(id, style) end
 	end