Saturday 2024-11-16 20:16:01

lua/doris.lua

@@ -22,7 +22,6 @@ local cm = require("plenary.context_manager")
 _G.fn = vim.fn
 ---looks more C like
 _G.ap = vim.api
-local co = coroutine
 
 ---unicode num cast
 ---@param c string
@@ -36,23 +35,13 @@ end
 _G.chr = function(n)
   return fn.nr2char(n, true)
 end
----blank callback no operation
-local nop = function() end
 
 ---@class DorisModule
 local M = {}
 
 -- function import and pass export
 -- from doris module
 -- only pure functions not needing vim calls
----@type fun():nil
-_G.nop = nop
----wrap a yielding function as an iterator
-_G.wrap = co.wrap
----coroutine yeild within a function
-_G.yield = co.yield
----make a producer which can send and even receive, from an anonymous function
--- then from plenary modules
 -- promises/futures async
 -- imports async/await into _G
 _G.void = as.void
@@ -117,12 +106,6 @@ M.setup = function(args)
   return M
 end
 
--- impure commands (impure by virtue of command in plugin/doris.lua)
----@return table
-M.doris = function()
-  return M.config.doris
-end
-
 -- impure function collection
 -- notify defaults
 -- notify status message
@@ -497,6 +480,12 @@ M.test_popup = function()
   end, nop, nop)
 end
 
+-- impure commands (impure by virtue of command in plugin/doris.lua)
+---@return table
+M.doris = function()
+  return M.config.doris
+end
+
 -- clean up
 novaride.restore()
 return M

lua/doris/module.lua

@@ -3,6 +3,8 @@
 -- everything is independant of nvim
 local novaride = require("doris.novaride").setup()
 
+---blank callback no operation
+_G.nop = function() end
 ---insert into table
 _G.insert = table.insert
 ---concat table
@@ -517,6 +519,11 @@ end
 
 local co = coroutine
 
+---wrap a yielding function as an iterator
+_G.wrap = co.wrap
+---coroutine yeild within a function
+_G.yield = co.yield
+
 ---construct a producer function which can use send(x)
 ---and receive(producer: thread) using the supply chain
 ---@param fn fun(chain: unknown): nil