Better error handling in f and e commands

justas-d · Feb 1, 2017 · dc30071 · dc30071
1 parent d9009ce
commit dc30071
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/base/Api/ApiBootstrap.lua b/base/Api/ApiBootstrap.lua
@@ -18,6 +18,10 @@ _G.Api =
         debug       = _G.debug,
         type        = _G.type,
         pcall       = _G.pcall,
+        string = 
+        {
+            dump = _G.string.dump
+        }
     }
 }
 

diff --git a/base/Api/ChatConsole.lua b/base/Api/ChatConsole.lua
@@ -175,7 +175,7 @@ function ChatConsole:HandleChatInput(input)
 
         cmdKey = cmdKey .. token.Data
 
-        status, err = self:TryCommand(cmdKey, input:sub(token.Pos))
+        status, err = self:TryCommand(cmdKey, input:sub(token.Pos):match'^%s*(.*%S)' or '')
         if status then return true, err end
 
         cmdKey = cmdKey .. " "

diff --git a/base/main.lua b/base/main.lua
@@ -39,10 +39,18 @@ assert(Api.ChatConsole:RegisterCommand(Api.ConsoleCommandClass("clear", "Clears
 
 -- evaluate script
 assert(Api.ChatConsole:RegisterCommand(Api.ConsoleCommandClass("e", "Evaluates lua input.", baseMod, 
-            function(cmd, input) return Api.Std.loadstring(input)() end)))
+            function(cmd, input) 
+                local chunk, err = Api.Std.loadstring(input)
+                if chunk == nil then return err end
+                return chunk()
+            end)))
 
 -- execute script file
 assert(Api.ChatConsole:RegisterCommand(Api.ConsoleCommandClass("f", "Executes lua file in mods/file/__INPUT__.lua", baseMod, 
-            function(cmd, input) return Api.Std.loadfile("mods/file/" .. input .. ".lua")() end)))
+            function(cmd, input) 
+                local chunk, err = Api.Std.loadfile("mods/file/" .. input .. ".lua")
+                if chunk == nil then return error end
+                return chunk() 
+            end)))
 
 Log.Write("Main.lua is done.")