use lexer_mod.path to check for lexers, update path to support sub lexers

leafo · leafo · commit 60efd73dc0f3 · 2019-09-26T10:34:54.000-07:00
diff --git a/syntaxhighlight/init.lua b/syntaxhighlight/init.lua
@@ -1,15 +1,29 @@
-local lexer_mod
+local lexer_mod = require("syntaxhighlight.textadept.lexer")
+local parts
+do
+  local _accum_0 = { }
+  local _len_0 = 1
+  for part in lexer_mod.path:gmatch('[^;]+') do
+    _accum_0[_len_0] = part:gsub("%?%.lua", "syntaxhighlight/textadept/?.lua")
+    _len_0 = _len_0 + 1
+  end
+  parts = _accum_0
+end
+lexer_mod.path = table.concat(parts, ";")
 local lexers = setmetatable({ }, {
   __index = function(self, name)
     local prev_mod = package.loaded.lexer
-    if not (lexer_mod) then
-      lexer_mod = require("syntaxhighlight.textadept.lexer")
+    local source_path = package.searchpath(name, lexer_mod.path)
+    local mod
+    local success
+    if source_path then
+      package.loaded.lexer = lexer_mod
+      mod = require("syntaxhighlight.textadept." .. tostring(name))
+      package.loaded.lexer = prev_mod
+      success = true
+    else
+      success = false
     end
-    package.loaded.lexer = lexer_mod
-    local success, mod = pcall(function()
-      return require("syntaxhighlight.textadept." .. tostring(name))
-    end)
-    package.loaded.lexer = prev_mod
     if success then
       self[name] = mod
       return self[name]
diff --git a/syntaxhighlight/init.moon b/syntaxhighlight/init.moon
@@ -1,15 +1,28 @@
-local lexer_mod
- 
+lexer_mod = require "syntaxhighlight.textadept.lexer"
+
+-- setup the path so including sub-grammars looks at right place
+parts = for part in lexer_mod.path\gmatch '[^;]+'
+  part\gsub "%?%.lua", "syntaxhighlight/textadept/?.lua"
+
+lexer_mod.path = table.concat parts, ";"
+
 lexers = setmetatable {}, {
   __index: (name) =>
     prev_mod = package.loaded.lexer
-    unless lexer_mod
-      lexer_mod = require "syntaxhighlight.textadept.lexer"
 
-    package.loaded.lexer = lexer_mod
-    success, mod = pcall ->
-      require("syntaxhighlight.textadept.#{name}")
-    package.loaded.lexer = prev_mod
+    -- see if the module exists
+    -- package.searchpath is defined in lexer.lua for lua 5.1
+    source_path = package.searchpath name, lexer_mod.path
+
+    local mod
+
+    success = if source_path
+      package.loaded.lexer = lexer_mod
+      mod = require("syntaxhighlight.textadept.#{name}")
+      package.loaded.lexer = prev_mod
+      true
+    else
+      false
 
     if success
       @[name] = mod
