code review: do not use nested, named function() declarations (#4658)

* code review: do not use nested, named function() declarations

Author: cscheid

src/resources/filters/ast/emulatedfilter.lua

@@ -4,7 +4,7 @@
 -- Copyright (C) 2022 by RStudio, PBC
 
 local function plain_loader(handlers)
-  function wrapFilter(handler)
+  local function wrapFilter(handler)
     local wrappedFilter = {}
     wrappedFilter.scriptFile = handler.scriptFile
     for k, v in pairs(handler) do

src/resources/filters/ast/wrappedwriter.lua

@@ -104,7 +104,7 @@ function wrapped_writer()
       end
     }
 
-    function handleBottomUpResult(v)
+    local function handleBottomUpResult(v)
       if type(v) == "string" then
         table.insert(resultingStrs, v)
       elseif type(v) == "userdata" then

src/resources/filters/common/meta.lua

@@ -50,7 +50,7 @@ end
 
 function metaInjectLatex(meta, func)
   if _quarto.format.isLatexOutput() then
-    function inject(tex)
+    local function inject(tex)
       addInclude(meta, "tex", kHeaderIncludes, tex)
     end
     inject("\\makeatletter")
@@ -69,7 +69,7 @@ end
 
 function metaInjectRawLatex(meta, include, func)
   if _quarto.format.isLatexOutput() then
-    function inject(tex)
+    local function inject(tex)
       addInclude(meta, "tex", include, tex)
     end
     func(inject)
@@ -79,7 +79,7 @@ end
 
 function metaInjectHtml(meta, func)
   if _quarto.format.isHtmlOutput() then
-    function inject(html)
+    local function inject(html)
       addInclude(meta, "html", kHeaderIncludes, html)
     end
     func(inject)

src/resources/filters/common/refs.lua

@@ -68,7 +68,7 @@ function hasSubRefs(divEl, type)
   if hasFigureOrTableRef(divEl) and not hasRefParent(divEl) then
     -- children w/ parent id
     local found = false
-    function checkForParent(el)
+    local function checkForParent(el)
       if not found then
         if hasRefParent(el) then
           if not type or (refType(el.attr.identifier) == type) then

src/resources/filters/common/timing.lua

@@ -40,7 +40,7 @@ function capture_timings(filterList, trace)
       for key,func in pairs(v) do
         newFilter[key] = func
       end
-      function makeNewFilter(oldPandoc)
+      local function makeNewFilter(oldPandoc)
         return function (p)
           if oldPandoc ~= nil then
             local result = oldPandoc(p)

src/resources/filters/common/wrapped-filter.lua

@@ -113,7 +113,7 @@ function makeWrappedLuaFilter(scriptFile, filterHandler)
     local chunk, err = loadfile(scriptFile, "bt", env)
     local handlers = {}
 
-    function makeSingleHandler(handlerTable)
+    local function makeSingleHandler(handlerTable)
       local result = {}
       setmetatable(result, {
         __index = { scriptFile = scriptFile }

src/resources/filters/crossref/format.lua

@@ -129,7 +129,7 @@ function formatNumberOption(type, order, default)
   end
 
   -- return a pandoc.Str w/ chapter prefix (if any)
-  function resolve(num)
+  local function resolve(num)
     if section then
       local sectionIndex = section[1]
       if crossrefOption("chapters-alpha", false) then

src/resources/filters/crossref/tables.lua

@@ -43,7 +43,7 @@ end
 
 function preprocessRawTableBlock(rawEl, parentId)
 
-  function divWrap(el, label, caption)
+  local function divWrap(el, label, caption)
     local div = pandoc.Div(el, pandoc.Attr(label))
     if parentId then
       div.attr.attributes[kRefParent] = parentId

src/resources/filters/layout/layout.lua

@@ -202,7 +202,7 @@ function layoutCells(divEl, cells)
 
     -- manage/perform next insertion into the layout
     local cellIndex = 1
-    function layoutNextCell(width)
+    local function layoutNextCell(width)
       -- check for a spacer width (negative percent)
       if isSpacerWidth(width) then
         local cell = pandoc.Div({

src/resources/filters/qmd-reader.lua

@@ -37,7 +37,7 @@ function find_invalid_tags(str)
     "^[ \t\f\v]*(```+[ \t\f\v]*)(%{+[^.=\n\r]*%}+)", 
     "\n[ \t\f\v]*(```+[ \t\f\v]*)(%{+[^.=\n\r]+%}+)"
   }
-  function find_it(init)
+  local function find_it(init)
     for _, pattern in ipairs(patterns) do
       local range_start, range_end, ticks, tag = str:find(pattern, init)
       if range_start ~= nil then
@@ -119,7 +119,7 @@ function Reader (inputs, opts)
     format = "markdown",
     extensions = extensions,
   }
-  function restore_invalid_tags(tag)
+  local function restore_invalid_tags(tag)
     return tags[tag] or tag
   end
   local doc = pandoc.read(txt, flavor, opts):walk {