From d746f708658a3811c0b3afa4e78ae4db1c227bf6 Mon Sep 17 00:00:00 2001
From: Matt Leong <mattleong91@gmail.com>
Date: Tue, 26 Oct 2021 11:44:29 -0700
Subject: [PATCH] fix(config): allow highlights to be overridable

---
 lua/cosmic/core/navigation/init.lua   |  2 +-
 lua/cosmic/core/theme/highlights.lua  | 62 ++++++++++++---------------
 lua/cosmic/init.lua                   |  1 +
 lua/cosmic/lsp/providers/defaults.lua |  3 --
 4 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/lua/cosmic/core/navigation/init.lua b/lua/cosmic/core/navigation/init.lua
index 671402b..19b31f2 100644
--- a/lua/cosmic/core/navigation/init.lua
+++ b/lua/cosmic/core/navigation/init.lua
@@ -6,7 +6,6 @@ local opts_cursor = {
   initial_mode = 'normal',
   sorting_strategy = 'ascending',
   layout_strategy = 'cursor',
-  preview_title = false,
   results_title = false,
   layout_config = {
     width = 0.5,
@@ -34,6 +33,7 @@ require('telescope').setup({
     file_ignore_patterns = {
       '.git/',
     },
+    dynamic_preview_title = true,
     vimgrep_arguments = {
       'rg',
       '--ignore',
diff --git a/lua/cosmic/core/theme/highlights.lua b/lua/cosmic/core/theme/highlights.lua
index ebcce25..6ceeb5e 100644
--- a/lua/cosmic/core/theme/highlights.lua
+++ b/lua/cosmic/core/theme/highlights.lua
@@ -1,44 +1,38 @@
 local colors = require('cosmic.core.theme.colors')
 local highlight = require('cosmic.utils').highlight
-local M = {}
 
-function M.init()
-  -- diagnostic virtual text highlights
-  highlight('DiagnosticVirtualTextError', 'None', colors.error)
-  highlight('DiagnosticVirtualTextWarn', 'None', colors.warn)
-  highlight('DiagnosticVirtualTextInfo', 'None', colors.info)
-  highlight('DiagnosticVirtualTextHint', 'None', colors.hint)
+-- diagnostic virtual text highlights
+highlight('DiagnosticVirtualTextError', 'None', colors.error)
+highlight('DiagnosticVirtualTextWarn', 'None', colors.warn)
+highlight('DiagnosticVirtualTextInfo', 'None', colors.info)
+highlight('DiagnosticVirtualTextHint', 'None', colors.hint)
 
-  -- diagnostics highlight
-  highlight('DiagnosticError', 'None', colors.error)
-  highlight('DiagnosticWarn', 'None', colors.warn)
-  highlight('DiagnosticInfo', 'None', colors.info)
-  highlight('DiagnosticHint', 'None', colors.hint)
+-- diagnostics highlight
+highlight('DiagnosticError', 'None', colors.error)
+highlight('DiagnosticWarn', 'None', colors.warn)
+highlight('DiagnosticInfo', 'None', colors.info)
+highlight('DiagnosticHint', 'None', colors.hint)
 
-  highlight('Error', 'None', colors.error)
-  highlight('ErrorMsg', 'None', colors.error)
-  highlight('WarningMsg', 'None', colors.warn)
+highlight('Error', 'None', colors.error)
+highlight('ErrorMsg', 'None', colors.error)
+highlight('WarningMsg', 'None', colors.warn)
 
-  -- legacy diagnostics highlight
-  highlight('LspDiagnosticsError', 'None', colors.error)
-  highlight('LspDiagnosticsWarn', 'None', colors.warn)
-  highlight('LspDiagnosticsInfo', 'None', colors.info)
-  highlight('LspDiagnosticsHint', 'None', colors.hint)
+-- legacy diagnostics highlight
+highlight('LspDiagnosticsError', 'None', colors.error)
+highlight('LspDiagnosticsWarn', 'None', colors.warn)
+highlight('LspDiagnosticsInfo', 'None', colors.info)
+highlight('LspDiagnosticsHint', 'None', colors.hint)
 
-  -- signature highlight color
-  highlight('LspSignatureActiveParameter', 'None', colors.orange)
+-- signature highlight color
+highlight('LspSignatureActiveParameter', 'None', colors.orange)
 
-  -- currently not working?
-  highlight('TelescopeSelectionCaret', 'None', colors.selection_caret)
+-- currently not working?
+highlight('TelescopeSelectionCaret', 'None', colors.selection_caret)
 
-  -- autocomplete highlights
-  highlight('CmpItemAbbrDeprecated', 'None', colors.warn)
+-- autocomplete highlights
+highlight('CmpItemAbbrDeprecated', 'None', colors.warn)
 
-  -- todo: needs to highlight after lsp start, why? idk
-  vim.cmd([[
-    highlight clear NormalFloat
-    highlight link NormalFloat Normal
-  ]])
-end
-
-return M
+vim.cmd([[
+highlight clear NormalFloat
+highlight link NormalFloat Normal
+]])
diff --git a/lua/cosmic/init.lua b/lua/cosmic/init.lua
index 7df7c46..2d6b95d 100644
--- a/lua/cosmic/init.lua
+++ b/lua/cosmic/init.lua
@@ -2,6 +2,7 @@ require('cosmic.disabled')
 require('cosmic.pluginsInit')
 require('cosmic.compiled')
 require('cosmic.editor')
+require('cosmic.core.theme.highlights')
 
 do
   local ok, err = pcall(require, 'cosmic.config.editor')
diff --git a/lua/cosmic/lsp/providers/defaults.lua b/lua/cosmic/lsp/providers/defaults.lua
index 032899b..2d807fc 100644
--- a/lua/cosmic/lsp/providers/defaults.lua
+++ b/lua/cosmic/lsp/providers/defaults.lua
@@ -46,9 +46,6 @@ function M.on_attach(client, bufnr)
       border = 'single',
     },
   }, bufnr)
-
-  -- for some reason, highlights have to happen here
-  require('cosmic.core.theme.highlights').init()
 end
 
 M.flags = {