fix: Account for spaces when diffing files and fix tests

lua/salesforce/debug.lua

@@ -31,7 +31,6 @@ function Debugger:log(scope, item, ...)
 
     if type(item) == "table" then
         self:tprint(item)
-        return
     end
 
     local info = debug.getinfo(2, "Sl")
@@ -41,7 +40,9 @@ function Debugger:log(scope, item, ...)
         line = "L" .. info.currentline
     end
 
-    local final_arg = (select("#", ...) == 0 and item) or string.format(item, ...)
+    local final_arg = (type(item) == "table" and "TABLE")
+        or (type(item) == "string" and select("#", ...) == 0 and item)
+        or (type(item) == "string" and string.format(item, ...))
 
     local debug_str =
         string.format("[salesforce:%s %s in %s] > %s", os.date("%H:%M:%S"), line, scope, final_arg)
@@ -63,12 +64,6 @@ end
 ---@param indent number?: the default indent value, starts at 0.
 ---@private
 function Debugger:tprint(table, indent)
-    if
-        not Config:get_options().debug.to_file and not Config:get_options().debug.to_command_line
-    then
-        return
-    end
-
     if not indent then
         indent = 0
     end

lua/salesforce/diff.lua

@@ -71,12 +71,23 @@ local function diff_callback(j)
     end)
 end
 
-local function execute_job(command)
-    local args = Util.split(command, " ")
-    table.remove(args, 1)
+local function expand(t)
+    local res = {}
+    for k, v in pairs(t) do
+        res[#res + 1] = k
+        res[#res + 1] = v
+    end
+    return res
+end
+
+local function execute_job(args)
+    local all_args = { "project", "retrieve", "start", unpack(expand(args)) }
+    table.insert(all_args, "--json")
+    Debug:log("diff.lua", "Command: ")
+    Debug:log("diff.lua", all_args)
     local new_job = Job:new({
         command = "sf",
-        args = args,
+        args = all_args,
         on_exit = diff_callback,
         on_stderr = function(_, data)
             vim.schedule(function()
@@ -117,16 +128,13 @@ M.diff_with_org = function()
     local temp_dir_with_suffix = temp_dir .. "/main/default"
     vim.fn.mkdir(temp_dir_with_suffix, "p")
     Debug:log("diff.lua", "Created temp dir: " .. temp_dir)
+    local args = {
+        ["-m"] = string.format("%s:%s", metadataType, file_name_no_ext),
+        ["-r"] = temp_dir,
+        ["-o"] = default_username,
+    }
 
-    local command = string.format(
-        "sf project retrieve start -m %s:%s -r %s -o %s --json",
-        metadataType,
-        string.gsub(file_name_no_ext, " ", "\\ "),
-        temp_dir,
-        default_username
-    )
-    Debug:log("diff.lua", "Command: " .. command)
-    execute_job(command)
+    execute_job(args)
 end
 
 return M

lua/salesforce/execute_anon.lua

@@ -21,7 +21,9 @@ M.execute_anon = function()
     local default_username = OrgManager:get_default_username()
 
     if file_type ~= "apex" then
-        vim.notify("Not an Apex script file.", vim.log.levels.ERROR)
+        local message = "Not an Apex script file"
+        Debug:log("execute_anon.lua", message)
+        vim.notify(message, vim.log.levels.ERROR)
         return
     end
 

lua/salesforce/util.lua

@@ -32,7 +32,9 @@ function M.notify_command_in_progress(category)
 end
 
 function M.notify_default_org_not_set()
-    vim.notify("Please select a default org", vim.log.levels.ERROR)
+    local message = "No default org set"
+    Debug:log("util.lua", message)
+    vim.notify(message, vim.log.levels.ERROR)
 end
 
 function M.clear_and_notify(msg, log_level)

tests/helpers.lua

@@ -9,7 +9,7 @@ local function error_message(str, pattern)
 end
 
 -- Check equality of a config `prop` against `value` in the given `child` process.
--- @usage config_equality(child, "debug", true)
+-- @usage config_equality(child, "debug", {})
 Helpers.expect.config_equality = MiniTest.new_expectation(
     "config option matches",
     function(child, prop, value)
@@ -22,7 +22,7 @@ Helpers.expect.config_equality = MiniTest.new_expectation(
 )
 
 -- Check type equality of a config `prop` against `value` in the given `child` process.
--- @usage config_type_equality(child, "debug", "boolean")
+-- @usage config_type_equality(child, "debug", "table")
 Helpers.expect.config_type_equality = MiniTest.new_expectation(
     "config option type matches",
     function(child, prop, value)

tests/resources/execute_anon/lua/mocks/salesforce/org_manager.lua

@@ -0,0 +1,14 @@
+local MockOrgManager = {}
+
+function MockOrgManager:new()
+    local o = {}
+    setmetatable(o, self)
+    self.__index = self
+    return o
+end
+
+function MockOrgManager:get_default_username()
+    return "test@username.com"
+end
+
+return MockOrgManager

tests/resources/execute_anon/plenary_override.lua

@@ -1,4 +1,3 @@
 ---@diagnostic disable: different-requires
 vim.cmd("set rtp+=tests/resources/execute_anon/")
 vim.cmd("set cmdheight=20")
-require("plenary.reload").reload_module("plenary.job")

tests/test_config.lua

@@ -29,8 +29,11 @@ T["setup()"]["sets exposed methods and default options value"] = function()
     child.lua([[M.setup()]])
 
     -- global object that holds your plugin information
-    eq_type_config(child, "debug", "boolean")
-    eq_config(child, "debug", false)
+    eq_type_config(child, "debug", "table")
+    eq_config(child, "debug", {
+        to_command_line = false,
+        to_file = false,
+    })
 end
 
 T["setup()"]["overrides default values"] = function()

tests/test_execute_anon.lua

@@ -36,13 +36,23 @@ T["execute_anon()"] = MiniTest.new_set()
 
 T["execute_anon()"]["displays a mock value in the scratch buffer"] = function()
     mock_schedule()
-    child.lua(string.format([[M.setup({debug = %s})]], tostring(helpers.debug())))
+    local debug = string.format(
+        [[
+    {
+        to_file = %s,
+        to_command_line = false,
+    }
+    ]],
+        tostring(helpers.debug())
+    )
+    child.lua(string.format([[M.setup({debug = %s})]], debug))
     child.lua([[
         dofile("tests/resources/execute_anon/plenary_override.lua")
     ]])
     -- adding here to avoid "same file is required with different names" error
     child.lua([[
         package.loaded["plenary.job"] = require("mocks.plenary.job")
+        package.loaded["salesforce.org_manager"] = require("mocks.salesforce.org_manager")
         require("plenary.reload").reload_module("salesforce.execute_anon")
     ]])
     child.cmd(string.format("e %s", test_dir))