Fix crash on empty stderr

quolpr · Jan 15, 2025 · adae37a · adae37a
1 parent 21df661
commit adae37a
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 29 deletions.
diff --git a/lua/quicktest/colored_printer.lua b/lua/quicktest/colored_printer.lua
@@ -16,20 +16,20 @@ end
 function ColoredPrinter:setup_highlight_groups()
   local basic_colors = {
     ["30"] = "Black",
-    ["31"] = "Red",
-    ["32"] = "Green",
-    ["33"] = "Yellow",
-    ["34"] = "Blue",
-    ["35"] = "Magenta",
-    ["36"] = "Cyan",
-    ["37"] = "White",
-    ["90"] = "Grey",
-    ["91"] = "Red",
-    ["92"] = "Green",
-    ["93"] = "Yellow",
-    ["94"] = "Blue",
-    ["95"] = "Magenta",
-    ["96"] = "Cyan",
+    ["31"] = "DarkRed",
+    ["32"] = "DarkGreen",
+    ["33"] = "DarkYellow",
+    ["34"] = "DarkBlue",
+    ["35"] = "DarkMagenta",
+    ["36"] = "DarkCyan",
+    ["37"] = "LightGrey",
+    ["90"] = "DarkGrey",
+    ["91"] = "LightRed",
+    ["92"] = "LightGreen",
+    ["93"] = "LightYellow",
+    ["94"] = "LightBlue",
+    ["95"] = "LightMagenta",
+    ["96"] = "LightCyan",
     ["97"] = "White",
   }
 

diff --git a/lua/quicktest/module.lua b/lua/quicktest/module.lua
@@ -159,8 +159,7 @@ function M.run(adapter, params, config, opts)
     ui.scroll_down(buf)
   end
 
-  ---@diagnostic disable-next-line: missing-parameter
-  a.run(function()
+  local runLoop = function()
     local sender, receiver = a.control.channel.mpsc()
     local pid = adapter.run(params, function(data)
       sender.send(data)
@@ -236,16 +235,18 @@ function M.run(adapter, params, config, opts)
         end
 
         if result.type == "stderr" then
-          local line_count = vim.api.nvim_buf_line_count(buf)
-          local lines = vim.split(result.output, "\n")
+          if result.output then
+            local line_count = vim.api.nvim_buf_line_count(buf)
+            local lines = vim.split(result.output, "\n")
 
-          table.insert(lines, "")
-          table.insert(lines, "")
-          if #lines > 0 then
-            set_ansi_lines(buf, line_count - 2, -1, false, lines)
+            table.insert(lines, "")
+            table.insert(lines, "")
+            if #lines > 0 then
+              set_ansi_lines(buf, line_count - 2, -1, false, lines)
 
-            for i = 0, #lines - 1 do
-              vim.api.nvim_buf_add_highlight(buf, -1, "DiagnosticError", line_count - 2 + i, 0, -1)
+              for i = 0, #lines - 1 do
+                vim.api.nvim_buf_add_highlight(buf, -1, "DiagnosticError", line_count - 2 + i, 0, -1)
+              end
             end
           end
         end
@@ -257,6 +258,16 @@ function M.run(adapter, params, config, opts)
 
       print_status()
     end
+  end
+
+  ---@diagnostic disable-next-line: missing-parameter
+  a.run(function()
+    xpcall(runLoop, function(err)
+      print("Error in async job:", err)
+      print("Stack trace:", debug.traceback())
+
+      notify.error("Test run failed: " .. err)
+    end)
   end)
 end
 

diff --git a/plugin/quicktest.lua b/plugin/quicktest.lua
@@ -1,9 +1,6 @@
 -- vim.api.nvim_create_user_command("C", function()
 --   require("lazy.core.loader").reload("quicktest.nvim")
---
---   -- require("quicktest").open_win("popup")
 --   -- local module = require("quicktest.module")
---   --
 --   -- module.run(require("quicktest.adapters.golang"), {
 --   --   func_names = { "TestSum" },
 --   --   sub_func_names = {},

diff --git a/tests/support/gotest/abc/abc_test.go b/tests/support/gotest/abc/abc_test.go
@@ -2,11 +2,12 @@ package abc_test
 
 import (
 	"fmt"
-	"gotest/abc"
 	"math"
 	"os"
 	"testing"
 	"time"
+
+	"gotest/abc"
 )
 
 func TestSum(t *testing.T) {
@@ -28,7 +29,6 @@ func TestSum(t *testing.T) {
 	if c != a+b+1 {
 		t.Errorf("Sum(%d, %d) = %d, want %d", a, b, c, a+b)
 	}
-
 }
 
 func TestGradient(t *testing.T) {