incorporate conditionCall()

r-lib · Nov 4, 2023 · b8fed32 · b8fed32
1 parent b73702b
commit b8fed32
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/R/settings.R b/R/settings.R
@@ -74,11 +74,17 @@ read_config_file <- function(config_file) {
           tryCatch(
             eval(parsed_setting),
             error = function(e) {
-              stop("Error from config setting '", setting, "':\n    ", conditionMessage(e))
+              stop(
+                "Error from config setting '", setting, "' at call '", format(conditionCall(e)), "':\n",
+                "    ", conditionMessage(e)
+              )
             }
           ),
           warning = function(w) {
-            warning("Warning from config setting '", setting, "':\n    ", conditionMessage(w))
+            warning(
+              "Warning from config setting '", setting, "' at call '", format(conditionCall(w)), "':\n",
+              "    ", conditionMessage(w)
+            )
             invokeRestart("muffleWarning")
           }
         )