fix: show errors message on fails for routes and commands

adalessa · Dec 29, 2023 · 36c67ca · 36c67ca
1 parent 2fe1157
commit 36c67ca
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/lua/laravel/api/response.lua b/lua/laravel/api/response.lua
@@ -40,7 +40,7 @@ end
 
 ---@return string
 function ApiResponse:prettyContent()
-  return table.concat(self:content(), "\r\n")
+  return table.concat(self:content(), "\n")
 end
 
 ---@return string|nil
@@ -71,7 +71,7 @@ function ApiResponse:prettyErrors()
     return ""
   end
 
-  return table.concat(errors, "\r\n")
+  return table.concat(errors, "\n")
 end
 
 return ApiResponse
diff --git a/lua/laravel/commands/init.lua b/lua/laravel/commands/init.lua
@@ -9,7 +9,8 @@ function M.load()
   M.list = {}
   local result = api.sync("artisan", { "list", "--format=json" })
   if result:failed() then
-    error(result:failed(), vim.log.levels.ERROR)
+    vim.notify(result:prettyErrors(), vim.log.levels.ERROR)
+    return false
   end
 
   M.list = utils.from_json(result.stdout)

diff --git a/lua/laravel/routes/init.lua b/lua/laravel/routes/init.lua
@@ -9,7 +9,8 @@ function M.load()
   M.list = {}
   local result = api.sync("artisan", { "route:list", "--json" })
   if result:failed() then
-    error(result:errors(), vim.log.levels.ERROR)
+    vim.notify(result:prettyErrors(), vim.log.levels.ERROR)
+    return false
   end
 
   M.list = utils.from_json(result.stdout)

diff --git a/lua/laravel/telescope/pickers/commands.lua b/lua/laravel/telescope/pickers/commands.lua
@@ -9,8 +9,10 @@ local actions = require "laravel.telescope.actions"
 return function(opts)
   opts = opts or {}
 
-  if #commands.list == 0 then
-    commands.load()
+  if vim.tbl_isempty(commands.list) then
+    if not commands.load() then
+      return
+    end
   end
 
   pickers