#462 use required name instead of full path

LuaLS · Mar 27, 2021 · 2e78c01 · 2e78c01
1 parent 3ee51ba
commit 2e78c01
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/platform.lua b/platform.lua
@@ -41,3 +41,18 @@ else
     package.path  = rootPath .. script .. '/?.lua'
           .. ';' .. rootPath .. script .. '/?/init.lua'
 end
+
+package.searchers[2] = function (name)
+    local filename, err = package.searchpath(name, package.path)
+    if not filename then
+        return err
+    end
+    local f = io.open(filename)
+    local buf = f:read '*a'
+    f:close()
+    local init, err = load(buf, '@' .. name)
+    if not init then
+        return err
+    end
+    return init, filename
+end
diff --git a/script/log.lua b/script/log.lua
@@ -22,9 +22,9 @@ m.size = 0
 m.maxSize = 100 * 1024 * 1024
 
 local function trimSrc(src)
-    src = src:sub(m.prefixLen + 3, -5)
-    src = src:gsub('^[/\\]+', '')
-    src = src:gsub('[\\/]+', '.')
+    if src:sub(1, 1) == '@' then
+        src = src:sub(2)
+    end
     return src
 end