refactor require-path

Author: sumneko

script/config/loader.lua

@@ -42,6 +42,9 @@ end
 
 ---@return table?
 function m.loadLocalConfig(uri, filename)
+    if not filename then
+        return nil
+    end
     local scp  = scope.getScope(uri)
     local path = workspace.getAbsolutePath(uri, filename)
     if not path then

script/core/collector.lua

@@ -71,7 +71,7 @@ local function askAutoRequire(uri, visiblePaths)
     local selects = {}
     local nameMap = {}
     for _, visible in ipairs(visiblePaths) do
-        local expect = visible.expect
+        local expect = visible.name
         local select = lang.script(expect)
         if not nameMap[select] then
             nameMap[select] = expect
@@ -146,7 +146,7 @@ return function (data)
         return
     end
     table.sort(visiblePaths, function (a, b)
-        return #a.expect < #b.expect
+        return #a.name < #b.name
     end)
 
     local result = askAutoRequire(uri, visiblePaths)

script/core/command/autoRequire.lua

@@ -916,21 +916,21 @@ local function collectRequireNames(mode, myUri, literal, source, smark, position
             local infos = rpath.getVisiblePath(uri, path)
             local relative = workspace.getRelativePath(path)
             for _, info in ipairs(infos) do
-                if matchKey(literal, info.expect) then
-                    if not collect[info.expect] then
-                        collect[info.expect] = {
+                if matchKey(literal, info.name) then
+                    if not collect[info.name] then
+                        collect[info.name] = {
                             textEdit = {
                                 start   = smark and (source.start + #smark) or position,
                                 finish  = smark and (source.finish - #smark) or position,
-                                newText = smark and info.expect or util.viewString(info.expect),
+                                newText = smark and info.name or util.viewString(info.name),
                             },
                             path = relative,
                         }
                     end
                     if vm.isMetaFile(uri) then
-                        collect[info.expect][#collect[info.expect]+1] = ('* [[meta]](%s)'):format(uri)
+                        collect[info.name][#collect[info.name]+1] = ('* [[meta]](%s)'):format(uri)
                     else
-                        collect[info.expect][#collect[info.expect]+1] = ([=[* [%s](%s) %s]=]):format(
+                        collect[info.name][#collect[info.name]+1] = ([=[* [%s](%s) %s]=]):format(
                             relative,
                             uri,
                             lang.script('HOVER_USE_LUA_PATH', info.searcher)

script/core/completion/completion.lua

@@ -77,7 +77,7 @@ local function checkRequire(source, offset)
         return nil
     end
     if     libName == 'require' then
-        return rpath.findUrisByRequirePath(guide.getUri(source), literal)
+        return rpath.findUrisByRequireName(guide.getUri(source), literal)
     elseif libName == 'dofile'
     or     libName == 'loadfile' then
         return workspace.findUrisByFilePath(literal)

script/core/definition.lua

@@ -21,7 +21,7 @@ return function (uri, callback)
             return
         end
         local literal = arg1[1]
-        local results = rpath.findUrisByRequirePath(uri, literal)
+        local results = rpath.findUrisByRequireName(uri, literal)
         if not results or #results ~= 1 then
             return
         end

script/core/diagnostics/different-requires.lua

@@ -11,7 +11,7 @@ local furi     = require 'file-uri'
 local function collectRequire(mode, literal, uri)
     local result, searchers
     if     mode == 'require' then
-        result, searchers = rpath.findUrisByRequirePath(uri, literal)
+        result, searchers = rpath.findUrisByRequireName(uri, literal)
     elseif mode == 'dofile'
     or     mode == 'loadfile' then
         result = ws.findUrisByFilePath(literal)

script/core/hover/description.lua

@@ -76,7 +76,7 @@ local function checkRequire(source, offset)
         return nil
     end
     if     libName == 'require' then
-        return rpath.findUrisByRequirePath(guide.getUri(source), literal)
+        return rpath.findUrisByRequireName(guide.getUri(source), literal)
     elseif libName == 'dofile'
     or     libName == 'loadfile' then
         return workspace.findUrisByFilePath(literal)

script/core/type-definition.lua

@@ -77,6 +77,10 @@ local function initPlugin(uri)
         local interface = {}
         scp:set('pluginInterface', interface)
 
+        if not scp.uri then
+            return
+        end
+
         local pluginPath = ws.getAbsolutePath(scp.uri, config.get(scp.uri, 'Lua.runtime.plugin'))
         log.info('plugin path:', pluginPath)
         if not pluginPath then

script/plugin.lua

@@ -45,7 +45,7 @@ local function bindDocs(source)
             if not name then
                 return true
             end
-            local uri = rpath.findUrisByRequirePath(guide.getUri(source), name)[1]
+            local uri = rpath.findUrisByRequireName(guide.getUri(source), name)[1]
             if not uri then
                 return true
             end
@@ -1450,7 +1450,7 @@ local compilerSwitch = util.switch()
             if not name or type(name) ~= 'string' then
                 return
             end
-            local uri = rpath.findUrisByRequirePath(guide.getUri(func), name)[1]
+            local uri = rpath.findUrisByRequireName(guide.getUri(func), name)[1]
             if not uri then
                 return
             end