Merge pull request #32 from jonathanmorris180/fix/issue-24

Add diagnostics from push and pull commands

Author: jonathanmorris180

lua/salesforce/file_manager.lua

@@ -51,14 +51,24 @@ local function push_to_org_callback(j)
                 and sfdx_response.result.details
                 and sfdx_response.result.details.componentFailures
             then
-                local failures = {}
+                local diagnostics = {}
                 for _, failure in ipairs(sfdx_response.result.details.componentFailures) do
-                    if failure.problem then
-                        table.insert(failures, failure.problem)
+                    if failure.problem and failure.lineNumber and failure.columnNumber then
+                        table.insert(diagnostics, {
+                            lnum = failure.lineNumber - 1,
+                            col = failure.columnNumber - 1,
+                            message = failure.problem,
+                            severity = vim.diagnostic.severity.ERROR,
+                        })
                     end
                 end
-                vim.notify("Error(s) while pushing " .. file_name, vim.log.levels.ERROR)
-                vim.notify(table.concat(failures, "\n"), vim.log.levels.ERROR)
+                Util.set_error_diagnostics(diagnostics)
+                vim.notify(
+                    "Error(s) while pushing "
+                        .. file_name
+                        .. ". Check diagnostics. Overlapping messages from apex_ls have been omitted.",
+                    vim.log.levels.ERROR
+                )
                 return
             elseif sfdx_response.message then
                 vim.notify(sfdx_response.message, vim.log.levels.ERROR)
@@ -184,6 +194,7 @@ local function pull(command)
 end
 
 M.push_to_org = function()
+    Util.clear_error_diagnostics()
     active_file_path = vim.fn.expand("%:p")
     local file_name = vim.fn.fnamemodify(active_file_path, ":t")
     local default_username = OrgManager:get_default_username()
@@ -208,6 +219,7 @@ M.push_to_org = function()
 end
 
 M.pull_from_org = function()
+    Util.clear_error_diagnostics()
     active_file_path = vim.fn.expand("%:p")
     local file_name = vim.fn.fnamemodify(active_file_path, ":t")
     local default_username = OrgManager:get_default_username()

lua/salesforce/util.lua

@@ -1,6 +1,7 @@
 local Debug = require("salesforce.debug")
 
 local M = {}
+local namespace = vim.api.nvim_create_namespace("salesforce.util")
 
 local metadata_type_map = {
     ["lwc"] = "LightningComponentBundle",
@@ -121,4 +122,40 @@ function M.salesforce_cli_available()
     return false
 end
 
+local function get_apex_ls_namespace()
+    local diagnostic_namespaces = vim.diagnostic.get_namespaces()
+    for id, ns in pairs(diagnostic_namespaces) do
+        if string.find(ns.name, "apex_ls") then
+            return id
+        end
+    end
+end
+
+function M.set_error_diagnostics(diagnostics)
+    local apex_ls_namespace = get_apex_ls_namespace()
+    local bufnr = vim.api.nvim_get_current_buf()
+    -- filter out overlapping diagnostics from apex_ls
+    local filtered_diagnostics = {}
+    for _, diagnostic in ipairs(diagnostics) do
+        local apex_ls_diagnostics =
+            vim.diagnostic.get(bufnr, { namespace = apex_ls_namespace, lnum = diagnostic.lnum })
+        local found = false
+        for _, apex_ls_diagnostic in ipairs(apex_ls_diagnostics) do
+            if apex_ls_diagnostic.message == diagnostic.message then
+                found = true
+                break
+            end
+        end
+        if not found then
+            table.insert(filtered_diagnostics, diagnostic)
+        end
+    end
+    vim.diagnostic.set(namespace, bufnr, filtered_diagnostics, {})
+end
+
+function M.clear_error_diagnostics()
+    local bufnr = vim.api.nvim_get_current_buf()
+    vim.diagnostic.reset(namespace, bufnr)
+end
+
 return M