From 79539bec86a904855c13d0aee2776f372cbf7be7 Mon Sep 17 00:00:00 2001 From: Shawon Date: Sat, 25 Jan 2025 12:58:54 +0600 Subject: [PATCH] fix: Fixed an issue caused by `enable = false` when getting options from `preview` --- lua/cmp-markview.lua | 2 +- lua/markview.lua | 13 +++++++------ lua/markview/filetypes.lua | 2 +- lua/markview/spec.lua | 10 +++++----- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/lua/cmp-markview.lua b/lua/cmp-markview.lua index 3143c4e..7684814 100644 --- a/lua/cmp-markview.lua +++ b/lua/cmp-markview.lua @@ -4,7 +4,7 @@ local source = {}; --- Is this source available? ---@return boolean function source:is_available() - local fts = require("markview.spec").get({ "preview", "filetypes" }, { fallback = {} }); + local fts = require("markview.spec").get({ "preview", "filetypes" }, { fallback = {}, ignore_enable = true }); return vim.list_contains(fts, vim.bo.ft); end diff --git a/lua/markview.lua b/lua/markview.lua index d9997f4..0c87ea4 100644 --- a/lua/markview.lua +++ b/lua/markview.lua @@ -515,7 +515,8 @@ markview.actions = { markview.state.splitview_buffer, false, spec.get({ "preview", "splitview_winopts", }, { - fallback = { split = "right" } + fallback = { split = "right" }, + ignore_enable = true }) ); end @@ -798,7 +799,7 @@ markview.actions = { local mode = vim.api.nvim_get_mode().mode; ---@type string[] - local hybd_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {} }); + local hybd_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {}, ignore_enable = true }); if vim.list_contains(hybd_modes, mode) == false then health.__child_indent_de(); @@ -844,9 +845,9 @@ markview.actions = { local mode = vim.api.nvim_get_mode().mode; ---@type string[] - local prev_modes = spec.get({ "preview", "modes" }, { fallback = {} }); + local prev_modes = spec.get({ "preview", "modes" }, { fallback = {}, ignore_enable = true }); ---@type string[] - local hybd_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {} }); + local hybd_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {}, ignore_enable = true }); if vim.list_contains(prev_modes, mode) == false then health.__child_indent_de(); @@ -905,7 +906,7 @@ markview.actions = { local mode = vim.api.nvim_get_mode().mode; ---@type string[] - local hybd_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {} }); + local hybd_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {}, ignore_enable = true }); if vim.list_contains(hybd_modes, mode) == false then return; @@ -946,7 +947,7 @@ markview.actions = { local mode = vim.api.nvim_get_mode().mode; ---@type string[] - local hybd_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {} }); + local hybd_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {}, ignore_enable = true }); if vim.list_contains(hybd_modes, mode) == false then return; diff --git a/lua/markview/filetypes.lua b/lua/markview/filetypes.lua index cf3b4db..522dbeb 100644 --- a/lua/markview/filetypes.lua +++ b/lua/markview/filetypes.lua @@ -727,7 +727,7 @@ fts.get = function (ft) end local spec = require("markview.spec"); - local provider_name = spec.get({ "preview", "icon_provider" }, { fallback = "internal" }); + local provider_name = spec.get({ "preview", "icon_provider" }, { fallback = "internal", ignore_enable = true }); local conf = {}; if provider_name == "devicons" and pcall(require, "nvim-web-devicons") then diff --git a/lua/markview/spec.lua b/lua/markview/spec.lua index 319ffae..fe8e0a5 100644 --- a/lua/markview/spec.lua +++ b/lua/markview/spec.lua @@ -214,9 +214,9 @@ spec.default = { ---+${lua} ---@type string[] - local preview_modes = spec.get({ "preview", "modes" }, { fallback = {} }); + local preview_modes = spec.get({ "preview", "modes" }, { fallback = {}, ignore_enable = true }); ---@type string[] - local hybrid_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {} }); + local hybrid_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {}, ignore_enable = true }); local concealcursor = ""; @@ -237,7 +237,7 @@ spec.default = { ---+${lua} ---@type string[] - local preview_modes = spec.get({ "preview", "modes" }, { fallback = {} }); + local preview_modes = spec.get({ "preview", "modes" }, { fallback = {}, ignore_enable = true }); local concealcursor = ""; for _, mode in ipairs(preview_modes) do @@ -257,9 +257,9 @@ spec.default = { ---+${lua} ---@type string[] - local preview_modes = spec.get({ "preview", "modes" }, { fallback = {} }); + local preview_modes = spec.get({ "preview", "modes" }, { fallback = {}, ignore_enable = true }); ---@type string[] - local hybrid_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {} }); + local hybrid_modes = spec.get({ "preview", "hybrid_modes" }, { fallback = {}, ignore_enable = true }); local concealcursor = "";