Merge pull request #41 from jonathanmorris180/fix/issue-40

Pull executable from $PATH

Author: jonathanmorris180

README.md

@@ -131,8 +131,6 @@ require("salesforce").setup({
     org_manager = {
         default_org_indicator = "󰄬",
     },
-    -- Default SF CLI executable (should not need to be changed)
-    sf_executable = "sf",
 })
 ```
 

doc/salesforce.txt

@@ -47,8 +47,6 @@ You can pass in a lua table of options to customize the plugin. The default opti
     org_manager = {
         default_org_indicator = "󰄬",
     },
-    -- Default SF CLI executable (should not need to be changed)
-    sf_executable = "sf",
 }
 <
 

lua/salesforce/config.lua

@@ -24,14 +24,8 @@ function Config:new()
         org_manager = {
             default_org_indicator = "󰄬",
         },
-        -- Default SF CLI executable (should not need to be changed)
-        sf_executable = "sf",
     }
 
-    if jit.os == "Windows" then
-        o.options.sf_executable = "sf.cmd"
-    end
-
     return o
 end
 

lua/salesforce/diff.lua

@@ -2,7 +2,6 @@ local Util = require("salesforce.util")
 local Job = require("plenary.job")
 local Debug = require("salesforce.debug")
 local OrgManager = require("salesforce.org_manager")
-local Config = require("salesforce.config")
 
 function Job:is_running()
     if self.handle and not vim.loop.is_closing(self.handle) and vim.loop.is_active(self.handle) then
@@ -15,7 +14,7 @@ end
 local M = {}
 
 local temp_dir
-local executable = Config:get_options().sf_executable
+local executable = Util.get_sf_executable()
 
 local function diff_callback(j)
     vim.schedule(function()

lua/salesforce/execute_anon.lua

@@ -3,7 +3,6 @@ local Debug = require("salesforce.debug")
 local OrgManager = require("salesforce.org_manager")
 local Job = require("plenary.job")
 local Util = require("salesforce.util")
-local Config = require("salesforce.config")
 
 function Job:is_running()
     if self.handle and not vim.loop.is_closing(self.handle) and vim.loop.is_active(self.handle) then
@@ -47,7 +46,7 @@ M.execute_anon = function()
 
     Popup:create_popup({})
     Popup:write_to_popup("Executing anonymous Apex script...")
-    local executable = Config:get_options().sf_executable
+    local executable = Util.get_sf_executable()
     local args = {}
     local writer = nil
     if not is_unsaved_buffer then

lua/salesforce/file_manager.lua

@@ -14,7 +14,7 @@ end
 
 local M = {}
 
-local executable = Config:get_options().sf_executable
+local executable = Util.get_sf_executable()
 local active_file_path = nil
 
 local function push_to_org_callback(j)

lua/salesforce/init.lua

@@ -43,8 +43,6 @@
 ---     org_manager = {
 ---         default_org_indicator = "󰄬",
 ---     },
----     -- Default SF CLI executable (should not need to be changed)
----     sf_executable = "sf",
 --- }
 --- <
 local Config = require("salesforce.config")

lua/salesforce/org_manager.lua

@@ -14,7 +14,7 @@ function Job:is_running()
 end
 
 local OrgManager = {}
-local executable = Config:get_options().sf_executable
+local executable = Util.get_sf_executable()
 
 function OrgManager:new()
     local o = {}

lua/salesforce/test_runner.lua

@@ -4,9 +4,8 @@ local OrgManager = require("salesforce.org_manager")
 local Debug = require("salesforce.debug")
 local Treesitter = require("salesforce.treesitter")
 local Util = require("salesforce.util")
-local Config = require("salesforce.config")
 
-local executable = Config:get_options().sf_executable
+local executable = Util.get_sf_executable()
 local run_class_command = executable .. ' apex run test -n "%s" --synchronous -r human -o %s'
 local run_method_command = executable .. ' apex run test -t "%s.%s" --synchronous -r human -o %s'
 

lua/salesforce/util.lua

@@ -158,4 +158,8 @@ function M.clear_error_diagnostics()
     vim.diagnostic.reset(namespace, bufnr)
 end
 
+function M.get_sf_executable()
+    return vim.fn.fnamemodify(vim.fn.exepath("sf"), ":t")
+end
+
 return M