Browse Source

feat: illuminate works again

ChristianChiarulli 2 years ago
parent
commit
293f4369ae
2 changed files with 46 additions and 47 deletions
  1. 44 45
      lua/lvim/core/illuminate.lua
  2. 2 2
      lua/lvim/plugins.lua

+ 44 - 45
lua/lvim/core/illuminate.lua

@@ -4,59 +4,58 @@ M.config = function()
   lvim.builtin.illuminate = {
     active = true,
     on_config_done = nil,
-    options = {
-      -- providers: provider used to get references in the buffer, ordered by priority
-      providers = {
-        "lsp",
-        "treesitter",
-        "regex",
-      },
-      -- delay: delay in milliseconds
-      delay = 120,
-      -- filetypes_denylist: filetypes to not illuminate, this overrides filetypes_allowlist
-      filetypes_denylist = {
-        "dirvish",
-        "fugitive",
-        "alpha",
-        "NvimTree",
-        "packer",
-        "neogitstatus",
-        "Trouble",
-        "lir",
-        "Outline",
-        "spectre_panel",
-        "toggleterm",
-        "DressingSelect",
-        "TelescopePrompt",
-      },
-      -- filetypes_allowlist: filetypes to illuminate, this is overriden by filetypes_denylist
-      filetypes_allowlist = {},
-      -- modes_denylist: modes to not illuminate, this overrides modes_allowlist
-      modes_denylist = {},
-      -- modes_allowlist: modes to illuminate, this is overriden by modes_denylist
-      modes_allowlist = {},
-      -- providers_regex_syntax_denylist: syntax to not illuminate, this overrides providers_regex_syntax_allowlist
-      -- Only applies to the 'regex' provider
-      -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name')
-      providers_regex_syntax_denylist = {},
-      -- providers_regex_syntax_allowlist: syntax to illuminate, this is overriden by providers_regex_syntax_denylist
-      -- Only applies to the 'regex' provider
-      -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name')
-      providers_regex_syntax_allowlist = {},
-      -- under_cursor: whether or not to illuminate under the cursor
-      under_cursor = true,
-    },
   }
-end
 
-M.setup = function()
   local status_ok, illuminate = pcall(require, "illuminate")
   if not status_ok then
     return
   end
 
-  illuminate.configure(lvim.builtin.illuminate.options)
+  illuminate.configure {
+    -- providers: provider used to get references in the buffer, ordered by priority
+    providers = {
+      "lsp",
+      "treesitter",
+      "regex",
+    },
+    -- delay: delay in milliseconds
+    delay = 120,
+    -- filetypes_denylist: filetypes to not illuminate, this overrides filetypes_allowlist
+    filetypes_denylist = {
+      "dirvish",
+      "fugitive",
+      "alpha",
+      "NvimTree",
+      "packer",
+      "neogitstatus",
+      "Trouble",
+      "lir",
+      "Outline",
+      "spectre_panel",
+      "toggleterm",
+      "DressingSelect",
+      "TelescopePrompt",
+    },
+    -- filetypes_allowlist: filetypes to illuminate, this is overriden by filetypes_denylist
+    filetypes_allowlist = {},
+    -- modes_denylist: modes to not illuminate, this overrides modes_allowlist
+    modes_denylist = {},
+    -- modes_allowlist: modes to illuminate, this is overriden by modes_denylist
+    modes_allowlist = {},
+    -- providers_regex_syntax_denylist: syntax to not illuminate, this overrides providers_regex_syntax_allowlist
+    -- Only applies to the 'regex' provider
+    -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name')
+    providers_regex_syntax_denylist = {},
+    -- providers_regex_syntax_allowlist: syntax to illuminate, this is overriden by providers_regex_syntax_denylist
+    -- Only applies to the 'regex' provider
+    -- Use :echom synIDattr(synIDtrans(synID(line('.'), col('.'), 1)), 'name')
+    providers_regex_syntax_allowlist = {},
+    -- under_cursor: whether or not to illuminate under the cursor
+    under_cursor = true,
+  }
+end
 
+M.setup = function()
   if lvim.builtin.illuminate.on_config_done then
     lvim.builtin.illuminate.on_config_done()
   end

+ 2 - 2
lua/lvim/plugins.lua

@@ -262,10 +262,10 @@ local core_plugins = {
 
   {
     "RRethy/vim-illuminate",
-    setup = function()
+    config = function()
       require("lvim.core.illuminate").setup()
     end,
-    disable = not lvim.builtin.illuminate.active,
+    -- disable = not lvim.builtin.illuminate.active,
   },
   {
     "lunarvim/onedarker.nvim",