From 78b2cc3106677be8018a550c1de8acb0edfeacef Mon Sep 17 00:00:00 2001 From: Matt <0tlzomwse@mozmail.com> Date: Tue, 6 Dec 2022 15:31:42 +0700 Subject: [PATCH] ensure errors arent silently swallowed in custom chadrc if exists --- lua/core/utils.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lua/core/utils.lua b/lua/core/utils.lua index fe2cfaa..87eea50 100644 --- a/lua/core/utils.lua +++ b/lua/core/utils.lua @@ -3,9 +3,12 @@ local merge_tb = vim.tbl_deep_extend M.load_config = function() local config = require "core.default_config" - local chadrc_exists, chadrc = pcall(require, "custom.chadrc") + + -- nvim_get_runtime_file always uses forward slashes regardless of platform + local chadrc_exists = vim.api.nvim_get_runtime_file('lua/custom/chadrc.lua', false)[1] if chadrc_exists then + local chadrc = require "custom.chadrc" -- merge user config if it exists and is a table; otherwise display an error if type(chadrc) == "table" then config.mappings = M.remove_disabled_keys(chadrc.mappings, config.mappings)