From 680dd3b52add67ba01e1dad83dc0eac0368afdfb Mon Sep 17 00:00:00 2001
From: ptdewey <patrickdewey2002@gmail.com>
Date: Tue, 15 Oct 2024 10:21:19 -0400
Subject: [PATCH] fix: switch undercurl -> underline for some lsp features

---
 colors/darkearth.lua     | 18 +++++++++---------
 lush_theme/darkearth.lua | 14 ++++++--------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/colors/darkearth.lua b/colors/darkearth.lua
index ff23568..3c96107 100644
--- a/colors/darkearth.lua
+++ b/colors/darkearth.lua
@@ -1,8 +1,8 @@
 -- colors/colorscheme.lua
 
 local colors = {
--- content here will not be touched
--- PATCH_OPEN
+    -- content here will not be touched
+    -- PATCH_OPEN
 Normal = {fg = "#D7C484", bg = "#24211E"},
 CmpItemKindText = {link = "Normal"},
 CmpItemKindVariable = {link = "Normal"},
@@ -180,10 +180,10 @@ LazyValue = {},
 LineNr = {fg = "#77824A", bg = "#221F1C"},
 LspBorderBG = {fg = "#675642", bg = "#24211E"},
 LspFloatWinNormal = {fg = "#D7C484", bg = "#444A2B"},
-LspReferenceRead = {fg = "#5F865F", sp = "#FD9621", bold = true, undercurl = true},
-LspReferenceText = {fg = "#D7C484", bg = "#444A2B", sp = "#FD9621", bold = true, undercurl = true},
-LspReferenceWrite = {fg = "#5F865F", sp = "#FD9621", bold = true, undercurl = true},
-LspSignatureActiveParameter = {sp = "#FBEB9D", bold = true, italic = true, underline = true},
+LspReferenceRead = {fg = "#5F865F", sp = "#FD9621", underline = true},
+LspReferenceText = {fg = "#D7C484", bg = "#444A2B", sp = "#FD9621", underline = true},
+LspReferenceWrite = {fg = "#5F865F", sp = "#FD9621", underline = true},
+LspSignatureActiveParameter = {sp = "#FBEB9D", italic = true, underline = true},
 MasonError = {},
 MasonHeader = {fg = "#D7C484", bg = "#221F1C"},
 MasonHeading = {},
@@ -447,8 +447,8 @@ xmlTagName = {fg = "#77824A"},
 xmlString = {link = "xmlTagName"},
 ["@markup.link"] = {fg = "#77824A"},
 ["@punctuation.special"] = {fg = "#77824A"},
--- PATCH_CLOSE
--- content here will not be touched
+    -- PATCH_CLOSE
+    -- content here will not be touched
 }
 
 -- colorschemes generally want to do this
@@ -458,5 +458,5 @@ vim.cmd("let g:colors_name='darkearth'")
 
 -- apply highlight groups
 for group, attrs in pairs(colors) do
-  vim.api.nvim_set_hl(0, group, attrs)
+    vim.api.nvim_set_hl(0, group, attrs)
 end
diff --git a/lush_theme/darkearth.lua b/lush_theme/darkearth.lua
index cbf3ae3..13e6e31 100644
--- a/lush_theme/darkearth.lua
+++ b/lush_theme/darkearth.lua
@@ -125,10 +125,6 @@ local theme = lush(function(injected_functions)
         sym("@lsp.type.enumMember")({ Constant }),
         rubyConstant({ Constant }),
         vimHiAttrib({ Constant }),
-        -- Number                                     { fg=hsl(71, 27, 40), }, -- NOTE: original
-        -- Number                                     { fg=hsl(60, 20, 50), },
-        -- Number                                     { fg=hsl(40, 55, 60), },
-        -- Number                                     { fg=hsl(300, 10, 55), },
         Number({ fg = hsl(15, 40, 50) }),
         Float({ Number }),
         sym("@number")({ Number }),
@@ -148,6 +144,7 @@ local theme = lush(function(injected_functions)
         Field({ fg = hsl(26, 47, 50) }),
         sym("@field")({ Field }),
         sym("@property")({ Field }),
+        -- sym("@property")({ fg = "#af875e" }), -- light brown (maybe move this to string?)
         sym("@variable")({ Identifier }),
         sym("@namespace")({ Identifier }),
         sym("@lsp.type.parameter")({ Identifier }),
@@ -171,6 +168,7 @@ local theme = lush(function(injected_functions)
         Macro({ PreProc }),
         PreCondit({ PreProc }),
         sym("@preproc")({ PreProc }),
+        -- Type({ fg = "#87875f" }),
         Type({ fg = hsl(72, 27, 40) }),
         StorageClass({ Type }),
         Structure({ Type }),
@@ -370,23 +368,23 @@ local theme = lush(function(injected_functions)
         LspFloatWinNormal({ fg = hsl(46, 51, 68), bg = hsl(72, 27, 23) }),
         LspReferenceRead({
             fg = hsl(120, 17, 45),
-            gui = "bold,undercurl",
+            gui = "underline",
             sp = hsl(32, 98, 56),
         }),
         LspReferenceText({
             fg = hsl(46, 51, 68),
-            gui = "bold,undercurl",
+            gui = "underline",
             bg = hsl(72, 27, 23),
             sp = hsl(32, 98, 56),
         }),
         LspReferenceWrite({
             fg = hsl(120, 17, 45),
-            gui = "bold,undercurl",
+            gui = "underline",
             sp = hsl(32, 98, 56),
         }),
         LspSignatureActiveParameter({
-            gui = "bold,underline,italic",
             sp = hsl(50, 92, 80),
+            gui = "underline,italic",
         }),
         TelescopeSelectionCaret({ fg = hsl(46, 51, 68), bg = hsl(71, 27, 40) }),
         TelescopeBorder({ fg = hsl(33, 22, 33), bg = lnbg }),