move ErrorMessageToString to error_messages

Author: CapsAdmin

language_server/editor_helper.lua

@@ -218,9 +218,10 @@ function META:Recompile(path, lol, diagnostics)
 
 	function compiler.OnDiagnostic(_, code, msg, severity, start, stop, node, ...)
 		local name = code:GetName()
+		local str_msg = formating.FormatMessage(msg, ...)
 
 		if severity == "fatal" then
-			self:DebugLog("[ " .. entry_point .. " ] " .. formating.FormatMessage(msg, ...))
+			self:DebugLog("[ " .. entry_point .. " ] " .. str_msg)
 		end
 
 		diagnostics[name] = diagnostics[name] or {}
@@ -231,7 +232,7 @@ function META:Recompile(path, lol, diagnostics)
 				code = code,
 				start = start,
 				stop = stop,
-				message = formating.FormatMessage(msg, ...),
+				message = str_msg,
 				trace = debug.traceback(),
 			}
 		)

nattlua/analyzer/base/error_handling.lua

@@ -6,6 +6,7 @@ local io = io
 local debug = debug
 local error = error
 local Any = require("nattlua.types.any").Any
+local error_messages = require("nattlua.error_messages")
 local math_abs = math.abs
 local assert = _G.assert
 return function(META)
@@ -81,28 +82,10 @@ return function(META)
 
 	function META:ErrorAssert(ok, err)
 		if not ok then
-			error(self:ErrorMessageToString(err or "assertion failed!"), 2)
+			error(error_messages.ErrorMessageToString(err or "assertion failed!"), 2)
 		end
 	end
 
-	function META:ErrorMessageToString(tbl)
-		local out = {}
-
-		for i, v in ipairs(tbl) do
-			if type(v) == "table" then
-				if v.Type then
-					table.insert(out, tostring(v))
-				else
-					table.insert(out, self:ErrorMessageToString(v))
-				end
-			else
-				table.insert(out, tostring(v))
-			end
-		end
-
-		return table.concat(out, " ")
-	end
-
 	function META:ReportDiagnostic(
 		msg--[[#: {reasons = {[number] = string}} | {[number] = string}]],
 		severity--[[#: "warning" | "error"]],
@@ -123,7 +106,7 @@ return function(META)
 			print(debug.traceback())
 		end
 
-		local msg_str = self:ErrorMessageToString(msg)
+		local msg_str = error_messages.ErrorMessageToString(msg)
 
 		if self.processing_deferred_calls then
 			msg_str = "DEFERRED CALL: " .. msg_str

nattlua/error_messages.lua

@@ -3,10 +3,30 @@ local table = _G.table
 local type = _G.type
 local ipairs = _G.ipairs
 local table_insert = table.insert
+local table_concat = table.concat
+local tostring = _G.tostring
 local callstack = require("nattlua.other.callstack")
 local error_messages = {}
 --[[#local type Reason = string | {[number] = any | string}]]
 
+function error_messages.ErrorMessageToString(tbl--[[#: List<|string | Reason|>]])--[[#: string]]
+	local out = {}
+
+	for i, v in ipairs(tbl) do
+		if type(v) == "table" then
+			if v.Type then
+				table_insert(out, tostring(v))
+			else
+				table_insert(out, error_messages.ErrorMessageToString(v))
+			end
+		else
+			table_insert(out, tostring(v))
+		end
+	end
+
+	return table_concat(out, " ")
+end
+
 function error_messages.because(msg--[[#: Reason]], reason--[[#: nil | Reason]])--[[#: Reason]]
 	if type(msg) ~= "table" then msg = {msg} end