Merge branch 'main' of https://github.com/dedouwe26/Terminal

Author: dedouwe26

Terminal/ANSI.cs

@@ -5,11 +5,11 @@ namespace OxDED.Terminal;
 /// </summary>
 public static class ANSI {
     /// <summary>
-    /// (1B)
+    /// (0x1B)
     /// </summary>
     public const string ESC = "\x1B";
     /// <summary>
-    /// CSI
+    /// CSI (ESC + [)
     /// </summary>
     public const string CSI = ESC+"[";
 
@@ -24,7 +24,7 @@ public static class ANSI {
     /// <summary>
     /// Will return as CSI{row};{column}R <para/>
     /// Where CSI is CSI,
-    /// {row} is the row,
+    /// {row} is the row and
     /// {column} is the column.
     /// </summary>
     public const string RequestCursorPosition = CSI+"6n";

Terminal/Assertion/Asserter.cs

@@ -172,6 +172,5 @@ public static ExceptionAssertion<T, Exception> Throws<T>(this Asserter<Func<T>>
     /// <returns>A new exception assertion.</returns>
     public static ExceptionAssertion<Exception> Throws(this Asserter<Action> asserter) {
         return Assert.Throws(asserter.value);
-        
     }
 }

Terminal/Assertion/Assertion.cs

@@ -73,8 +73,9 @@ public Assertion OnFailure(Action<Assertion> callback) {
     /// <returns>This assertion.</returns>
     public Assertion Log(Logger logger, Severity severity = Severity.Error) {
         logger.LogTrace($"Assertion done: {ToString()}");
-        logger.Log(severity, $"Assertion failed with result: {result}");
-        return this;
+        return OnFailure(failedAssertion => {
+            logger.Log(severity, $"Assertion failed with result: {result}");
+        });
     }
 
     /// <summary>
@@ -83,7 +84,7 @@ public Assertion Log(Logger logger, Severity severity = Severity.Error) {
     /// <param name="exception">The exception to throw (defaults to <see cref="AssertException{T}"/>).</param>
     /// <returns>This assertion.</returns>
     public Assertion Throw(Exception? exception = null) {
-        return OnFailure((Assertion failedAssertion) => {
+        return OnFailure(failedAssertion => {
             throw exception ?? new AssertException<Assertion>("Assertion failed", this);
         });
     }

Terminal/Logging/ITarget.cs

@@ -7,10 +7,9 @@ public interface ITarget : IDisposable {
     /// <summary>
     /// The method to write to output.
     /// </summary>
-    /// <typeparam name="T">The type of the text.</typeparam>
     /// <param name="severity">The severity of the message.</param>
     /// <param name="time">The time when it has been logged.</param>
     /// <param name="logger">The logger.</param>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void Write<T>(Severity severity, DateTime time, Logger logger, T? text);
+    public void Write(Severity severity, DateTime time, Logger logger, object? text);
 }

Terminal/Logging/Logger.cs

@@ -322,10 +322,9 @@ public bool HandleUnhandledExceptions {
     /// <summary>
     /// Logs something (<see cref="object.ToString"/>).
     /// </summary>
-    /// <typeparam name="T">The type of the data.</typeparam>
     /// <param name="severity">The severity of the text.</param>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void Log<T>(Severity severity, T? text) {
+    public void Log(Severity severity, object? text) {
         DateTime time = DateTime.Now;
         OnLog?.Invoke(this, text?.ToString()??"", severity, time);
         if (((byte)severity) > ((byte)logLevel)) { return; }
@@ -339,61 +338,54 @@ public void Log<T>(Severity severity, T? text) {
     /// <summary>
     /// Logs something with Trace severity.
     /// </summary>
-    /// <typeparam name="T">The type of the data.</typeparam>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void LogTrace<T>(T? text) {
+    public void LogTrace(object? text) {
         Log(Severity.Trace, text);
     }
     /// <summary>
     /// Logs something with Debug severity.
     /// </summary>
-    /// <typeparam name="T">The type of the data.</typeparam>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void LogDebug<T>(T? text) {
+    public void LogDebug(object? text) {
         Log(Severity.Debug, text);
     }
     /// <summary>
     /// Logs something with Info severity.
     /// </summary>
-    /// <typeparam name="T">The type of the data.</typeparam>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void LogInfo<T>(T? text) {
+    public void LogInfo(object? text) {
         Log(Severity.Info, text);
     }
     /// <summary>
     /// Logs something with Message severity.
     /// </summary>
-    /// <typeparam name="T">The type of the data.</typeparam>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void LogMessage<T>(T? text) {
+    public void LogMessage(object? text) {
         Log(Severity.Message, text);
     }
     /// <summary>
     /// Logs something with Warning severity.
     /// </summary>
-    /// <typeparam name="T">The type of the data.</typeparam>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void LogWarning<T>(T? text) {
+    public void LogWarning(object? text) {
         Log(Severity.Warning, text);
     }
     /// <summary>
     /// Logs something with Error severity.
     /// </summary>
-    /// <typeparam name="T">The type of the data.</typeparam>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void LogError<T>(T? text) {
+    public void LogError(object? text) {
         Log(Severity.Error, text);
     }
     /// <summary>
     /// Logs something with Fatal severity.
     /// </summary>
-    /// <typeparam name="T">The type of the data.</typeparam>
     /// <param name="text">The text to write (<see cref="object.ToString"/>).</param>
-    public void LogFatal<T>(T? text) {
+    public void LogFatal(object? text) {
         Log(Severity.Fatal, text);
     }
 
-    private string GetStacktrace(Exception e) {
+    private static string GetStacktrace(Exception e) {
         string stackTrace = e.StackTrace ?? "   (Unknown)";
         if (e.InnerException != null) {
             Exception inner = e.InnerException;

Terminal/Logging/Severity.cs

@@ -1,7 +1,7 @@
 namespace OxDED.Terminal.Logging;
 
 /// <summary>
-/// Logger severity.
+/// Logger severity (from high severity to low severity).
 /// </summary>
 public enum Severity : byte {
     /// 

Terminal/Logging/Targets/FileTarget.cs

@@ -24,7 +24,7 @@ public FileTarget(string path, string? format = null) {
     /// <remarks>
     /// Writes a line.
     /// </remarks>
-    public override void Write<T>(Severity severity, DateTime time, Logger logger, T? text) where T : default {
+    public override void Write(Severity severity, DateTime time, Logger logger, object? text) {
         FileOut.WriteLine(GetText(logger, time, severity, text?.ToString() ?? "(Null)"));
     }
     /// <inheritdoc/>

Terminal/Logging/Targets/FormattedTarget.cs

@@ -51,7 +51,7 @@ protected string GetText(Logger logger, DateTime time, Severity severity, string
     }
 
     /// <inheritdoc/>
-    public abstract void Write<T>(Severity severity, DateTime time, Logger logger, T? text);
+    public abstract void Write(Severity severity, DateTime time, Logger logger, object? text);
 
     /// <inheritdoc/>
     public abstract void Dispose();

Terminal/Logging/Targets/TerminalTarget.cs

@@ -50,7 +50,7 @@ private string GetText(Logger logger, DateTime time, Severity severity, string t
     /// <remarks>
     /// Writes a line.
     /// </remarks>
-    public override void Write<T>(Severity severity, DateTime time, Logger logger, T? text) where T : default {
+    public override void Write(Severity severity, DateTime time, Logger logger, object? text) {
         if (((byte)severity) < 2) {
             Error.WriteLine(GetText(logger, time, severity, text?.ToString() ?? "(Null)", SeverityColors[(byte)severity].ToForegroundANSI()));
         } else {

Terminal/Terminal.cs

@@ -93,51 +93,48 @@ public static TerminalWindow CreateWindow(string title) {
     /// <summary>
     /// Writes something (<see cref="object.ToString"/>) to the terminal, with a style.
     /// </summary>
-    /// <typeparam name="T">The type of what to write (<see cref="object.ToString"/>).</typeparam>
     /// <param name="text">The thing to write to the terminal.</param>
     /// <param name="style">The text decoration to use.</param>
-    public static void Write<T>(T? text, Style? style = null) {
+    public static void Write(object? text, Style? style = null) {
         Out.Write((style ?? new Style()).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
     }
     /// <summary>
     /// Writes something (<see cref="object.ToString"/>) to the terminal, with a style.
     /// </summary>
-    /// <typeparam name="T">The type of what to write (<see cref="object.ToString"/>).</typeparam>
     /// <param name="text">The thing to write to the terminal.</param>
     /// <param name="style">The text decoration to use.</param>
-    public static void WriteLine<T>(T? text, Style? style = null) {
+    public static void WriteLine(object? text, Style? style = null) {
         Out.WriteLine((style ?? new Style()).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
     }
     /// <summary>
     /// Writes a line to the terminal, with a style.
     /// </summary>
     /// <param name="style">The text decoration to use.</param>
     public static void WriteLine(Style? style = null) {
-        WriteLine<object>(null, style);
+        WriteLine(null, style);
     }
     /// <summary>
     /// Writes something (<see cref="object.ToString"/>) to the error stream, with a style.
     /// </summary>
     /// <typeparam name="T">The type of what to write (<see cref="object.ToString"/>).</typeparam>
     /// <param name="text">The text to write to the error output stream.</param>
     /// <param name="style">The style to use (default: with red foreground).</param>
-    public static void WriteErrorLine<T>(T? text, Style? style = null) {
+    public static void WriteErrorLine<T>(object? text, Style? style = null) {
         Error.WriteLine((style ?? new Style {ForegroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
     }
     /// <summary>
     /// Writes a line to the error stream, with a style.
     /// </summary>
     /// <param name="style">The text decoration to use (default: with red foreground).</param>
     public static void WriteErrorLine(Style? style = null) {
-        WriteLine<object>(null, style);
+        WriteLine(null, style);
     }
     /// <summary>
     /// Writes something (<see cref="object.ToString"/>) to the error stream, with a style.
     /// </summary>
-    /// <typeparam name="T">The type of what to write (<see cref="object.ToString"/>).</typeparam>
     /// <param name="text">The text to write to the error output stream.</param>
     /// <param name="style">The style to use (default: with red foreground).</param>
-    public static void WriteError<T>(T? text, Style? style = null) {
+    public static void WriteError(object? text, Style? style = null) {
         Error.Write((style ?? new Style {ForegroundColor = Colors.Red}).ToANSI()+text?.ToString()+ANSI.Styles.ResetAll);
     }
     /// <summary>
@@ -160,23 +157,21 @@ public static (int x, int y) GetCursorPosition() {
     /// <summary>
     /// Sets the something (<see cref="object.ToString"/>) at a <paramref name="pos"/>, with a <paramref name="style"/>.
     /// </summary>
-    /// <typeparam name="T"></typeparam>
     /// <param name="text">The thing to set at <paramref name="pos"/> to the terminal.</param>
     /// <param name="pos">The position to set <paramref name="text"/> at.</param>
     /// <param name="style">The text decoration to use.</param>
-    public static void Set<T>(T? text, (int x, int y) pos, Style? style = null) {
+    public static void Set(object? text, (int x, int y) pos, Style? style = null) {
         Goto(pos);
         Write(text, style);
     }
 
     /// <summary>
     /// Sets the something in the error stream (<see cref="object.ToString"/>) at a <paramref name="pos"/>, with a <paramref name="style"/>.
     /// </summary>
-    /// <typeparam name="T"></typeparam>
     /// <param name="text">The thing to set at <paramref name="pos"/> to the terminal.</param>
     /// <param name="pos">The position to set <paramref name="text"/> at.</param>
     /// <param name="style">The text decoration to use.</param>
-    public static void SetError<T>(T? text, (int x, int y) pos, Style? style = null) {
+    public static void SetError(object? text, (int x, int y) pos, Style? style = null) {
         Goto(pos);
         WriteError(text, style);
     }

Terminal/Terminal.csproj

@@ -7,7 +7,7 @@
     <PublishTrimmed>true</PublishTrimmed>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PackageId>0xDED.Terminal</PackageId>
-    <Version>4.2.3</Version>
+    <Version>4.2.5</Version>
     <Authors>0xDED</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>

examples/Assertion/Program.cs

@@ -23,7 +23,7 @@ public static void Main(string[] args) {
 
         // Assertions contain methods to check or handle the result:
         Assert.Is(4, 2).Log(logger)
-            .OnFailure((Assertion failedAssertion) => { // Gets executed when the result is not Success.
+            .OnFailure(failedAssertion => { // Gets executed when the result is not Success.
                 logger.LogFatal("Panic!");
             })
             .IsSuccess(); // True if the result is Success.