vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Fixed assembly logging style.

Browse Source 
- Fixed double logging during execution.
This commit is contained in:
MapleWheels
2026-04-10 10:48:55 -04:00
parent c3a9551683
commit 9250e27953
3 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Plugins/AssemblyLoader.cs
View File

@@ -315,24 +315,16 @@ public sealed class AssemblyLoader : AssemblyLoadContext, IAssemblyLoaderService
StringBuilder sb = new StringBuilder();
foreach (var resultDiagnostic in result.Diagnostics)
{
if (resultDiagnostic.Severity != DiagnosticSeverity.Error)
if (resultDiagnostic.IsWarningAsError || resultDiagnostic.Severity == DiagnosticSeverity.Error)
{
continue;
//sb.AppendLine($">>> {resultDiagnostic.GetMessage()} | Location: {resultDiagnostic.Location.SourceTree?.GetLineSpan(resultDiagnostic.Location.SourceSpan)} ");
sb.AppendLine($"\n{resultDiagnostic}");
}
sb.AppendLine($">>> {resultDiagnostic.GetMessage()} | Location: {resultDiagnostic.Location.SourceTree?.GetLineSpan(resultDiagnostic.Location.SourceSpan)} ");
}
var res = new FluentResults.Result().WithError(
new Error($"Package Error: {OwnerPackage.Name}: Compilation failed for assembly {assemblyName}! {sb.ToString()}\n")
new Error($"Package Error: {OwnerPackage.Name}: Compilation failed for assembly {assemblyName}!\n {sb.ToString()}\n")
.WithMetadata(MetadataType.ExceptionObject, this)
.WithMetadata(MetadataType.RootObject, syntaxTrees));
var failuresDiag =
result.Diagnostics.Where(d => d.IsWarningAsError || d.Severity == DiagnosticSeverity.Error);
foreach (var diag in failuresDiag)
{
res = res.WithError(new Error(diag.GetMessage())
.WithMetadata(MetadataType.ExceptionObject, this)
.WithMetadata(MetadataType.ExceptionDetails, diag.Descriptor.Description));
}
return res;
}

13
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/LoggerService.cs
View File

@@ -186,14 +186,13 @@ public partial class LoggerService : ILoggerService
else
{
LogError($"FluentResults::IError: {error.Message}");
}
if (error.Reasons != null)
{
foreach (var reason in error.Reasons)
/*if (error.Reasons != null)
{
LogError($" - {reason.Message}");
}
foreach (var reason in error.Reasons)
{
LogError($" - {reason.Message}");
}
}*/
}
}
}

6
Barotrauma/BarotraumaShared/SharedSource/LuaCs/_Services/PackageManagementService.cs
View File

@@ -357,11 +357,7 @@ public sealed class PackageManagementService : IPackageManagementService
{
_runningPackages[package.Key] = package.Value;
}
if (result.IsFailed)
{
_logger.LogResults(result);
}
return result;
}