work around for issue rendering cosmo template within pcall

leafo · Mar 5, 2022 · 32c5b0a · 32c5b0a
1 parent 4f97d5d
commit 32c5b0a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/sitegen/common.lua b/sitegen/common.lua
@@ -355,9 +355,17 @@ end
 local render_cosmo
 render_cosmo = function(template, context, line_offset)
   local cosmo = require("sitegen.cosmo")
-  local success, output_or_err = pcall(function()
-    return cosmo.f(template)(context)
-  end)
+  local success, output_or_err
+  if _VERSION == "Lua 5.1" and not jit then
+    local s, render_fn = pcall(function()
+      return cosmo.f(template)
+    end)
+    success, output_or_err = s, s and render_fn(context) or render_fn
+  else
+    success, output_or_err = pcall(function()
+      return cosmo.f(template)(context)
+    end)
+  end
   if success then
     return output_or_err
   end

diff --git a/sitegen/common.moon b/sitegen/common.moon
@@ -225,8 +225,15 @@ highlight_line = (lines, line_no, context=2, highlight_color="%{bright}%{red}",
 render_cosmo = (template, context, line_offset) ->
   cosmo = require "sitegen.cosmo"
 
-  success, output_or_err = pcall ->
-    cosmo.f(template) context
+  -- unable to wrap cosmo rendering in a pcall due to: attempt to yield across metamethod/C-call boundary
+  success, output_or_err = if _VERSION == "Lua 5.1" and not jit
+    s, render_fn = pcall ->
+      cosmo.f template
+
+    s, s and render_fn(context) or render_fn
+  else
+    pcall ->
+      cosmo.f(template) context
 
   if success
     return output_or_err