Added crossfile testcase

Improved eq error message in test/code_action/init.lua
Uses core.diagnostics.undefined-global

Author: sewbacca

script/core/code-action.lua

@@ -7,6 +7,7 @@ local converter = require 'proto.converter'
 local autoreq   = require 'core.completion.auto-require'
 local rpath     = require 'workspace.require-path'
 local furi      = require 'file-uri'
+local undefined = require 'core.diagnostics.undefined-global'
 
 ---@param uri  uri
 ---@param row  integer
@@ -687,11 +688,7 @@ local function findRequireTargets(visiblePaths)
     return targets
 end
 
-local function checkMissingRequire(results, uri, start, finish, diagnostics)
-    if not diagnostics then
-        return
-    end
-
+local function checkMissingRequire(results, uri, start, finish)
     local state = files.getState(uri)
     local text  = files.getText(uri)
     if not state or not text then
@@ -705,14 +702,14 @@ local function checkMissingRequire(results, uri, start, finish, diagnostics)
         end
     end)
 
-    local function addPotentialRequires(global)
-        autoreq.check(state, global.name, global.endpos, function(moduleFile, stemname, targetSource)
+    local function addPotentialRequires(global, endpos)
+        autoreq.check(state, global, endpos, function(moduleFile, stemname, targetSource)
             local visiblePaths = rpath.getVisiblePath(uri, furi.decode(moduleFile))
             if not visiblePaths or #visiblePaths == 0 then return end
 
             for _, target in ipairs(findRequireTargets(visiblePaths)) do
                 results[#results+1] = {
-                    title = lang.script('ACTION_AUTOREQUIRE', global.name, target),
+                    title = lang.script('ACTION_AUTOREQUIRE', global, target),
                     kind = 'refactor.rewrite',
                     command = {
                         title     = 'autoRequire',
@@ -721,7 +718,7 @@ local function checkMissingRequire(results, uri, start, finish, diagnostics)
                             {
                                 uri         = guide.getUri(state.ast),
                                 target      = moduleFile,
-                                name        = global.name,
+                                name        = global,
                                 requireName = target
                             },
                         },
@@ -731,16 +728,11 @@ local function checkMissingRequire(results, uri, start, finish, diagnostics)
         end)
     end
 
-    -- TODO: Is there a better way to detect undefined-global?
-    for _, diag in ipairs(diagnostics) do
-        if diag.code == 'undefined-global' then
-            for _, potglobal in ipairs(potentialGlobals) do
-                if diag.message:find(potglobal.name) then
-                    addPotentialRequires(potglobal)
-                end
-            end
+    undefined(uri, function(foundUndefined)
+        if foundUndefined.start <= start and start <= foundUndefined.finish and foundUndefined.start <= finish and finish <= foundUndefined.finish then
+            addPotentialRequires(foundUndefined.undefinedGlobal, foundUndefined.finish)
         end
-    end
+    end)
 end
 
 return function (uri, start, finish, diagnostics)

script/core/diagnostics/undefined-global.lua

@@ -55,6 +55,7 @@ return function (uri, callback)
             start   = src.start,
             finish  = src.finish,
             message = message,
+            undefinedGlobal = src[1]
         }
     end)
 end

test/code_action/init.lua

@@ -2,38 +2,40 @@ local core  = require 'core.code-action'
 local files = require 'files'
 local lang  = require 'language'
 local catch = require 'catch'
+local furi  = require 'file-uri'
 
 rawset(_G, 'TEST', true)
 
 local EXISTS = {}
 
-local function eq(a, b)
-    if a == EXISTS and b ~= nil then
+local function eq(expected, result)
+    if expected == EXISTS and result ~= nil then
         return true
     end
-    if b == EXISTS and a ~= nil then
+    if result == EXISTS and expected ~= nil then
         return true
     end
-    local tp1, tp2 = type(a), type(b)
+    local tp1, tp2 = type(expected), type(result)
     if tp1 ~= tp2 then
-        return false
+        return false, string.format(": expected type %s, got %s for %s", tp1, tp2)
     end
     if tp1 == 'table' then
         local mark = {}
-        for k in pairs(a) do
-            if not eq(a[k], b[k]) then
-                return false
+        for k in pairs(expected) do
+            local ok, err = eq(expected[k], result[k])
+            if not ok then
+                return false, string.format(".%s%s", k, err)
             end
             mark[k] = true
         end
-        for k in pairs(b) do
+        for k in pairs(result) do
             if not mark[k] then
-                return false
+                return false, string.format(".%s: missing key in result", k)
             end
         end
         return true
     end
-    return a == b
+    return expected == result, string.format(": expected %s, got %s", expected, result)
 end
 
 function TEST(script)
@@ -47,6 +49,32 @@ function TEST(script)
     end
 end
 
+local function TEST_CROSSFILE(testfiles)
+    local mainscript = table.remove(testfiles, 1)
+    return function(expected)
+        for _, data in ipairs(testfiles) do
+            local uri = furi.encode(data.path)
+            files.setText(uri, data.content)
+            files.compileState(uri)
+        end
+
+        local newScript, catched = catch(mainscript, '?')
+        files.setText(TESTURI, newScript)
+        files.compileState(TESTURI)
+
+        local _ <close> = function ()
+            for _, info in ipairs(testfiles) do
+                files.remove(furi.encode(info.path))
+            end
+            files.remove(TESTURI)
+        end
+
+        local results = core(TESTURI, catched['?'][1][1], catched['?'][1][2])
+        assert(results)
+        assert(eq(expected, results))
+    end
+end
+
 TEST [[
 print(<?a?>, b, c)
 ]]
@@ -155,4 +183,35 @@ local t = {
 --    },
 --}
 
--- TODO: Add some tests for ACTION_AUTOREQUIRE
+-- TODO: Add some tests for ACTION_AUTOREQUIRE
+
+TEST_CROSSFILE {
+[[
+    <?unrequiredModule?>.myFunction()
+]],
+    {
+        path = 'unrequiredModule.lua',
+        content = [[
+            local m = {}
+            m.myFunction = print
+            return m
+        ]]
+    }
+} {
+    {
+        title = lang.script('ACTION_AUTOREQUIRE', 'unrequiredModule', 'unrequiredModule'),
+        kind = 'refactor.rewrite',
+        command = {
+            title     = 'autoRequire',
+            command   = 'lua.autoRequire',
+            arguments = {
+                {
+                    uri         = TESTURI,
+                    target      = furi.encode 'unrequiredModule.lua',
+                    name        = 'unrequiredModule',
+                    requireName = 'unrequiredModule'
+                },
+            },
+        }
+    }
+}